shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,225 Commits 5 Branches 0 Tags
2bfcc9bf1eb1c41aa22c46bbeefccabecf269804
Commit Graph

1608 Commits

Author SHA1 Message Date
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
a90e1404dd Merge pull request #1161 from Citadel-Station-13/upstream-merge-27594 
[MIRROR] Fixes DBCore Recovery
 2017-05-25 09:39:14 -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
da5b07fbd3 Merge pull request #1159 from Citadel-Station-13/upstream-merge-27600 
[MIRROR] Fixes clock cultists not getting their "objective"
 2017-05-25 09:38:52 -05:00
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
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
0742aa525b Fixes DBCore Recovery 2017-05-24 16:16:56 -05:00
CitadelStationBot
6cdf25ef49 Adds a missing null check 2017-05-24 16:16:52 -05:00
CitadelStationBot
b42e5c8721 Fixes clock cultists not getting their "objective" 2017-05-24 16:15:47 -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