Commit Graph

4805 Commits

Author SHA1 Message Date
LetterJay
0e9f17b14a Merge pull request #1181 from Citadel-Station-13/upstream-merge-27582
[MIRROR] [s] Fixes hiding the nuke disk on the arrivals shuttle
2017-05-26 23:25:15 -05:00
LetterJay
10db5b350d Merge pull request #1185 from Citadel-Station-13/upstream-merge-27630
[MIRROR] Aux base plasma turrets now have range equal to the range they fire in
2017-05-26 23:23:24 -05:00
LetterJay
bf735e5df7 Merge pull request #1192 from Citadel-Station-13/upstream-merge-27658
[MIRROR] Fixes adv camera leaving obscured images
2017-05-26 23:22:54 -05:00
LetterJay
0137b79f6c Merge pull request #1195 from Citadel-Station-13/upstream-merge-27537
[MIRROR] Adds goliath cloak & a recipe (Lavaland PvE primitive item)
2017-05-26 23:22:31 -05:00
LetterJay
46ea27148a Merge pull request #1210 from Citadel-Station-13/upstream-merge-27676
[MIRROR] Makes shades/constructs able to speak galcommon again
2017-05-26 23:04:22 -05:00
CitadelStationBot
364cfe633b Adds marker beacons to miner borgs 2017-05-26 19:09:46 -05:00
CitadelStationBot
b089a14c53 Ports guns to Initialize 2017-05-26 19:06:39 -05:00
CitadelStationBot
b977d6989d Makes shades/constructs able to speak galcommon again 2017-05-26 18:04:26 -05:00
LetterJay
25059558cb admin related shit 2017-05-26 15:26:08 -05:00
CitadelStationBot
83b4c1d8d4 Adds round table to replace tacking some data in feedback table 2017-05-26 15:18:16 -05:00
CitadelStationBot
c5b0f01dcd Splits up mine_items.dm 2017-05-26 13:19:42 -05:00
CitadelStationBot
2fadc0e58b Fixes Gang War's infinity shuttle 2017-05-26 11:27:38 -05:00
CitadelStationBot
a84bcdd42e Adds goliath cloak & a recipe (Lavaland PvE primitive item) 2017-05-26 11:14:20 -05:00
CitadelStationBot
fa4e0e61d6 Fixes adv camera leaving obscured images 2017-05-26 09:05:52 -05:00
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