Commit Graph

11283 Commits

Author SHA1 Message Date
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
CitadelStationBot 22be36885a Fixes observers not being transfered to new mobs 2018-01-03 07:33:53 -06:00
ShizCalev c41bf82380 Fixes observers not being transfered to new mobs (#34039) 2018-01-03 07:33:53 -06:00
CitadelStationBot a430b31af3 Automatic changelog generation for PR #4640 [ci skip] 2018-01-03 04:57:27 -06:00
LetterJay 91c584fc22 Merge pull request #4640 from Citadel-Station-13/upstream-merge-34037
[MIRROR] Fixes vent angles and on-ground item icons
2018-01-03 04:57:24 -06:00
LetterJay b6a8902e01 Merge pull request #4639 from Citadel-Station-13/upstream-merge-34032
[MIRROR] Unsquishes job ban panel
2018-01-03 04:57:12 -06:00
CitadelStationBot 582e063c7c Automatic changelog generation for PR #4603 [ci skip] 2018-01-03 04:56:57 -06:00
LetterJay 6d1095a3cb Merge pull request #4603 from Citadel-Station-13/upstream-merge-33917
[MIRROR] Always use the area name when selecting a teleport beacon
2018-01-03 04:56:55 -06:00
CitadelStationBot cf35644ff8 Automatic changelog generation for PR #4426 [ci skip] 2018-01-03 04:56:41 -06:00
LetterJay ae8ae2969c Merge pull request #4426 from Citadel-Station-13/upstream-merge-33601
[MIRROR] Fixes cross comms
2018-01-03 04:56:38 -06:00
CitadelStationBot 035e334e5d Fixes vent angles and on-ground item icons 2018-01-02 20:10:38 -06:00
ShizCalev bf8e27e4f3 Fixes vent angles and inworld item icons 2018-01-02 20:10:38 -06:00
CitadelStationBot 1739e57999 Unsquishes job ban panel 2018-01-02 20:10:30 -06:00
Dax Dupont 417e3d801e Unsquishes job ban panel 2018-01-02 20:10:30 -06:00
LetterJay d8806cacc7 Merge pull request #4638 from Citadel-Station-13/upstream-merge-33967
[MIRROR] Makes the decal component handle updating inventory icons
2018-01-02 19:15:46 -06:00
CitadelStationBot c43a7b33e1 Automatic changelog generation for PR #4637 [ci skip] 2018-01-02 19:15:25 -06:00
LetterJay fc4e56201c Merge pull request #4637 from Citadel-Station-13/upstream-merge-33986
[MIRROR] Makes some virology symptoms more worth using
2018-01-02 19:15:22 -06:00
LetterJay 3a2deb1d49 Merge branch 'master' into upstream-merge-33601 2018-01-02 18:26:18 -06:00
CitadelStationBot 928e9e02ff Automatic changelog generation for PR #4601 [ci skip] 2018-01-02 18:13:45 -06:00
LetterJay 706556df69 Merge pull request #4601 from Citadel-Station-13/upstream-merge-33919
[MIRROR] turfs changed to /space/basic are instead turned into /space
2018-01-02 18:13:42 -06:00
LetterJay 4dcc65a6bc Merge branch 'master' into upstream-merge-33917 2018-01-02 17:14:53 -06:00
CitadelStationBot 871da8f331 Automatic changelog generation for PR #4635 [ci skip] 2018-01-02 17:13:33 -06:00