Commit Graph
2200 Commits
Author SHA1 Message Date
LetterJay ae22a1876a 41 files changed, original only had 4. SPACES. 2017-05-30 14:36:11 -05:00
CitadelStationBot 11344c4682 Refactors explosions 2017-05-24 16:45:00 -05:00
LetterJayandGitHub 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
CitadelStationBot 131dad6083 Automatic changelog generation for PR #1142 [ci skip] 2017-05-24 12:34:09 -05:00
LetterJayandGitHub f953ec8301 Merge pull request #1142 from Citadel-Station-13/upstream-merge-27557
[MIRROR] Tactical Energy Gun Unique Sprites
2017-05-24 12:34:07 -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
CitadelStationBot 3814ad75be Automatic changelog generation for PR #1156 [ci skip] 2017-05-24 12:12:35 -05:00
LetterJayandGitHub ac062c72f8 Merge pull request #1156 from Citadel-Station-13/upstream-merge-27574
[MIRROR] Raven Ship Blast Door Fix
2017-05-24 12:12:34 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
CitadelStationBot 9fb472a2c8 Automatic changelog generation for PR #1158 [ci skip] 2017-05-24 10:31:31 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
CitadelStationBot a489730548 Automatic changelog generation for PR #1143 [ci skip] 2017-05-24 08:34:20 -05:00
LetterJayandGitHub 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
CitadelStationBot cc219dc81b Automatic changelog generation for PR #1144 [ci skip] 2017-05-24 08:34:00 -05:00
LetterJayandGitHub 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
CitadelStationBot 9dfbe3e07d Automatic changelog generation for PR #1150 [ci skip] 2017-05-24 08:33:36 -05:00
LetterJayandGitHub 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
CitadelStationBot 7699d27c37 Automatic changelog generation for PR #1152 [ci skip] 2017-05-24 08:33:16 -05:00
LetterJayandGitHub 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
LetterJayandGitHub e8f45a69ac Merge pull request #1153 from Citadel-Station-13/upstream-merge-27570
[MIRROR] fixes comment grammar
2017-05-24 08:32:56 -05:00
LetterJayandGitHub 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 b95b6dca00 Raven Ship Blast Door Fix 2017-05-24 08:25:53 -05:00
CitadelStationBot f276937bc5 Automatic changelog generation for PR #1110 [ci skip] 2017-05-24 08:24:52 -05:00
LetterJayandGitHub c9fe96aac9 Merge pull request #1110 from Citadel-Station-13/upstream-merge-27442
[MIRROR] Cult Fixes for Construct Icons and Spells
2017-05-24 08:24:50 -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
LetterJayandGitHub e34bed049f Merge branch 'master' into upstream-merge-27495 2017-05-24 08:00:10 -05:00
CitadelStationBot a78624e196 Automatic changelog generation for PR #1149 [ci skip] 2017-05-24 07:57:14 -05:00
LetterJayandGitHub 2db968d123 Merge pull request #1149 from Citadel-Station-13/upstream-merge-27572
[MIRROR] Add Glass Panes to Box Armoury Weapon Racks
2017-05-24 07:57:13 -05:00
CitadelStationBot ab8ef62c0b Automatic changelog generation for PR #1141 [ci skip] 2017-05-24 07:56:54 -05:00
LetterJayandGitHub 035e95705b Merge pull request #1141 from Citadel-Station-13/upstream-merge-27558
[MIRROR] Armour Description Changes
2017-05-24 07:56:53 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
CitadelStationBot c075888709 Automatic changelog generation for PR #1147 [ci skip] 2017-05-24 07:54:35 -05:00
LetterJayandGitHub 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
CitadelStationBot b65f4cba03 Automatic changelog generation for PR #1146 [ci skip] 2017-05-24 07:52:06 -05:00
LetterJayandGitHub 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
LetterJayandGitHub ace70de8d2 Merge pull request #1139 from Citadel-Station-13/upstream-merge-27544
[MIRROR] Gives Void Torch its icon back
2017-05-24 07:51:47 -05:00
CitadelStationBot d11da1221f fixes comment grammar 2017-05-24 05:55:50 -05:00