Commit Graph
2095 Commits
Author SHA1 Message Date
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
CitadelStationBot 1d5c29b7b6 Auto Rifle Alt Mag Sprites 2017-05-22 22:16:06 -05:00
CitadelStationBot 4afae3d03b Makes global master vars static 2017-05-22 22:12:58 -05:00
CitadelStationBot 60f1e4348a Chasms will glow dimly, like lava 2017-05-22 22:11:53 -05:00
CitadelStationBot 4ac787e3bb Adds a toy weapon vendor into the syndie lavaland base firing range 2017-05-22 22:10:47 -05:00
LetterJayandGitHub 3cf30f3a6b Merge pull request #1083 from Citadel-Station-13/upstream-merge-27474
[MIRROR] Plasma cutters will mine further but will go less distance in open air
2017-05-22 17:46:02 -05:00
LetterJay e675b3becc var/mine_range 2017-05-22 17:35:40 -05:00
LetterJay 288c072544 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27474 2017-05-22 17:30:31 -05:00
LetterJayandGitHub 3f24f033e5 Merge pull request #1106 from Citadel-Station-13/upstream-merge-27485
[MIRROR] Prevents wizard from gaining infinite skeletons with a 3-use Necrostone
2017-05-22 17:26:09 -05:00
CitadelStationBot 2491ef5a7a Automatic changelog generation for PR #1109 [ci skip] 2017-05-22 17:25:48 -05:00
LetterJayandGitHub b66b362e4f Merge pull request #1109 from Citadel-Station-13/upstream-merge-27484
[MIRROR] KA Pressure Mods are now a traitor miner item
2017-05-22 17:25:47 -05:00
LetterJayandGitHub 09780b7dac Merge pull request #1108 from Artemiuz28/Artemiuz28-patch-1
Female masturbation fixes
2017-05-22 17:24:00 -05:00
LetterJayandGitHub e178fb4ac6 Merge pull request #1111 from Citadel-Station-13/upstream-merge-27500
[MIRROR] Adds extra investigate logs for SM
2017-05-22 17:23:18 -05:00
CitadelStationBot 5624174cf5 Automatic changelog generation for PR #1112 [ci skip] 2017-05-22 17:21:10 -05:00
LetterJayandGitHub 64f288fda6 Merge pull request #1112 from Citadel-Station-13/upstream-merge-27502
[MIRROR] Ripleys will collect all ore in front of them when they move with a clamp and stored ore box
2017-05-22 17:21:09 -05:00
LetterJayandGitHub 0ea672cdb9 Merge pull request #1113 from Citadel-Station-13/upstream-merge-27501
[MIRROR] Mechs now take the correct amount of charge from inserted cells
2017-05-22 17:20:53 -05:00
LetterJayandGitHub 25c1aa40dd Merge pull request #1079 from Citadel-Station-13/upstream-merge-27450
[MIRROR] Removes the mess added with recalling with a message
2017-05-22 17:14:14 -05:00