Commit Graph

1176 Commits

Author SHA1 Message Date
kevinz000 0e718e32cc Merge pull request #760 from Citadel-Station-13/upstream-merge-26804
[MIRROR] Nuke op TC consoles can donate all TCs at once, and other small changes.
2017-05-06 21:23:46 -07:00
kevinz000 91955ccb05 Delete Sleeper.dm.rej 2017-05-06 21:04:22 -07:00
kevinz000 6880e7c373 Update Sleeper.dm 2017-05-06 21:03:17 -07:00
kevinz000 b7621ff9fe Merge pull request #813 from Citadel-Station-13/upstream-merge-26937
[MIRROR] Elevators
2017-05-06 20:57:55 -07:00
kevinz000 db50cc8c94 Merge pull request #812 from Citadel-Station-13/upstream-merge-26949
[MIRROR] ORM fixes
2017-05-06 20:57:17 -07:00
kevinz000 bfe7441f9b Merge pull request #791 from Citadel-Station-13/upstream-merge-26867
[MIRROR] Holy water will now properly make you jittery
2017-05-06 15:41:24 -07:00
kevinz000 4a2a0e8a0d Merge pull request #732 from Citadel-Station-13/upstream-merge-26778
[MIRROR] Plasma vessels regenerate slowly off resin
2017-05-06 15:26:10 -07:00
CitadelStationBot df204497cd Elevators 2017-05-06 16:29:50 -05:00
kevinz000 d43e64bcc3 Merge pull request #774 from Citadel-Station-13/upstream-merge-26805
[MIRROR] Fixes SM Tesla admin log spam, adds containment field count to investigate logs.
2017-05-06 14:24:08 -07:00
kevinz000 e5249ff8d0 Merge pull request #764 from Citadel-Station-13/upstream-merge-26855
[MIRROR] Makes dental implants move through dismemberment
2017-05-06 14:23:03 -07:00
kevinz000 329190d660 Merge pull request #809 from Citadel-Station-13/upstream-merge-26933
[MIRROR] Makes medbay vending machines buildable
2017-05-06 14:22:08 -07:00
CitadelStationBot d7bdb49283 ORM fixes 2017-05-06 16:20:39 -05:00
kevinz000 ecd0723fd4 Merge pull request #811 from Citadel-Station-13/upstream-merge-26985
[MIRROR] Fixes really long Ratvar shuttle calls
2017-05-06 14:19:02 -07:00
kevinz000 d4057bf862 Merge pull request #731 from Citadel-Station-13/upstream-merge-26814
[MIRROR] Clockwork component generation is twice as fast, but scriptures cost up to twice as much
2017-05-06 14:18:45 -07:00
kevinz000 638250993c Merge pull request #770 from Citadel-Station-13/upstream-merge-26873
[MIRROR] Fixes grammar error on spawner grenades
2017-05-06 14:11:18 -07:00
kevinz000 760ab46274 Merge pull request #783 from Citadel-Station-13/upstream-merge-26896
[MIRROR] Fixes answering a holocall not disconnecting other calls
2017-05-06 14:10:58 -07:00
kevinz000 b6231af063 Merge pull request #682 from Citadel-Station-13/upstream-merge-26731
[MIRROR] Buffs mercury and lithium [Travis error unrelated to PR]
2017-05-06 14:08:51 -07:00
kevinz000 cc8d113c0f Merge branch 'master' into upstream-merge-26928 2017-05-06 14:05:16 -07:00
kevinz000 3e1a1588b5 Merge pull request #805 from Citadel-Station-13/upstream-merge-26927
[MIRROR] Replaces stun/weaken from Miner's salve
2017-05-06 14:04:56 -07:00
kevinz000 bf5a9a5037 Update mob.dm 2017-05-06 14:04:17 -07:00
kevinz000 d3d335d835 Update mob.dm 2017-05-06 14:03:52 -07:00
kevinz000 8af1d05cc4 Delete mob.dm.rej 2017-05-06 14:02:42 -07:00
kevinz000 5aff0de6dd Merge pull request #737 from Citadel-Station-13/upstream-merge-26811
[MIRROR] adds a safety catch to spin()
2017-05-06 14:02:14 -07:00
kevinz000 d1a8f643d6 Merge pull request #738 from Citadel-Station-13/upstream-merge-26774
[MIRROR] Fixes alien eggs
2017-05-06 13:59:33 -07:00
kevinz000 28f6096503 Merge pull request #788 from Citadel-Station-13/upstream-merge-26911
[MIRROR] Improves vending machine user feedback
2017-05-06 13:59:05 -07:00
kevinz000 ec8a5f713b Merge pull request #782 from Citadel-Station-13/upstream-merge-26895
[MIRROR] Sigils of Transgression are slightly more visible and glow very faintly
2017-05-06 13:58:28 -07:00
CitadelStationBot e9ff2203cf Fixes really long Ratvar shuttle calls 2017-05-06 15:13:33 -05:00
kevinz000 6f90d11a38 Merge pull request #787 from Citadel-Station-13/upstream-merge-26913
[MIRROR] Players may no longer commite suicide
2017-05-06 12:21:57 -07:00
CitadelStationBot 30f7e170a3 Makes medbay vending machines buildable 2017-05-06 13:52:12 -05:00
kevinz000 b440ba70b0 Delete suicide.dm.rej 2017-05-06 11:49:26 -07:00
kevinz000 c5f7644452 Update suicide.dm 2017-05-06 11:48:24 -07:00
kevinz000 6a855bcee3 Merge pull request #804 from Citadel-Station-13/upstream-merge-26929
[MIRROR] Fixes HTTPSGet being unprotected
2017-05-06 11:43:19 -07:00
kevinz000 3f67f8bf24 Merge pull request #747 from Citadel-Station-13/upstream-merge-26798
[MIRROR] Adds examining mouths with flashlights
2017-05-06 11:41:36 -07:00
kevinz000 62b8f929bb Merge pull request #746 from Citadel-Station-13/upstream-merge-26794
[MIRROR] Turrets no longer target invisible creatures
2017-05-06 11:39:01 -07:00
kevinz000 332733f90a Merge pull request #745 from Citadel-Station-13/upstream-merge-26784
[MIRROR] Revenant now goes into stasis until ectoplasm is destroyed [FINISHED]
2017-05-06 11:35:29 -07:00
CitadelStationBot 10846d5d37 Replaces stun/weaken from Miner's salve 2017-05-06 10:48:07 -05:00
CitadelStationBot 310f23db5c Fixes HTTPSGet being unprotected 2017-05-06 10:46:00 -05:00
CitadelStationBot 0972689cfc Updated: Reduces dominator timer ceiling, changes territory scaling 2017-05-06 10:44:56 -05:00
CitadelStationBot 8a3b280ede Preliminary tesla projectile refactor (also insults vcordie because I'm mean.) 2017-05-06 10:42:51 -05:00
LetterJay 32651c31cb Merge pull request #743 from Citadel-Station-13/upstream-merge-26806
[MIRROR] Hopefully makes flightsuit processing less taxing on the server
2017-05-06 10:26:16 -05:00
CitadelStationBot b72f4102a1 Internal affairs upgrades [READY] 2017-05-06 10:16:24 -05:00
CitadelStationBot 2922a9fee8 Seed vault lavaland ruin can only spawn once 2017-05-06 08:09:25 -05:00
CitadelStationBot d0335b6d07 Blorble 2017-05-06 05:12:39 -05:00
CitadelStationBot a084031dc4 hm 2017-05-06 05:12:36 -05:00
CitadelStationBot 09655ed5e8 Adds player age and byond account age to player panel 2017-05-05 20:08:07 -05:00
CitadelStationBot b993d9ad23 Holy water will now properly make you jittery 2017-05-05 18:33:34 -05:00
CitadelStationBot 122c791138 Patches the new cleanbot bug 2017-05-05 18:14:13 -05:00
CitadelStationBot 877acc972a Fixes dead mobs being initialized twice 2017-05-05 18:12:07 -05:00
CitadelStationBot 0fb29b2650 Improves vending machine user feedback 2017-05-05 18:10:01 -05:00
CitadelStationBot 7288549dec Players may no longer commite suicide 2017-05-05 18:08:56 -05:00