Commit Graph

1341 Commits

Author SHA1 Message Date
CitadelStationBot
3c60a6c82f Aux base plasma turrets now have range equal to the range they fire in 2017-05-25 10:37:50 -05:00
CitadelStationBot
2bfcc9bf1e [s] Fixes hiding the nuke disk on the arrivals shuttle 2017-05-25 09:43:34 -05:00
LetterJay
8316ad7f50 Merge pull request #1166 from Citadel-Station-13/upstream-merge-27599
[MIRROR] Brains extracted from infectious zombies keep their old species
2017-05-25 09:42:13 -05:00
LetterJay
1795b504ce Merge pull request #1164 from Citadel-Station-13/upstream-merge-27578
[MIRROR] Renames a var
2017-05-25 09:40:06 -05:00
LetterJay
f8c783a795 Merge pull request #1162 from Citadel-Station-13/upstream-merge-27586
[MIRROR] Closes bold tag in bombing list secret
2017-05-25 09:39:27 -05:00
LetterJay
87c207b76b Merge pull request #1160 from Citadel-Station-13/upstream-merge-27587
[MIRROR] Adds a missing null check
2017-05-25 09:39:06 -05:00
LetterJay
e61acac6cc boxes 2017-05-25 09:36:58 -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
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
9eb32eb6b7 4th Attempt at 60% shuttle recall gang murderbone thing 2017-05-24 19:21:52 -05:00
CitadelStationBot
31ca0575a2 Fixed some jobs not spawning with their box 2017-05-24 18:30:01 -05:00
CitadelStationBot
29384db52f Improves collector feedback 2017-05-24 18:20:41 -05:00
CitadelStationBot
20886e15de Nerfs plasma cost 2017-05-24 16:54:14 -05:00
CitadelStationBot
11344c4682 Refactors explosions 2017-05-24 16:45:00 -05:00
CitadelStationBot
6fb8aa7ee1 Adds marker beacons to mining as a vendible item 2017-05-24 16:32:43 -05:00
CitadelStationBot
85d474885b Brains extracted from infectious zombies keep their old species 2017-05-24 16:30:36 -05:00
CitadelStationBot
7d75b70ff0 Renames a var 2017-05-24 16:21:19 -05:00
CitadelStationBot
9033f9f066 Closes bold tag in bombing list secret 2017-05-24 16:19:03 -05:00
CitadelStationBot
6cdf25ef49 Adds a missing null check 2017-05-24 16:16: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
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
CitadelStationBot
88d88741f5 Splits equipment.dm into several component files 2017-05-24 08:28:08 -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
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
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
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
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
4191e1f7fd Adds the Beach Bum Language 2017-05-24 05:54:42 -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