Commit Graph

17962 Commits

Author SHA1 Message Date
LetterJay ee0bef443e Merge pull request #7283 from Citadel-Station-13/upstream-merge-38796
[MIRROR] Fixes emitter runtime
2018-07-01 09:39:43 -05:00
LetterJay af5a250ce4 Merge pull request #7282 from Citadel-Station-13/upstream-merge-38779
[MIRROR] Fixes arrivals shuttle damage message runtime
2018-07-01 09:39:28 -05:00
LetterJay 42c322ca2c Merge pull request #7281 from Citadel-Station-13/upstream-merge-38789
[MIRROR] Cleans up leftover telesci teleporter code
2018-07-01 09:39:08 -05:00
CitadelStationBot 0b33ea727f Automatic changelog generation for PR #7280 [ci skip] 2018-07-01 09:38:19 -05:00
LetterJay b5b8ce5337 Merge pull request #7280 from Citadel-Station-13/upstream-merge-38751
[MIRROR] Updates plastic flaps icon and cleans up its code
2018-07-01 09:38:16 -05:00
LetterJay 2b9aca8143 Merge pull request #7279 from Citadel-Station-13/upstream-merge-38795
[MIRROR] [s] Fixes PDA ID teleporting
2018-07-01 09:37:45 -05:00
LetterJay 2303e23f2c Merge pull request #7278 from Citadel-Station-13/upstream-merge-38776
[MIRROR] Potentially fixes monkey fever runtiming on infection
2018-07-01 09:37:24 -05:00
CitadelStationBot 3c6749d326 Automatic changelog generation for PR #7277 [ci skip] 2018-07-01 09:37:08 -05:00
LetterJay be23ad6a06 Merge pull request #7277 from Citadel-Station-13/upstream-merge-38656
[MIRROR] Makes the deconstructable TEG working
2018-07-01 09:36:57 -05:00
LetterJay c7b830d2c6 Merge pull request #7276 from Citadel-Station-13/upstream-merge-38834
[MIRROR] Add welded shut message to vent scrubber
2018-07-01 09:36:33 -05:00
LetterJay e1d6ee593b Merge pull request #7275 from Citadel-Station-13/upstream-merge-38800
[MIRROR] Adds missing armor to accessories
2018-07-01 09:36:13 -05:00
CitadelStationBot 3b5264b2f7 Automatic changelog generation for PR #7273 [ci skip] 2018-07-01 09:35:56 -05:00
LetterJay f7fef5f1ed Merge pull request #7273 from Citadel-Station-13/upstream-merge-38804
[MIRROR] Adds a colour picker component for circuits
2018-07-01 09:35:51 -05:00
LetterJay 172c8cab04 Merge pull request #7272 from Citadel-Station-13/upstream-merge-38816
[MIRROR] Make travis use -verbose to get all the runtimes without limit
2018-07-01 09:35:33 -05:00
LetterJay 96fcd9275f Merge pull request #7268 from Citadel-Station-13/kevinz000-patch-9
boh fix mirror broke
2018-07-01 09:33:53 -05:00
CitadelStationBot 3090813add Automatic changelog generation for PR #7267 [ci skip] 2018-07-01 09:33:38 -05:00
LetterJay 389faab2a5 Merge pull request #7267 from Citadel-Station-13/upstream-merge-38728
[MIRROR] Gives honey antibiotic properties
2018-07-01 09:33:36 -05:00
CitadelStationBot c970bc259e Automatic changelog generation for PR #7265 [ci skip] 2018-07-01 09:32:41 -05:00
LetterJay 727aa6b2a9 Merge pull request #7265 from Citadel-Station-13/upstream-merge-38745
[MIRROR] Fixes not receiving AI destroy objective during IAA
2018-07-01 09:32:39 -05:00
CitadelStationBot 5062fcd60e Automatic changelog generation for PR #7264 [ci skip] 2018-07-01 09:32:15 -05:00
LetterJay 16eefdd1e6 Merge pull request #7264 from Citadel-Station-13/upstream-merge-38646
[MIRROR] [Ready]Expands the list of borg-wearable hats
2018-07-01 09:32:08 -05:00
CitadelStationBot b58718625a Automatic changelog generation for PR #7262 [ci skip] 2018-07-01 09:31:15 -05:00
LetterJay 18b8aad8cb Merge pull request #7262 from Citadel-Station-13/upstream-merge-38690
[MIRROR] Destructive analyzers can now destroy anything again, even if it has no materials
2018-07-01 09:31:12 -05:00
CitadelStationBot fc76c6c496 Automatic changelog generation for PR #7259 [ci skip] 2018-07-01 09:30:49 -05:00
LetterJay 7100ae3a7b Merge pull request #7259 from Citadel-Station-13/upstream-merge-38727
[MIRROR] Prevents reagents being transferred to a bucket while its worn on a head
2018-07-01 09:30:46 -05:00
LetterJay 74730261b0 Merge pull request #7258 from Citadel-Station-13/upstream-merge-38689
[MIRROR] Move throwforce up to atom/movable
2018-07-01 09:30:09 -05:00
CitadelStationBot 31f54fd50b Automatic changelog generation for PR #7254 [ci skip] 2018-07-01 09:29:12 -05:00
LetterJay de6ae20f87 Merge pull request #7254 from Citadel-Station-13/upstream-merge-38644
[MIRROR] Port AI static to vis_contents
2018-07-01 09:29:10 -05:00
LetterJay fe0c43fea2 Merge pull request #7252 from Citadel-Station-13/upstream-merge-38708
[MIRROR] Fix runtimes when energy guns are deleted
2018-07-01 09:28:20 -05:00
CitadelStationBot 999f3c23d7 Automatic changelog generation for PR #7251 [ci skip] 2018-07-01 09:28:04 -05:00
LetterJay 35b2338181 Merge pull request #7251 from Citadel-Station-13/upstream-merge-38709
[MIRROR] Fix being unable to export mechs
2018-07-01 09:28:03 -05:00
CitadelStationBot f0296a5e89 Automatic changelog generation for PR #7250 [ci skip] 2018-07-01 09:27:47 -05:00
LetterJay cd842fc20f Merge pull request #7250 from Citadel-Station-13/upstream-merge-38702
[MIRROR] Remove unused and probably misbehaving admin human manifest spawner
2018-07-01 09:27:45 -05:00
CitadelStationBot b1ac168609 Automatic changelog generation for PR #7249 [ci skip] 2018-07-01 09:27:13 -05:00
LetterJay e54ed36415 Merge pull request #7249 from Citadel-Station-13/upstream-merge-38699
[MIRROR] Hardsuit helmets protect eyes from pepperspray
2018-07-01 09:27:07 -05:00
LetterJay b2fb67c607 Merge pull request #7248 from Citadel-Station-13/upstream-merge-38683
[MIRROR] Fixes anomaly area selection.
2018-07-01 09:26:38 -05:00
LetterJay fb64d5ce71 Merge pull request #7247 from Citadel-Station-13/upstream-merge-38672
[MIRROR] Fix the MOTD having too many newlines
2018-07-01 09:26:04 -05:00
CitadelStationBot 93d671cbb4 Automatic changelog generation for PR #7245 [ci skip] 2018-07-01 09:25:45 -05:00
LetterJay 3dfeb02512 Merge pull request #7245 from Citadel-Station-13/upstream-merge-38697
[MIRROR] Improves machine overload logging
2018-07-01 09:25:40 -05:00
CitadelStationBot b21c9437e1 Automatic changelog generation for PR #7244 [ci skip] 2018-07-01 09:25:23 -05:00
LetterJay 8e21d77c4d Merge pull request #7244 from Citadel-Station-13/upstream-merge-38696
[MIRROR] fixes a cult message.fixes a cult message.
2018-07-01 09:25:21 -05:00
CitadelStationBot 3b8931e409 Automatic changelog generation for PR #7240 [ci skip] 2018-07-01 09:24:48 -05:00
LetterJay 605f7a1bf6 Merge pull request #7240 from Citadel-Station-13/upstream-merge-38675
[MIRROR] Fixed cyborgs not getting their names at round start
2018-07-01 09:24:46 -05:00
letterjay f2676b1c75 Fixes emitter runtime 2018-07-01 05:44:10 -05:00
ShizCalev 6c89362f60 Fixes emitter runtime (#38796)
fire() was already handled at 199-204
2018-07-01 05:44:10 -05:00
letterjay 556b4c26c7 Fixes arrivals shuttle damage message runtime 2018-07-01 05:43:51 -05:00
ShizCalev 6814022a1b Fixes arrivals shuttle damage message runtime (#38779) 2018-07-01 05:43:51 -05:00
letterjay f0abd89746 Cleans up leftover telesci teleporter code 2018-07-01 05:43:43 -05:00
ShizCalev 452b34caa2 Cleans up leftover telesci teleporter code (#38789) 2018-07-01 05:43:43 -05:00
letterjay 4f5b285568 Updates plastic flaps icon and cleans up its code 2018-07-01 05:43:01 -05:00