Commit Graph

11054 Commits

Author SHA1 Message Date
F-OS
9c8959f2ff Last resort now requires a confirmation. (#33947)
* Update headcrab.dm

* fixed

* fuck

* Update headcrab.dm

* Update headcrab.dm
2017-12-31 02:24:53 -06:00
CitadelStationBot
06901e1edc Automatic changelog generation for PR #4610 [ci skip] 2017-12-30 17:43:28 -06:00
LetterJay
67b7cfc2ca Merge pull request #4610 from deathride58/vorefix
Fixes vore only functioning on monkeys
2017-12-30 17:43:26 -06:00
deathride58
d249bf886a Fixes vore not functioning 2017-12-30 18:23:25 -05:00
CitadelStationBot
1be3d30c43 Automatic changelog generation for PR #4579 [ci skip] 2017-12-30 14:13:25 -06:00
LetterJay
dad7c72a3e Merge pull request #4579 from Citadel-Station-13/upstream-merge-33663
[MIRROR] [Ready]Adds the Pax reagent, small tweaks to pacifism
2017-12-30 14:13:23 -06:00
LetterJay
4237a8910c Merge pull request #4483 from Citadel-Station-13/upstream-merge-33682
[MIRROR] Makes newscaster feedback messages and comments always a list.
2017-12-30 14:13:03 -06:00
LetterJay
c8f3fdfe38 Merge branch 'master' into upstream-merge-33663 2017-12-30 13:29:36 -06:00
LetterJay
8452cc74d0 Update newscaster.dm 2017-12-30 13:21:31 -06:00
CitadelStationBot
eda5869b4f Automatic changelog generation for PR #4530 [ci skip] 2017-12-30 13:19:02 -06:00
LetterJay
b260704381 Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705
[MIRROR] Turns the baseturf var into a part time list
2017-12-30 13:19:00 -06:00
LetterJay
f860fa0cd3 Update closed.dm 2017-12-30 05:12:10 -06:00
CitadelStationBot
68c5c6cfe2 Automatic changelog generation for PR #4533 [ci skip] 2017-12-30 05:06:34 -06:00
LetterJay
68b44e73f4 Merge pull request #4533 from Citadel-Station-13/upstream-merge-33734
[MIRROR] Makes cyclelinkeddir rotate with shuttle
2017-12-30 05:06:32 -06:00
LetterJay
0402595242 Merge pull request #4540 from Citadel-Station-13/upstream-merge-33835
[MIRROR] Adds coordinates to href logs
2017-12-30 05:06:19 -06:00
LetterJay
19c6db6a6e Merge pull request #4591 from Citadel-Station-13/upstream-merge-33905
[MIRROR] Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
2017-12-30 05:06:03 -06:00
LetterJay
61203ed9f6 Merge pull request #4588 from Citadel-Station-13/upstream-merge-33914
[MIRROR] Prevent infinite loops in orbit checks
2017-12-30 05:05:30 -06:00
CitadelStationBot
283ee4bca3 Automatic changelog generation for PR #4590 [ci skip] 2017-12-30 05:05:22 -06:00
LetterJay
72d0ca2f1a Merge pull request #4590 from Citadel-Station-13/upstream-merge-33796
[MIRROR] Monkeymode fixes
2017-12-30 05:05:20 -06:00
LetterJay
de0ade801c Merge pull request #4589 from Citadel-Station-13/upstream-merge-33903
[MIRROR] Fixes mobs targeting from inside things.
2017-12-30 05:04:09 -06:00
CitadelStationBot
458c437a73 Automatic changelog generation for PR #4580 [ci skip] 2017-12-30 05:03:51 -06:00
LetterJay
4599680f68 Merge pull request #4580 from Citadel-Station-13/upstream-merge-33842
[MIRROR] Internal radio implant
2017-12-30 05:03:48 -06:00
LetterJay
2d9a70a487 Update uplink_kits.dm 2017-12-29 18:42:44 -06:00
LetterJay
d820575f78 Update orbit.dm 2017-12-29 18:41:57 -06:00
LetterJay
6f8c2c1daf Update item_attack.dm 2017-12-29 18:40:58 -06:00
LetterJay
010c1e17ad Update client_procs.dm 2017-12-29 18:38:32 -06:00
LetterJay
ac7750202b Update shuttle_rotate.dm 2017-12-29 18:38:05 -06:00
CitadelStationBot
c1d33f2173 Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit 2017-12-29 10:10:30 -06:00
Jordan Brown
d38a4a2aa5 Merge pull request #33905 from ShizCalev/jumpsuit-fix
Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
2017-12-29 10:10:30 -06:00
CitadelStationBot
22c5929543 Monkeymode fixes 2017-12-29 10:08:17 -06:00
MoreRobustThanYou
459d4f35c7 Monkeymode fixes (#33796)
* Monkey fixes

* Update say.dm
2017-12-29 10:08:17 -06:00
CitadelStationBot
65ee62c77f Fixes mobs targeting from inside things. 2017-12-29 10:01:57 -06:00
Jordan Brown
8059894d7d Merge pull request #33903 from AnturK/pilot-fixes
Fixes mobs targeting from inside things.
2017-12-29 10:01:57 -06:00
Jordan Brown
0b9ffdd3e3 Prevent infinite loops in orbit checks 2017-12-29 10:00:44 -06:00
LetterJay
48e0c47410 Merge pull request #4520 from Citadel-Station-13/upstream-merge-33783
[MIRROR] Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-29 09:02:53 -06:00
LetterJay
a56882556b Update _eminence.dm 2017-12-29 07:36:03 -06:00
LetterJay
a64a1e4a5c Merge branch 'master' into upstream-merge-33783 2017-12-29 06:49:47 -06:00
LetterJay
6d52395643 Merge pull request #4587 from Citadel-Station-13/upstream-merge-33899
[MIRROR] Fixes air alarm contaminated mode
2017-12-29 06:48:09 -06:00
LetterJay
e17f9fdc07 Merge pull request #4586 from Citadel-Station-13/upstream-merge-33895
[MIRROR] Corrects abductor uncuffing message
2017-12-29 06:47:56 -06:00
LetterJay
b2b10703f0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-12-29 06:47:28 -06:00
LetterJay
c652bd6a46 cl 2017-12-29 06:47:17 -06:00
LetterJay
464edc7699 Merge pull request #4585 from Citadel-Station-13/upstream-merge-33896
[MIRROR] Fixes apple/banana/potato juicing
2017-12-29 06:30:04 -06:00
LetterJay
0bfd05e668 Merge pull request #4584 from Citadel-Station-13/upstream-merge-33857
[MIRROR] Increases research point income by 33% (APPROVED BY KORPHAERON)
2017-12-29 06:26:30 -06:00
CitadelStationBot
7caa5a48b1 Automatic changelog generation for PR #4583 [ci skip] 2017-12-29 06:26:08 -06:00
LetterJay
80ce187d3d Merge pull request #4583 from Citadel-Station-13/upstream-merge-33873
[MIRROR] The Radiance (eminence after ratvar awakens) can now ignore chapel tiles
2017-12-29 06:26:06 -06:00
CitadelStationBot
fcbb8d1a2f Automatic changelog generation for PR #4582 [ci skip] 2017-12-29 06:25:56 -06:00
LetterJay
b8370a7786 Merge pull request #4582 from Citadel-Station-13/upstream-merge-33882
[MIRROR] Spell action buttons finally fixed
2017-12-29 06:25:54 -06:00
CitadelStationBot
b778fd1251 Automatic changelog generation for PR #4581 [ci skip] 2017-12-29 06:25:43 -06:00
LetterJay
71a51528c3 Merge pull request #4581 from Citadel-Station-13/upstream-merge-33847
[MIRROR] Adds colour shift to timestop
2017-12-29 06:25:41 -06:00
LetterJay
72ab9444c1 Merge pull request #4578 from Citadel-Station-13/upstream-merge-33876
[MIRROR] Cleans up survivor counting tiny bit
2017-12-29 06:25:11 -06:00