Commit Graph

40087 Commits

Author SHA1 Message Date
Jordan Brown a90dc6af6a Fix some unquoted list associations (#33290) 2017-12-05 15:30:25 -06: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
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
Leo 277159fa2c Merge pull request #33243 from tgstation/Cyberboss-patch-5
Adds a CRASH on invalid calls to record_feedback
2017-12-04 16:52:58 -02:00
AnturK 3c7e886df8 Fixes robeless apprentice 2017-12-04 12:20:37 -06:00
Jordan Brown 6531c3f543 Revert "Why has no one done this yet??"
This reverts commit e4e7ba3890.

I don't know how this got here...
2017-12-04 12:23:31 -05:00
Jordan Brown 5d80dac70a Allows read-only VV of feedback 2017-12-04 12:13:55 -05:00
Jordan Brown 5d6a6cbd44 Fixes departmental say 2017-12-04 11:41:40 -05:00
Jordan Brown e4e7ba3890 Why has no one done this yet?? 2017-12-04 10:37:35 -05:00
ACCount 88187f86d5 Moves some machine sprites into /machines/ folder (#33124)
* Moves biogenerator.dmi

* Separates cryogenic2.dmi into 3 sprite files

* Updates a map

* moves suit storage sprite

* Gives cameras their own file
2017-12-04 14:45:35 +01:00
Jordan Brown 4e01bba3b5 SendSignal optimization (#33220)
* SendSignal optimization

* Update component README

* Readd required null checks
2017-12-04 06:29:39 -05:00
AnturK 5a9bd88817 Adds quiet argument to playsound. (#33185)
* Adds quiet argument to playsound.

* argument name change
2017-12-04 06:28:11 -05:00
AnturK 78fe2bc747 Holorecord disks. (#32868)
* Holorecord disks.

* visual preset swap command

* Renaming command

* Holodisk sprite by WJohn

* Adds holodisks to autolathe

* Cleanup

* Needless if
2017-12-04 06:14:08 -05:00
Jordan Brown feae1796c0 Fixes lighting update recursion (#33258) 2017-12-04 12:02:42 +01:00
Ashe Higgs 9fe24e7dce Mechs now require fuel to repair (#33225) 2017-12-04 11:54:32 +01:00
ACCount 302ca397a8 IC fixes (#33215) 2017-12-04 11:53:02 +01:00
QualityVan ed99e65933 Fixes missing eyes being absent (#33203) 2017-12-04 11:50:36 +01:00
Jordan Brown 3fa5acfdf4 People jitter when revived by defibs 2017-12-03 20:19:37 -06:00
Jordan Brown 1694bea43e Reduces the volume of showers 2017-12-03 17:39:14 -05:00
Leo cc8fafbcb1 Merge pull request #33217 from tgstation/Cyberboss-patch-3
Makes ahelp timestamps consistent with logs
2017-12-03 20:06:30 -02:00
kevinz000 5182128d2a refactors riding datums to a component, vehicle refactor staging for mech overhaul (#32249) 2017-12-04 10:33:01 +13:00
ExcessiveUseOfCobblestone bbb26450be Being buckled to a bed now saves you from "the floor is lava" (#33204)
* Update floor_is_lava.dm

* Switcheroo

* )))))))))))))
2017-12-03 14:16:34 -05:00
Robustin 3876bdc919 Plasma statues get fixed (#33224)
* Plasma statues fix

* Actually a fix

* brackets
2017-12-03 14:15:42 -05:00
MoreRobustThanYou 36414ac1e6 Datumizes saymodes (#33013)
* Datumized saymodes!

* Update living.dm

* ...
2017-12-03 13:55:03 -05:00
Ashe Higgs fe816daca1 Adds emergency lights, built into light fixtures (#33213)
* Adds emergency lighting

* Checks for the cell during construction

* Adds AI/APC control of emergency lights

* Malfunction ability

* get_area(src)

* Loop checking, processing to come when clarified

* that DOES remind me to do this!
2017-12-03 13:53:58 -05:00
jammer312 bc998ffe1a Crash to timers and INFINITY check to beams. (#33219)
* beams

* timers

* >= instead of !=

* whooops
2017-12-03 13:44:58 -05:00
checkraisefold 80df6e2e69 Spellcheck (#33214) 2017-12-03 13:41:04 -05:00
Jordan Brown b6a93ead6d Adds a CRASH on invalid calls to record_feedback 2017-12-03 13:29:52 -05:00
Tad Hardesty c6da68ab62 Measure energy values in joules 2017-12-02 16:05:31 -08:00
ExcessiveUseOfCobblestone 74e3d9b1c9 Revolutionaries can now see deconversion message regardless of status (#33202) 2017-12-02 18:46:14 -05:00
Leo 80aad8cef0 Merge pull request #33165 from MrStonedOne/revert-33062-ore_stacking
Revert "Ore Stacking"
2017-12-02 18:00:45 -02:00
Jordan Brown 2b5aee9ffc Merge pull request #33192 from Robustin/SavioroftheUniverse
Fixes terrible Flash logic
2017-12-02 09:46:48 -05:00
Jordan Brown 972fb937cf Merge pull request #33198 from kevinz000/patch-400
Corrects the HoS not having a spare gun fabr- I mean, departmental protolathe board.
2017-12-02 09:45:08 -05:00
FrozenGuy5 1ef3e9eb3e Prevents the PA wires from being EMP'd (#33199)
* returns emp_act

* jordie for code owner
2017-12-02 09:43:46 -05:00
Jordan Brown 2c541f2fd0 Merge pull request #33191 from vuonojenmustaturska/bombmemes
Fixes a division by zero in humans' ex_act()
2017-12-02 09:42:37 -05:00
Jordan Brown 9c9782503b Makes ahelp timestamps consistent with logs 2017-12-02 09:27:02 -05:00
CosmicScientist 502905f7ac Plushie relationships! (#33184)
* Kor and Bubblegum, sitting in a tree

* complying with oranges' review

* remove the, moves mood setting to make_young, dots Ts, crosses eyes
2017-12-03 00:48:59 +13:00
AnturK bde316228a Fixes syndieborg spawner 2017-12-02 01:20:32 -06:00
vuonojenmustaturska bae75e8459 Clean up some loc assignments (#33157) 2017-12-01 22:14:32 -02:00
Leo 4bdcebef99 Merge pull request #33180 from praisenarsie/patch-13
cardboard no longer can damage you
2017-12-01 21:56:45 -02:00