Commit Graph

2118 Commits

Author SHA1 Message Date
CitadelStationBot c4fb2dd26e Automatic changelog generation for PR #1103 [ci skip] 2017-05-23 07:18:17 -05:00
LetterJay e77cf64ff9 Merge pull request #1103 from Citadel-Station-13/upstream-merge-27498
[MIRROR] A silicon will always be able to speak Galactic Common
2017-05-23 07:18:16 -05:00
CitadelStationBot 8525990bcd Automatic changelog generation for PR #1101 [ci skip] 2017-05-23 07:15:17 -05:00
LetterJay c13af581b3 Merge pull request #1101 from Citadel-Station-13/upstream-merge-27489
[MIRROR] Having less legs won't slow you down if you're in zero gravity with a jetpack
2017-05-23 07:15:15 -05:00
LetterJay 64215e32e4 Merge pull request #1105 from Citadel-Station-13/upstream-merge-27497
[MIRROR] fixes being able to transfer into golem shells after they're already taken and sending people into nullspace as a result.
2017-05-23 07:14:58 -05:00
LetterJay cd583208b5 Merge pull request #1099 from Citadel-Station-13/upstream-merge-27459
[MIRROR] Fixes ordering of text2file params
2017-05-23 07:14:46 -05:00
LetterJay dd6e5c8368 Merge pull request #1098 from Citadel-Station-13/upstream-merge-27460
[MIRROR] Fixes built air meters not working
2017-05-23 07:14:24 -05:00
CitadelStationBot bb7d4fc894 Automatic changelog generation for PR #1096 [ci skip] 2017-05-23 07:13:54 -05:00
LetterJay 2deead1ab2 Merge pull request #1096 from Citadel-Station-13/upstream-merge-27427
[MIRROR] Warden Compact Combat Shotgun
2017-05-23 07:13:52 -05:00
CitadelStationBot e4ed038b15 Automatic changelog generation for PR #1091 [ci skip] 2017-05-23 06:42:31 -05:00
LetterJay 303f4ec5a5 Merge pull request #1091 from Citadel-Station-13/upstream-merge-27467
[MIRROR] Resonator fields now visually show how long they have until they burst
2017-05-23 06:42:30 -05:00
LetterJay 958afdf037 oops 2017-05-23 06:29:15 -05:00
LetterJay 2fcc8fdc25 magic 2017-05-23 06:23:29 -05:00
LetterJay 9fc02333dd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27467 2017-05-23 06:18:28 -05:00
CitadelStationBot b1c0e82bdc Automatic changelog generation for PR #1130 [ci skip] 2017-05-23 06:17:31 -05:00
LetterJay b633ef0991 Merge pull request #1130 from Citadel-Station-13/GangSync
Syncs all gang related PRs with upstream
2017-05-23 06:17:29 -05:00
LetterJay db9f2a6d74 rej cleanup 2017-05-23 06:15:33 -05:00
CitadelStationBot fb74c321c9 Automatic changelog generation for PR #1087 [ci skip] 2017-05-23 06:13:42 -05:00
LetterJay 0b1a680d1a Merge pull request #1087 from Citadel-Station-13/upstream-merge-27480
[MIRROR] Ports pandemic to tgui
2017-05-23 06:13:41 -05:00
LetterJay 3d5f969b5e Merge pull request #1084 from Citadel-Station-13/upstream-merge-27515
[MIRROR] properly fixes quickgrab exploit
2017-05-23 06:13:22 -05:00
LetterJay b85d2ea321 Syncs all gang related PRs with upstream 2017-05-23 06:10:40 -05:00
LetterJay 2083b0c990 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27467 2017-05-23 05:31:00 -05:00
LetterJay c9c2961c9c fancy 2017-05-23 05:26:20 -05:00
LetterJay d6a11b2aa2 click.dm 2017-05-23 05:19:57 -05:00
LetterJay bb51ed94ab Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27515 2017-05-23 05:17:39 -05:00
CitadelStationBot e2ea28c3b8 Automatic changelog generation for PR #1116 [ci skip] 2017-05-23 05:14:50 -05:00
LetterJay 72b654b198 Merge pull request #1116 from Citadel-Station-13/upstream-merge-27518
[MIRROR] Adds a toy weapon vendor into the syndie lavaland base firing range
2017-05-23 05:14:48 -05:00
CitadelStationBot 28d093e1b0 Automatic changelog generation for PR #1117 [ci skip] 2017-05-23 05:14:31 -05:00
LetterJay 3ca696ac82 Merge pull request #1117 from Citadel-Station-13/upstream-merge-27526
[MIRROR] Chasms will glow dimly, like lava
2017-05-23 05:14:30 -05:00
LetterJay 9ddea43e0f Merge pull request #1118 from Citadel-Station-13/upstream-merge-27523
[MIRROR] Makes global master vars static
2017-05-23 05:14:11 -05:00
CitadelStationBot c7486a6f18 Automatic changelog generation for PR #1119 [ci skip] 2017-05-23 05:13:53 -05:00
LetterJay 1e149d1c89 Merge pull request #1119 from Citadel-Station-13/upstream-merge-27463
[MIRROR] Auto Rifle Alt Mag Sprites
2017-05-23 05:13:51 -05:00
LetterJay 939362fc94 Merge pull request #1120 from Citadel-Station-13/upstream-merge-27458
[MIRROR] Adds webbing
2017-05-23 05:13:38 -05:00
CitadelStationBot d420d87cc2 Automatic changelog generation for PR #1121 [ci skip] 2017-05-23 05:13:19 -05:00
LetterJay 2fedf6b0e2 Merge pull request #1121 from Citadel-Station-13/upstream-merge-27409
[MIRROR] Mesons no longer show turfs on lavaland, but miners no longer need mesons to see minerals scanned by a mineral scanner through walls
2017-05-23 05:13:18 -05:00
LetterJay b0c10c5898 Merge pull request #1122 from Citadel-Station-13/upstream-merge-27532
[MIRROR] DNA injector inject proc now properly returns success
2017-05-23 05:12:32 -05:00
LetterJay 0207ab2870 Merge pull request #1124 from Citadel-Station-13/upstream-merge-27516
[MIRROR] Fixes a probable bug/exploit that allows for fully ignoring slows
2017-05-23 05:12:17 -05:00
LetterJay d01d05770b Merge pull request #1125 from Citadel-Station-13/upstream-merge-27514
[MIRROR] Fixes space movement exploit
2017-05-23 05:11:44 -05:00
LetterJay b38955b3a2 Merge pull request #1126 from Citadel-Station-13/upstream-merge-27512
[MIRROR] Fixes conveyor belts moving things with no gravity
2017-05-23 05:11:31 -05:00
LetterJay e9e4f31fe0 Merge pull request #1127 from Citadel-Station-13/upstream-merge-27521
[MIRROR] Removes HasProx testing message
2017-05-23 05:00:07 -05:00
CitadelStationBot 0dde122148 Automatic changelog generation for PR #1129 [ci skip] 2017-05-23 04:59:41 -05:00
LetterJay f155251cf2 Merge pull request #1129 from Citadel-Station-13/upstream-merge-27531
[MIRROR] Fixes paper bins and moves paper to initialize
2017-05-23 04:59:39 -05:00
CitadelStationBot 2ea155e6a7 Fixes paper bins and moves paper to initialize 2017-05-22 22:51:23 -05:00
CitadelStationBot e9cdeec4f6 Removes HasProx testing message 2017-05-22 22:48:13 -05:00
CitadelStationBot e382287f78 Fixes conveyor belts moving things with no gravity 2017-05-22 22:48:09 -05:00
CitadelStationBot 3c892e0f46 Fixes space movement exploit 2017-05-22 22:47:04 -05:00
CitadelStationBot 240d195e2c Fixes a probable bug/exploit that allows for fully ignoring slows 2017-05-22 22:46:59 -05:00
CitadelStationBot 1b5d04bfb3 DNA injector inject proc now properly returns success 2017-05-22 22:44:49 -05:00
CitadelStationBot 6b4b6ee70d Mesons no longer show turfs on lavaland, but miners no longer need mesons to see minerals scanned by a mineral scanner through walls 2017-05-22 22:21:20 -05:00
CitadelStationBot 63dd699509 Adds webbing 2017-05-22 22:20:14 -05:00