Commit Graph

1595 Commits

Author SHA1 Message Date
LetterJay 78c26d8c05 Merge pull request #1171 from Citadel-Station-13/upstream-merge-27610
[MIRROR] Crushers now actually mark
2017-05-25 09:37:25 -05:00
LetterJay 29586aef07 Merge pull request #1172 from Citadel-Station-13/upstream-merge-27609
[MIRROR] Fixes SSlighting Recovery
2017-05-25 09:37:13 -05:00
LetterJay 374561ea8f Merge pull request #1176 from Citadel-Station-13/upstream-merge-27565
[MIRROR] fixes AOE projectile automatic proximity detonation
2017-05-25 09:31:26 -05:00
LetterJay 7e74cd9fde Merge pull request #1177 from Citadel-Station-13/upstream-merge-27625
[MIRROR] Removes the shadowshroom admin message
2017-05-25 09:31:12 -05:00
LetterJay d0a199a643 Merge pull request #1178 from Citadel-Station-13/upstream-merge-27624
[MIRROR] INDESTRUCTIBLE objects are no longer affected by explosions
2017-05-25 09:30:27 -05:00
CitadelStationBot 7998cdcd9a Gang Icons and Fixes 2017-05-25 08:45:28 -05:00
CitadelStationBot e4fc936789 INDESTRUCTIBLE objects are no longer affected by explosions 2017-05-25 08:38:05 -05:00
CitadelStationBot 3508173403 Removes the shadowshroom admin message 2017-05-25 08:36:59 -05:00
CitadelStationBot 36c14b3e71 fixes AOE projectile automatic proximity detonation 2017-05-25 07:29:47 -05:00
CitadelStationBot 1cfd18a757 Fixes SSlighting Recovery 2017-05-24 18:28:56 -05:00
CitadelStationBot b86db49d50 Crushers now actually mark 2017-05-24 18:28:52 -05:00
LetterJay 869953cd18 Merge pull request #1123 from Citadel-Station-13/upstream-merge-27503
[MIRROR] Changes investigate logs to use a define
2017-05-24 12:34:36 -05:00
LetterJay 9befc09252 UAV online 2017-05-24 12:21:14 -05:00
LetterJay c8d071ccf4 25 kill streak with a famas 2017-05-24 12:20:50 -05:00
LetterJay a9aa36e5c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27557 2017-05-24 12:13:44 -05:00
LetterJay 57f9345ace Merge pull request #1135 from Citadel-Station-13/upstream-merge-27543
[MIRROR] Fixes advanced cam not cleaning up properly
2017-05-24 12:12:16 -05:00
LetterJay 2edfb6f9e4 Merge pull request #1157 from Citadel-Station-13/upstream-merge-27580
[MIRROR] Splits equipment.dm into several component files
2017-05-24 10:32:11 -05:00
LetterJay 6e53732def Merge pull request #1158 from Citadel-Station-13/TacGun
Tactical Energy Gun/ERT Sec Officer Change
2017-05-24 10:31:30 -05:00
LetterJay 59a73d238d Merge pull request #1107 from Citadel-Station-13/upstream-merge-27495
[MIRROR] Fixes shooting out of view windows
2017-05-24 10:30:09 -05:00
LetterJay 936e1d3061 Missed during mirror downtime 2017-05-24 08:40:45 -05:00
LetterJay 56c2405d35 Merge pull request #1143 from Citadel-Station-13/upstream-merge-27556
[MIRROR] Sketchin Alt Magazine Sprites
2017-05-24 08:34:19 -05:00
LetterJay 10f5f27bf0 Merge pull request #1144 from Citadel-Station-13/upstream-merge-27554
[MIRROR] Prevents inserted inert legion cores from healing
2017-05-24 08:33:58 -05:00
LetterJay d995dd2dee Merge pull request #1150 from Citadel-Station-13/upstream-merge-27535
[MIRROR] Ballistic Weapon/Shotgun Reload Sounds
2017-05-24 08:33:34 -05:00
LetterJay f2a1ee11a2 Merge pull request #1152 from Citadel-Station-13/upstream-merge-27533
[MIRROR] Auto Rifle Armour Piercing Increase
2017-05-24 08:33:14 -05:00
LetterJay e8f45a69ac Merge pull request #1153 from Citadel-Station-13/upstream-merge-27570
[MIRROR] fixes comment grammar
2017-05-24 08:32:56 -05:00
LetterJay b8f22b24f7 Merge pull request #1154 from Citadel-Station-13/upstream-merge-27579
[MIRROR] Fixes cryo radios
2017-05-24 08:32:35 -05:00
LetterJay 34f82efdd7 mind over matter 2017-05-24 08:30:23 -05:00
CitadelStationBot 88d88741f5 Splits equipment.dm into several component files 2017-05-24 08:28:08 -05:00
LetterJay fe9c47650f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27495 2017-05-24 08:26:40 -05:00
CitadelStationBot 9fa0539f74 Fixes cryo radios 2017-05-24 08:24:39 -05:00
LetterJay e966230ed9 logging 2017-05-24 08:19:45 -05:00
LetterJay 006c74c6ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27503 2017-05-24 08:11:07 -05:00
LetterJay b2c6bd0344 rej cleanup 2017-05-24 08:08:33 -05:00
LetterJay 34e74a377e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27442 2017-05-24 08:06:53 -05:00
LetterJay e34bed049f Merge branch 'master' into upstream-merge-27495 2017-05-24 08:00:10 -05:00
LetterJay 035e95705b Merge pull request #1141 from Citadel-Station-13/upstream-merge-27558
[MIRROR] Armour Description Changes
2017-05-24 07:56:53 -05:00
LetterJay bc51506071 Merge pull request #1148 from Citadel-Station-13/upstream-merge-27566
[MIRROR] Fixes library machines not finding book scanners
2017-05-24 07:55:57 -05:00
LetterJay 3aab463049 Merge pull request #1140 from Citadel-Station-13/upstream-merge-27553
[MIRROR] Fixes syndicate pod turrets
2017-05-24 07:55:20 -05:00
LetterJay da1eb3d96f Merge pull request #1147 from Citadel-Station-13/upstream-merge-27546
[MIRROR] Water wets hide, you can microwave wet leather
2017-05-24 07:54:34 -05:00
LetterJay 527d4bf40f Merge pull request #1146 from Citadel-Station-13/upstream-merge-27549
[MIRROR] Reworks spray tan overdoses so they actually make sense
2017-05-24 07:52:05 -05:00
CitadelStationBot d11da1221f fixes comment grammar 2017-05-24 05:55:50 -05:00
CitadelStationBot 25f7f32f37 Auto Rifle Armour Piercing Increase 2017-05-24 05:54:45 -05:00
CitadelStationBot 14427a2b8c Ballistic Weapon/Shotgun Reload Sounds 2017-05-24 05:52:37 -05:00
CitadelStationBot 991dfbeb5a Fixes library machines not finding book scanners 2017-05-24 03:47:08 -05:00
CitadelStationBot 3a97af10cf Water wets hide, you can microwave wet leather 2017-05-24 00:18:51 -05:00
CitadelStationBot e29928312d Reworks spray tan overdoses so they actually make sense 2017-05-24 00:16:45 -05:00
CitadelStationBot fa9785e90e Prevents inserted inert legion cores from healing 2017-05-24 00:15:13 -05:00
CitadelStationBot 5fe4c7eb07 Sketchin Alt Magazine Sprites 2017-05-24 00:14:08 -05:00
CitadelStationBot ab7e9539bd Tactical Energy Gun Unique Sprites 2017-05-24 00:13:03 -05:00
CitadelStationBot 074b684b4d Armour Description Changes 2017-05-24 00:11:57 -05:00