Commit Graph

11744 Commits

Author SHA1 Message Date
deathride58 90b35d405a Merge pull request #4796 from Citadel-Station-13/upstream-merge-33699
[MIRROR] Makes vault safe slightly less explosion-proof
2018-01-13 20:22:05 +00:00
CitadelStationBot fe442e262c Automatic changelog generation for PR #4795 [ci skip] 2018-01-13 14:21:45 -06:00
deathride58 9ccd21605d Merge pull request #4795 from Citadel-Station-13/pbchange
Panic bunker notice change
2018-01-13 20:21:43 +00:00
deathride58 e9785d8512 Merge pull request #4794 from Citadel-Station-13/upstream-merge-34296
[MIRROR] Fixes stimulum running out before the next breath
2018-01-13 20:21:21 +00:00
CitadelStationBot 2900cde32f Automatic changelog generation for PR #4793 [ci skip] 2018-01-13 14:21:05 -06:00
deathride58 80c4d1d92e Merge pull request #4793 from Citadel-Station-13/upstream-merge-34313
[MIRROR] Fix airlock console HTML
2018-01-13 20:21:03 +00:00
CitadelStationBot 2f49b41ee9 Automatic changelog generation for PR #4792 [ci skip] 2018-01-13 14:20:46 -06:00
deathride58 9c28302717 Merge pull request #4792 from Citadel-Station-13/upstream-merge-34316
[MIRROR] Fixes poker tables not being deleted after Narsie touches them
2018-01-13 20:20:43 +00:00
CitadelStationBot 66ee37188e Makes vault safe slightly less explosion-proof 2018-01-13 04:17:27 -06:00
oranges e164b0cf25 Merge pull request #33699 from QualityVan/safedestruction
Makes vault safe slightly less explosion-proof
2018-01-13 04:17:27 -06:00
CitadelStationBot ef1c99ba92 cl 2018-01-13 00:27:54 -05:00
LetterJay 6a9545db8a Panic bunker notice change 2018-01-12 23:22:36 -06:00
LetterJay 29287f84db Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2018-01-12 20:05:58 -06:00
LetterJay 72a9030f6a donate fix 2018-01-12 20:05:50 -06:00
CitadelStationBot d49c7410a8 Fixes stimulum running out before the next breath 2018-01-12 13:05:12 -06:00
kevinz000 54b356a227 Fixes stimulum running out before the next breath (#34296) 2018-01-12 13:05:12 -06:00
CitadelStationBot 2d80ba6196 Fix airlock console HTML 2018-01-12 12:57:52 -06:00
Leo 9c17444c5f Merge pull request #34313 from AutomaticFrenzy/patch/airlock-controller
Fix airlock console HTML
2018-01-12 12:57:52 -06:00
CitadelStationBot d9fe35a670 Fixes poker tables not being deleted after Narsie touches them 2018-01-12 12:30:15 -06:00
Leo 1d729e7d6d Merge pull request #34316 from tgstation/Cyberboss-patch-4
Fixes poker tables not being deleted after Narsie touches them
2018-01-12 12:30:15 -06:00
deathride58 5bb87e6778 Merge pull request #4790 from Citadel-Station-13/upstream-merge-34361
[MIRROR] Fix the batch file method of mapmerge2 and save a .before
2018-01-12 17:48:36 +00:00
deathride58 391fc06f01 Merge pull request #4789 from Citadel-Station-13/upstream-merge-34301
[MIRROR] Harvesters now normally attack those with NODISMEMBER species
2018-01-12 17:48:24 +00:00
CitadelStationBot 8686d2af17 Automatic changelog generation for PR #4788 [ci skip] 2018-01-12 11:48:16 -06:00
deathride58 62cfb99cb7 Merge pull request #4788 from Citadel-Station-13/upstream-merge-34310
[MIRROR] Removes some hrefs from logging
2018-01-12 17:48:13 +00:00
deathride58 bbc1e0d386 Merge pull request #4787 from Citadel-Station-13/upstream-merge-34305
[MIRROR] Add JMP buttons to mapping debug verbs
2018-01-12 17:47:54 +00:00
CitadelStationBot 732c16cae5 Automatic changelog generation for PR #4786 [ci skip] 2018-01-12 11:47:42 -06:00
deathride58 8fdfa44505 Merge pull request #4786 from Citadel-Station-13/upstream-merge-34312
[MIRROR] Fix description of relabelled canisters
2018-01-12 17:47:40 +00:00
CitadelStationBot 903da0a79a Automatic changelog generation for PR #4785 [ci skip] 2018-01-12 11:47:10 -06:00
deathride58 64c307800d Merge pull request #4785 from Citadel-Station-13/upstream-merge-34184
[MIRROR] Fixes pet collars not updating icons, also fixes being unable to attach collars to most pets
2018-01-12 17:47:07 +00:00
CitadelStationBot cbd6163210 Automatic changelog generation for PR #4784 [ci skip] 2018-01-12 11:46:48 -06:00
deathride58 f90a0e66e0 Merge pull request #4784 from Citadel-Station-13/upstream-merge-34174
[MIRROR] Sigils of submission now uncuff upon successful conversion
2018-01-12 17:46:46 +00:00
CitadelStationBot 061c6f2207 Automatic changelog generation for PR #4783 [ci skip] 2018-01-12 11:46:32 -06:00
deathride58 0ec41c02d4 Merge pull request #4783 from Citadel-Station-13/upstream-merge-34259
[MIRROR] Pointing will now properly reflect a lack of arms (and legs!)
2018-01-12 17:46:29 +00:00
CitadelStationBot d1f7df200b Automatic changelog generation for PR #4782 [ci skip] 2018-01-12 11:46:03 -06:00
deathride58 63354404e4 Merge pull request #4782 from Citadel-Station-13/upstream-merge-34260
[MIRROR] Adds an indestructible disco/dance machine for admemes and disco inferno shuttle
2018-01-12 17:46:00 +00:00
CitadelStationBot c2cb0ed436 Automatic changelog generation for PR #4781 [ci skip] 2018-01-12 11:45:16 -06:00
deathride58 160955eef1 Merge pull request #4781 from Citadel-Station-13/upstream-merge-34274
[MIRROR] Makes bot emagging more consistent
2018-01-12 17:45:14 +00:00
deathride58 78c5e62ae7 Merge pull request #4780 from Citadel-Station-13/upstream-merge-34280
[MIRROR] Fixes mobs on lavaland targeting through walls on wakeup
2018-01-12 17:44:58 +00:00
CitadelStationBot 927853512d Automatic changelog generation for PR #4779 [ci skip] 2018-01-12 11:44:30 -06:00
deathride58 9b2406cf50 Merge pull request #4779 from Citadel-Station-13/upstream-merge-34287
[MIRROR] Makes cyborg module damage visible to anyone nearby
2018-01-12 17:44:27 +00:00
deathride58 40d2a8ed55 Merge pull request #4778 from Citadel-Station-13/upstream-merge-34288
[MIRROR] Move a definition to the right file
2018-01-12 17:43:55 +00:00
deathride58 661cf56031 Merge pull request #4777 from Citadel-Station-13/upstream-merge-34294
[MIRROR] Add /datum prefix to custom root types
2018-01-12 17:43:38 +00:00
deathride58 ff6b45e57b Merge pull request #4776 from Citadel-Station-13/upstream-merge-34293
[MIRROR] Fix pixel offsets of east-facing unary atmospherics in DreamMaker
2018-01-12 17:43:17 +00:00
CitadelStationBot 4d67f2966b Automatic changelog generation for PR #4775 [ci skip] 2018-01-12 11:42:59 -06:00
deathride58 30bec7a1d0 Merge pull request #4775 from Citadel-Station-13/upstream-merge-34295
[MIRROR] Fixes brass skewer grammar
2018-01-12 17:42:56 +00:00
deathride58 8bfc56981b Merge pull request #4774 from Citadel-Station-13/upstream-merge-34297
[MIRROR] Clockcult ark now teleports anything people are in to the station instead of just the person on destruction
2018-01-12 17:42:39 +00:00
deathride58 a7ec44bfcc Merge pull request #4773 from Citadel-Station-13/upstream-merge-34298
[MIRROR] Adds logging and feedback messages to organ manipulations by admins
2018-01-12 17:42:24 +00:00
deathride58 ed3779feff Merge pull request #4772 from Citadel-Station-13/upstream-merge-34336
[MIRROR] Fixes forensics runtimes
2018-01-12 17:42:05 +00:00
CitadelStationBot e4a3f2fe1a Automatic changelog generation for PR #4765 [ci skip] 2018-01-12 11:41:47 -06:00
deathride58 a2fb8b5304 Merge pull request #4765 from Citadel-Station-13/upstream-merge-34117
[MIRROR] Makes medbots unable to inject you if you are are fully covered with THICKMATERIAL.
2018-01-12 17:41:44 +00:00