Commit Graph

12374 Commits

Author SHA1 Message Date
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
eea97a45c4 Merge pull request #1193 from Citadel-Station-13/upstream-merge-27659
[MIRROR] Moves attack chain proc from global to obj/item
2017-05-26 23:22:42 -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
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
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
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
CitadelStationBot
4541982d39 Fix roundid 2017-05-26 16:14:21 -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
93c19d0e4b Replaces parentcommit with originmastercommit 2017-05-26 14:41:35 -05:00
CitadelStationBot
3cc6d24926 Fixes ex_act not having waitfor = FALSE 2017-05-26 13:21:55 -05:00
CitadelStationBot
5387b4e2a7 Makes a thing use QDEL_NULL 2017-05-26 13:20:50 -05:00
CitadelStationBot
c5b0f01dcd Splits up mine_items.dm 2017-05-26 13:19:42 -05:00
LetterJay
fabe1e98a7 update blackbox.dm 2017-05-26 12:02:26 -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
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
CitadelStationBot
4cc3f81b3e Moves attack chain proc from global to obj/item 2017-05-26 11:12:09 -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
360d8553b6 Turret bases will properly layer under turret covers 2017-05-25 10:37:46 -05:00
CitadelStationBot
1cf1c1cb4c Roughly one fifth of internal affairs agents are traitors with an extra objective 2017-05-25 09:52:53 -05:00
CitadelStationBot
e2b1ef2ad2 Xenobio console origin tech fix 2017-05-25 09:44:40 -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
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
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
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