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

1630 Commits

Author SHA1 Message Date
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
eadfde3cb8 Merge pull request #1194 from Citadel-Station-13/upstream-merge-27655 
[MIRROR] Adds cycling delay to PKborg dampeners, fixes dampener projectors leaving fields behind when server is lagging
 2017-05-26 23:22:14 -05:00
LetterJay
bb7a3462f0 Merge pull request #1199 from Citadel-Station-13/upstream-merge-27668 
[MIRROR] Makes a thing use QDEL_NULL
 2017-05-26 23:21:44 -05:00
LetterJay
1b84c67492 Merge pull request #1204 from Citadel-Station-13/upstream-merge-27674 
[MIRROR] Replaces parentcommit with originmastercommit
 2017-05-26 23:20:55 -05:00
LetterJay
42959d5ae0 Merge pull request #1207 from Citadel-Station-13/upstream-merge-27679 
[MIRROR] Ports defibs to Initialize
 2017-05-26 23:20:38 -05:00
LetterJay
371a902ff6 Merge pull request #1208 from Citadel-Station-13/upstream-merge-27680 
[MIRROR] Ports stunbatons to Initialize
 2017-05-26 23:20:28 -05:00
LetterJay
761cafc598 Merge pull request #1209 from Citadel-Station-13/upstream-merge-27678 
[MIRROR] Makes a thing use QDEL_NULL
 2017-05-26 23:04:47 -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
LetterJay
32439e740a Merge pull request #1213 from Citadel-Station-13/upstream-merge-27681 
[MIRROR] Ports guns to Initialize
 2017-05-26 23:03:54 -05:00
CitadelStationBot
e3e040fee0 Fixes pre-round-start logs 2017-05-26 19:41:20 -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
CitadelStationBot
15482314d4 Makes a thing use QDEL_NULL 2017-05-26 18:03:21 -05:00
CitadelStationBot
0e40cd7f6d Ports stunbatons to Initialize 2017-05-26 18:03:17 -05:00
CitadelStationBot
04df45c907 Ports defibs to Initialize 2017-05-26 18:02:13 -05:00
LetterJay
25059558cb admin related shit 2017-05-26 15:26:08 -05:00
CitadelStationBot
93c19d0e4b Replaces parentcommit with originmastercommit 2017-05-26 14:41:35 -05:00
CitadelStationBot
5387b4e2a7 Makes a thing use QDEL_NULL 2017-05-26 13:20:50 -05:00
LetterJay
fabe1e98a7 update blackbox.dm 2017-05-26 12:02:26 -05:00
CitadelStationBot
a84bcdd42e Adds goliath cloak & a recipe (Lavaland PvE primitive item) 2017-05-26 11:14:20 -05:00
CitadelStationBot
11c74ee6b4 Adds cycling delay to PKborg dampeners, fixes dampener projectors leaving fields behind when server is lagging 2017-05-26 11:13:15 -05:00
LetterJay
7ad5837432 Merge pull request #1138 from Citadel-Station-13/upstream-merge-27545 
[MIRROR] Gibtonite now uses defines
 2017-05-25 09:43:50 -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