Commit Graph

10837 Commits

Author SHA1 Message Date
CitadelStationBot ce47cc5e66 Fixes ghost zoom being broken 2017-12-26 23:50:33 -06:00
oranges 20b8f9c87f Merge pull request #33833 from deathride58/please-repoban-kev
Fixes ghost zoom being broken
2017-12-26 23:50:33 -06:00
deathride58 dc0e3a89d5 Merge pull request #4523 from Citadel-Station-13/kevinz000-patch-3
readds shock collars
2017-12-26 22:10:09 +00:00
CitadelStationBot 5a515ff24a Automatic changelog generation for PR #4544 [ci skip] 2017-12-26 15:58:19 -06:00
CitadelStationBot 8aed987bd9 [MIRROR] Fixes emagged cleanbot acid attack doing no damage (#4544)
* Fixes emagged cleanbot acid attack doing no damage (#33848)

* Fixes emagged cleanbot acid attack doing no damage
2017-12-26 13:58:16 -08:00
CitadelStationBot b45ae2078f Automatic changelog generation for PR #4543 [ci skip] 2017-12-26 15:58:04 -06:00
CitadelStationBot 9aa77b7df1 [MIRROR] Rebalances virus healing (#4543)
* Rebalances virus healing (#33815)

* Rebalances virus healing

* carbon

* Rebalances virus healing
2017-12-26 13:58:02 -08:00
LetterJay ab1965b3a2 Merge pull request #4398 from Citadel-Station-13/upstream-merge-32916
[MIRROR] [READY] Monkey mode overhaul
2017-12-26 08:38:42 -06:00
LetterJay 290c1e0868 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32916 2017-12-26 08:24:20 -06:00
LetterJay 14472e5139 Merge pull request #4443 from Citadel-Station-13/upstream-merge-33485
[MIRROR] code improvements from mso and co
2017-12-26 07:38:17 -06:00
CitadelStationBot d36b3e036b Automatic changelog generation for PR #4447 [ci skip] 2017-12-26 07:38:08 -06:00
LetterJay 7be17b6f12 Merge pull request #4447 from Citadel-Station-13/upstream-merge-33639
[MIRROR] Golems can wear labcoats
2017-12-26 07:38:06 -06:00
CitadelStationBot 29e221c3f9 Automatic changelog generation for PR #4503 [ci skip] 2017-12-26 05:59:54 -06:00
LetterJay 358c625ed3 Merge pull request #4503 from Citadel-Station-13/upstream-merge-33590
[MIRROR] [READY]Clownborgs - ADMIN SPAWN ONLY
2017-12-26 05:59:52 -06:00
CitadelStationBot 69a12f0557 Automatic changelog generation for PR #4472 [ci skip] 2017-12-26 05:29:44 -06:00
LetterJay e4f39a97c3 Merge pull request #4472 from Citadel-Station-13/upstream-merge-33634
[MIRROR] (probably?) Fixes being able to create two Eminences at a time + other Eminence issues
2017-12-26 05:29:42 -06:00
LetterJay e51baed92e Update labcoat.dm 2017-12-26 05:27:01 -06:00
CitadelStationBot 072e5b32ae Automatic changelog generation for PR #4527 [ci skip] 2017-12-25 22:25:57 -06:00
LetterJay 4b79ee5e94 Merge pull request #4527 from Citadel-Station-13/upstream-merge-33736
[MIRROR] Ghosts can *spin and *flip
2017-12-25 22:25:54 -06:00
LetterJay 4cefd9219f Update say.dm 2017-12-25 21:32:05 -06:00
LetterJay a7a0823594 Update say.dm 2017-12-25 21:31:50 -06:00
LetterJay 41bae055ba Merge pull request #4524 from Citadel-Station-13/upstream-merge-33816
[MIRROR] gives medical some medical boards, but not their own circuit imprinter yet
2017-12-25 21:30:31 -06:00
LetterJay 50672ecf93 Merge pull request #4512 from Citadel-Station-13/upstream-merge-33752
[MIRROR] Fixes eminence login
2017-12-25 21:29:21 -06:00
LetterJay 5dd7136225 Merge branch 'master' into upstream-merge-33590 2017-12-25 21:29:18 -06:00
CitadelStationBot adfb04fa6d Automatic changelog generation for PR #4492 [ci skip] 2017-12-25 21:27:42 -06:00
LetterJay 8cd36f9927 Merge pull request #4492 from Citadel-Station-13/upstream-merge-33711
[MIRROR] adds mining scanners to the gulag
2017-12-25 21:27:39 -06:00
CitadelStationBot fcf707ad66 Automatic changelog generation for PR #4482 [ci skip] 2017-12-25 21:27:20 -06:00
LetterJay 91e87bf801 Merge pull request #4482 from Citadel-Station-13/upstream-merge-33584
[MIRROR] Tiles blessed by holy water now block servant warp-in/Eminence snooping
2017-12-25 21:27:17 -06:00
LetterJay a0a6134d4d Merge pull request #4502 from Citadel-Station-13/upstream-merge-33724
[MIRROR] re-implements issue template hiding and improves wording/structure
2017-12-25 21:26:45 -06:00
CitadelStationBot b4763cb2be Automatic changelog generation for PR #4497 [ci skip] 2017-12-25 21:26:36 -06:00
LetterJay 374ab40f4a Merge pull request #4497 from Citadel-Station-13/upstream-merge-33731
[MIRROR] Tweaks the syndicate infiltrator so it's no longer lopsided.
2017-12-25 21:26:34 -06:00
CitadelStationBot 8ed0838377 Automatic changelog generation for PR #4494 [ci skip] 2017-12-25 21:26:20 -06:00
LetterJay 134201d185 Merge pull request #4494 from Citadel-Station-13/upstream-merge-32433
[MIRROR] [READY]Refactors projectile trajectories, fixes piercing projectile inaccuracy and beam rifle visual deflections
2017-12-25 21:26:17 -06:00
coiax 703667bdff Ghosts can *spin and *flip 2017-12-25 17:11:29 -06:00
CitadelStationBot bf5e273414 gives medical some medical boards, but not their own circuit imprinter yet 2017-12-25 16:42:18 -06:00
kevinz000 b0f793f435 gives medical some medical boards, but not their own circuit imprinter yet (#33816)
* medical gets med boards

* sleepers/cryo too
2017-12-25 16:42:18 -06:00
LetterJay 6205268f7e Merge pull request #4441 from Citadel-Station-13/upstream-merge-33661
[MIRROR] [HIGH PRIORITY]Hotfix for the monkeylike disability
2017-12-25 07:28:52 -06:00
LetterJay e574d869fd Merge pull request #4438 from Citadel-Station-13/upstream-merge-33055
[MIRROR] [Ready Again]Refactors disabilities into lists, allowing for independent disability sources
2017-12-25 06:28:16 -06:00
LetterJay 62a9649a98 Update disease_outbreak.dm 2017-12-25 05:23:37 -06:00
LetterJay 7b40f3f0e0 Update disease_outbreak.dm 2017-12-25 05:09:21 -06:00
LetterJay ac5503d338 Merge branch 'master' into upstream-merge-33055 2017-12-25 04:10:34 -06:00
kevinz000 cab61abc32 Update autolathe_designs.dm 2017-12-24 23:29:33 -08:00
kevinz000 30bc560972 readds shock collars 2017-12-24 21:48:06 -08:00
CitadelStationBot 2609dc109f Automatic changelog generation for PR #4440 [ci skip] 2017-12-24 22:10:17 -06:00
LetterJay 3966774d09 Merge pull request #4440 from Citadel-Station-13/upstream-merge-33655
[MIRROR] Non movement keys pressed while moving no longer stop movement
2017-12-24 22:10:15 -06:00
LetterJay 8f6960e1a3 Merge pull request #4522 from Citadel-Station-13/upstream-merge-33579
[MIRROR] [READY]Circuitry upgrades
2017-12-24 22:09:42 -06:00
deathride58 d8e25d9501 Merge pull request #4499 from Citadel-Station-13/upstream-merge-33713
[MIRROR] if the deflection chance is < 100%, it won't say they can never be hit by ranged weapons
2017-12-24 23:06:28 +00:00
deathride58 9ce056322a Merge pull request #4493 from Citadel-Station-13/upstream-merge-33714
[MIRROR] Job landmarks now show the mob with the proper job outfit.
2017-12-24 23:05:36 +00:00
deathride58 6dc2d8f0eb Update reagents.dm 2017-12-24 18:02:13 -05:00
CitadelStationBot dab03cf25f Automatic changelog generation for PR #4521 [ci skip] 2017-12-24 17:01:06 -06:00