Commit Graph

11304 Commits

Author SHA1 Message Date
deathride58 3266cdfe0c Merge pull request #4667 from Citadel-Station-13/upstream-merge-34066
[MIRROR] Fixes white power cables in DM
2018-01-05 02:45:53 +00:00
CitadelStationBot c8ec3d8e51 Automatic changelog generation for PR #4662 [ci skip] 2018-01-04 20:44:24 -06:00
deathride58 3a8e2870ca Merge pull request #4662 from Citadel-Station-13/upstream-merge-34059
[MIRROR] You now have to stand next to the decoy nuke disk and examine it to know it's fake
2018-01-05 02:44:21 +00:00
CitadelStationBot ddb8c54418 Fixes white power cables in DM 2018-01-04 20:16:32 -06:00
ShizCalev 3d3f28e091 Fixes white power cables in DM (#34066) 2018-01-04 20:16:31 -06:00
CitadelStationBot 4a5d9e3bd6 Automatic changelog generation for PR #4666 [ci skip] 2018-01-04 20:02:24 -06:00
deathride58 877bd463b1 Merge pull request #4666 from Citadel-Station-13/upstream-merge-34091
[MIRROR] Fixes explosion runtimes
2018-01-05 02:02:22 +00:00
deathride58 f6c495885c Merge pull request #4663 from Citadel-Station-13/upstream-merge-34060
[MIRROR] Fixes brothers not assigning properly.
2018-01-05 01:57:59 +00:00
deathride58 1bfba8fd50 Update nuclearbomb.dm 2018-01-04 20:56:53 -05:00
CitadelStationBot a89013b8fb Automatic changelog generation for PR #4661 [ci skip] 2018-01-04 19:56:09 -06:00
deathride58 f875444339 Merge pull request #4661 from Citadel-Station-13/upstream-merge-34075
[MIRROR] Adds more observation messages in deadchat
2018-01-05 01:56:07 +00:00
CitadelStationBot 87ec31cdd5 Automatic changelog generation for PR #4659 [ci skip] 2018-01-04 19:55:35 -06:00
deathride58 53910ffde9 Merge pull request #4659 from Citadel-Station-13/upstream-merge-34025
[MIRROR] PDA Interface color is now a preference.
2018-01-05 01:55:32 +00:00
CitadelStationBot b8444c9e5d Fixes explosion runtimes 2018-01-04 19:52:56 -06:00
deathride58 c63661871f Fixes explosion runtimes (#34091)
* fixes explosion runtimes

* cyka
2018-01-04 19:52:56 -06:00
CitadelStationBot 2204b3b0b4 Fixes brothers not assigning properly. 2018-01-04 15:17:56 -06:00
Leo 7a2955b96f Merge pull request #34060 from AnturK/brotherfix
Fixes brothers not assigning properly.
2018-01-04 15:17:56 -06:00
ShiggyDiggyDo 8a176e126e You now have to stand next to the decoy nuke disk and examine it to know it's fake 2018-01-04 15:17:43 -06:00
CitadelStationBot 40b8f1fafe Adds more observation messages in deadchat 2018-01-04 15:16:59 -06:00
Dax Dupont bf3468f61c Adds more observation messages in deadchat (#34075)
* Adds more observation messages

* so bold kobold

* caching
2018-01-04 15:16:58 -06:00
CitadelStationBot f1bb0ec2ba PDA Interface color is now a preference. 2018-01-03 21:12:09 -06:00
oranges a227ddf3c1 Merge pull request #34025 from DaxDupont/PDAColor
PDA Interface color is now a preference.
2018-01-03 21:12:09 -06:00
CitadelStationBot fb555e5680 Automatic changelog generation for PR #4649 [ci skip] 2018-01-03 15:24:28 -06:00
LetterJay f2b1898235 Merge pull request #4649 from Citadel-Station-13/upstream-merge-34041
[MIRROR] Fixes afterattack running when clicking a portal
2018-01-03 15:24:26 -06:00
CitadelStationBot b9cef4a3a4 Automatic changelog generation for PR #4648 [ci skip] 2018-01-03 15:24:17 -06:00
LetterJay c7ac59b7a5 Merge pull request #4648 from Citadel-Station-13/upstream-merge-34046
[MIRROR] Fixes splash-fried deepfryholders not having any cooking oil in them
2018-01-03 15:24:15 -06:00
CitadelStationBot 8edebc4ff4 Fixes afterattack running when clicking a portal 2018-01-03 15:10:22 -06:00
Jordan Brown 50d75e53c9 Fixes #34030 (#34041) 2018-01-03 15:10:22 -06:00
CitadelStationBot 0a755283cf Fixes splash-fried deepfryholders not having any cooking oil in them 2018-01-03 15:06:55 -06:00
vuonojenmustaturska edea89c8fe You can taste oil (#34046) 2018-01-03 15:06:54 -06:00
CitadelStationBot a49020dcb6 Automatic changelog generation for PR #4646 [ci skip] 2018-01-03 12:56:33 -06:00
deathride58 94eeb5981d Merge pull request #4646 from Citadel-Station-13/upstream-merge-34031
[MIRROR] Prevents Nar-Sie from being double-summoned
2018-01-03 18:56:31 +00:00
CitadelStationBot 5d336ede48 Automatic changelog generation for PR #4645 [ci skip] 2018-01-03 12:56:20 -06:00
deathride58 f39253a0cc Merge pull request #4645 from Citadel-Station-13/upstream-merge-34023
[MIRROR] Less is more - Nerfs explosion camera shake
2018-01-03 18:56:17 +00:00
deathride58 b09086022d Merge pull request #4644 from Citadel-Station-13/upstream-merge-34040
[MIRROR] Fixes marauder ghostclick jump
2018-01-03 18:54:36 +00:00
CitadelStationBot 027def7490 Automatic changelog generation for PR #4643 [ci skip] 2018-01-03 12:54:14 -06:00
deathride58 6dc4584401 Merge pull request #4643 from Citadel-Station-13/upstream-merge-34033
[MIRROR] Fix mimes being able to laugh audibly
2018-01-03 18:54:12 +00:00
deathride58 64b5feae78 Merge pull request #4642 from Citadel-Station-13/upstream-merge-34038
[MIRROR] Fixes text pad window title
2018-01-03 18:53:51 +00:00
CitadelStationBot f6e8f7397d Automatic changelog generation for PR #4641 [ci skip] 2018-01-03 12:53:32 -06:00
deathride58 c7ec2adae6 Merge pull request #4641 from Citadel-Station-13/upstream-merge-34039
[MIRROR] Fixes observers not being transfered to new mobs
2018-01-03 18:53:30 +00:00
CitadelStationBot 3264569d71 Prevents Nar-Sie from being double-summoned 2018-01-03 12:25:35 -06:00
Jordan Brown 1d235c0a72 Merge pull request #34031 from ShizCalev/narsie-summons
Prevents Nar-Sie from being double-summoned
2018-01-03 12:25:35 -06:00
CitadelStationBot 952866c9ff Less is more - Nerfs explosion camera shake 2018-01-03 11:59:55 -06:00
Jordan Brown 3516c837d9 Merge pull request #34023 from deathride58/LESSISMOREHOLYFUCK
Less is more - Nerfs explosion camera shake
2018-01-03 11:59:55 -06:00
CitadelStationBot 5286161053 Fixes marauder ghostclick jump 2018-01-03 11:58:42 -06:00
Jordan Brown a642a1c298 Merge pull request #34040 from AnturK/maraudercheck
Fixes marauder ghostclick jump
2018-01-03 11:58:42 -06:00
CitadelStationBot 2c411abf0c Fix mimes being able to laugh audibly 2018-01-03 07:36:43 -06:00
Leo c1623792c9 Merge pull request #34033 from AutomaticFrenzy/patch/mime-laugh
Fix mimes being able to laugh audibly
2018-01-03 07:36:43 -06:00
CitadelStationBot 33c4989be3 Fixes text pad window title 2018-01-03 07:35:17 -06:00
Leo 832b1d95df Merge pull request #34038 from ShizCalev/text-pad
Fixes text pad window title
2018-01-03 07:35:17 -06:00