Commit Graph

40933 Commits

Author SHA1 Message Date
Ashe Higgs 32c68a60bf Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more (#32935)
* Adds the Eminence

* New abilities and a command system

* More stuff

* I did something in this commit but I dunno what

* Beginning work on trap setups

* This is good for now until arm gets his sprites

* I did something here!

* Manacle sprites

* R.I.P. R&D

* Maintainer review

* QoL, slabbin' it up

* Conflicts

* Conflicts

* <

* Now it compiles!

* TGUI

* TGUI, again

* 🥝

* that should be all, but I'll do some quick testing...

* aha!
2017-12-07 11:36:26 +13:00
oranges 8359708cae Merge pull request #33308 from tgstation/Cyberboss-patch-3
Fixes every config flag updating world.sleep_offline
2017-12-07 11:25:51 +13:00
oranges 91c877e22f Merge pull request #33297 from tgstation/Cyberboss-patch-2
Fixes say logging
2017-12-07 11:19:46 +13:00
oranges 678c97ab62 Merge pull request #33332 from AnturK/lightfix
Fixes light breaking
2017-12-07 11:19:24 +13:00
XDTM 550d71167e Brain Traumas (#31727)
* Reworks Brain Damage

* mechanics

* rebalancing

* hulks in wheelchairs

* yup

* bugsquash

* Adds narcolepsy, phobias and agnosia. Not guaranteed 100% bug-free yet, testmerge at your own risk.

* lizard phobia

* Did you know there's a skeleton inside of you RIGHT NOW?

* Fixes for the new stuff

* The issue with those is that in most rounds you won't see them

I'll keep them available so they can be added manually, for example by events and such

* Goof reviews

* Brainloss is based off brain organ integrity

removes brainloss var

* Replaces some getorganslot with defines

* eyes

* put the traumas in the brainnnn

* text

* args

* Adds godwoken, puts split personality in severe, adds brainwashing

* Bluespace prophet special trauma (untested)

* Some minor stuff

* Monophobia, and tweaks

* More fixes

* fix

* a

* new tail

* Discoordination and Muscle Weakness

* thanks for the review!

* [B]oneless

* agnosia fix

* .

* go away agnosia

* pretend it didn't happen

* Shitcode-free-er

* bitwisdom

* psychotic brawling

* i guess this might be important

* latest reviews

* .

* conflict-free

* addresses it

* surgery fix

* a masterpiece

* fix

* fix again

* config

* damage formula reworked

* who needs to test anyway

* fixes some bugs

* fix 2

* proper spookin

* bluespace prophet fixes and improvements

* no bible healing

* .

* normalizes monophobia chances
2017-12-06 13:04:17 -05:00
deathride58 3265d09328 Nerfs criticism 2017-12-06 12:46:02 -05:00
Jordan Brown b3b8859b38 Fix indentation 2017-12-06 12:11:24 -05:00
Jordan Brown e336bdacd4 Merge branch 'master' into Cyberboss-patch-2 2017-12-06 12:09:57 -05:00
Armhulen a788d48acb Fugu improvements (#33182)
* come on, you know i wumbo you wumbo he she me wumbo

* it's hip to wumbo
2017-12-06 07:32:39 -05:00
Dax Dupont 80ec17243e Makes sillicon chat more visible (#33222)
Made it green on black

Forgot to remove it at the bold thingy
2017-12-06 07:20:06 -05:00
Trevor Serpas 4ac3c26644 Ghost defile removes salt piles (#33294)
Fixes #33291
2017-12-06 07:18:48 -05:00
ShizCalev 57f636b24b Adds games vendor resupply crate 2017-12-06 05:54:19 -05:00
AnturK 0072ab76f2 Fixes light breaking 2017-12-06 10:07:09 +01:00
octareenroon91 b1bc604075 Fix supermatter tongs icon bug
Fixes #33161
2017-12-06 00:36:25 -06:00
deathride58 8297ca87b4 second pass - makes change view range function again 2017-12-05 22:47:46 -05:00
deathride58 1904080823 i fucked up - GLOBAL.DEFAULT_VIEW > GLOB.DEFAULT_VIEW 2017-12-05 21:53:52 -05:00
deathride58 b765f50302 makes the default view scale a config option 2017-12-05 21:44:56 -05:00
deathride58 08504355d4 Adds support for non-1:1 screen ratios (Doesn't add widescreen) (#32950)
* adds support for non-1:1 screen ratios for fullscreen overlays

* prevents future copypasta, adds widescreen support to clickcatchers

* oops, makes it actually compile

* HOPEFULLY makes it actually compile, makes projectiles and mouse_angle_from_client support widescreen

* i need shittier shitcode

* !!!HOPEFULLY!!! fixes the screen fuckery

* Fixes compiling errors. Tested locally, it seems like it works

* fixes runtime in mouse_angle_from_client

* Fixes non-1:1 TGUI runtimes for borgs and ghosts

* adds actual defines for fullscreen overlay resolution

* makes varediting view call change_view to make clickcatcher regenerate proper

* testmerge toggle widescreen verb and fixes vving view

* FUCK - fixes test verb to properly use change_view, so clickcatchers regenerate and such

* fixes parallax runtimes - how'd i miss this

* removes debug verb
2017-12-05 20:45:47 -05:00
Tad Hardesty 8edd8e9a9a Fix runtimes using Tweak Component Ratings on non-machines 2017-12-05 17:19:23 -08:00
Tad Hardesty e8f88c2d6a Fix vending machines nullspacing every item on init 2017-12-05 16:01:17 -08:00
coiax dd67e1e4e1 Good Clean Fun: A vending machine for games! (#33265)
* Good Clean Fun: A vending machine for games!

🆑 coiax
add: Quiet areas of libraries on station have now been equipped with a
vending machine containing suitable recreational activities.
/🆑

- Sprite by WJohn
- Removes dice bags and cards from the tables of libraries, you can now
get them from the vendor.
- If we ever implement checkers or go or chess, we should add the
playing kits to the vendor.

* Add sprites, and it compiles

* Map modifications

* Moves defines to end of file
2017-12-05 18:19:36 -05:00
swindly f7966deae4 makes residue scatter on suicide, makes fake disk suicide less interesting, makes melon seeds manual suicide 2017-12-05 17:57:08 -05:00
Jordan Brown 8cdf67f9a3 Minor component optimizations (#33269)
* Minor component optimizations

* Second argument of list.Copy is optional
2017-12-05 15:51:36 -06:00
Jordan Brown c090486dd1 Removes bad comment. Makes check saner (#33270) 2017-12-05 15:49:19 -06:00
Jordan Brown 3aba012d67 Removes ComponentActivated in favor of callbacks (#33274)
* Removes ComponentActivated

* Removes a bit of proc call overhead

* Fix callback definition
2017-12-05 15:41:56 -06:00
Robustin 35e55c7dd0 Reverts sound range and falloff so as to not carry as far (#33259)
* Reverts triple sound range

* Reverts sound falloff
2017-12-05 19:40:51 -02:00
Leo 2655d42770 Merge pull request #33262 from AutomaticFrenzy/patch/uplink-implant
Fix uplink implants not working
2017-12-05 19:39:16 -02:00
Jordan Brown a90dc6af6a Fix some unquoted list associations (#33290) 2017-12-05 15:30:25 -06:00
ninjanomnom 761c02ba45 old turf in afterShuttleMove 2017-12-05 16:00:16 -05:00
oranges 25bf86027a Blank messages no longer add a second input box, after you close the
first
2017-12-05 21:00:02 +00:00
Jordan Brown 3f40dd8da4 Fixes every config flag updating world.sleep_offline 2017-12-05 15:48:39 -05:00
Leo 917572c233 Merge pull request #33278 from tgstation/Cyberboss-patch-9-1
Allows read-only VV of feedback
2017-12-05 18:32:37 -02:00
AnturK ece89da019 Fixes ahelp trimming (#33268) 2017-12-05 18:26:45 -02:00
MoreRobustThanYou 87009ef45d [s] Fix changeling chat (#33305)
* Fix changeling chat

* Update say.dm
2017-12-05 14:42:07 -05:00
AnturK 36687948f6 Fixes ghost role events being picked by false alert 2017-12-05 20:19:38 +01:00
Robustin e5613cfea0 Standardize report weight 2017-12-05 11:17:46 -05:00
Robustin 92403e4d2b Standardize report weight 2017-12-05 11:17:24 -05:00
Robustin a1b2c1bf02 Simpler way to standardize reports 2017-12-05 11:16:51 -05:00
QualityVan 39099e26e1 Fixes zombie head removal 2017-12-05 10:42:04 -05:00
Jordan Brown b556decff2 Fixes say logging 2017-12-05 09:34:04 -05:00
oranges 937ebf6afa Merge pull request #33277 from tgstation/Cyberboss-patch-8
Fixes departmental say
2017-12-05 23:07:28 +13:00
oranges bf9f81bf7e Merge pull request #32751 from ninjanomnom/keybindings
In-code key handling system, Take 2
2017-12-05 22:15:13 +13:00
Jordie 4d8f6701a0 removes some code i forgot about (#33260) 2017-12-05 03:16:41 -05:00
AnturK 9f48426ff0 Fixes powernets (#33288) 2017-12-05 03:11:53 -05:00
Dax Dupont 5927cbe9fd Adds disco inferno shuttle. (#33230)
* Adds disco inferno shuttle

* step be gone

* Minor wall replacement

* Add no diagonal walls

* Made the dance machine all access

* Makes the statues work as I originally intended in this shuttle

* Fixes a chair

* Changed door and made it to keep fire inside.
2017-12-05 03:10:31 -05:00
Ashe Higgs 0b72cf4732 Stethoscope defibrillation checking (#33234) 2017-12-05 02:56:26 -05:00
oranges bd954fe780 Merge pull request #32964 from AutomaticFrenzy/patch/joules
Measure energy values in joules
2017-12-05 20:42:25 +13:00
Jordan Brown 6a95c804ae Adds server tools version to feedback (#33244)
* Adds server tools version to feedback

* Fix incorrect call to record_feedback

* Add number to record feedback calls
2017-12-05 20:37:42 +13:00
oranges 7def0e23b7 Merge pull request #33251 from tgstation/Cyberboss-patch-3
Reduces the volume of showers
2017-12-05 20:37:15 +13:00
kevinz000 1acc43c034 No screaming if you don't get shocked or are insulated. 2017-12-04 16:04:54 -08:00