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

608 Commits

Author SHA1 Message Date
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
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
CitadelStationBot
b089a14c53 Ports guns to Initialize 2017-05-26 19:06:39 -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
5387b4e2a7 Makes a thing use QDEL_NULL 2017-05-26 13:20:50 -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
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
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
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
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
CitadelStationBot
88d88741f5 Splits equipment.dm into several component files 2017-05-24 08:28:08 -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
3aab463049 Merge pull request #1140 from Citadel-Station-13/upstream-merge-27553 
[MIRROR] Fixes syndicate pod turrets
 2017-05-24 07:55:20 -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
3a97af10cf Water wets hide, you can microwave wet leather 2017-05-24 00:18:51 -05:00
CitadelStationBot
be2aefa13b Fixes syndicate pod turrets 2017-05-23 20:56:33 -05:00
CitadelStationBot
6ee6430dfb Gives Void Torch its icon back 2017-05-23 19:56:25 -05:00
CitadelStationBot
b8b879af45 Gibtonite now uses defines 2017-05-23 15:29:11 -05:00
CitadelStationBot
3651637cd8 Fixes advanced cam not cleaning up properly 2017-05-23 13:44:19 -05:00
CitadelStationBot
c736d5f9dd [READY FOR ~REVIEW~]Makes morphs only able to change into /objs or /mobs 2017-05-23 09:54:28 -05:00
LetterJay
a80a00bc6e Merge branch 'master' into upstream-merge-27324 2017-05-23 07:17:45 -05:00
LetterJay
64215e32e4 Merge pull request #1105 from Citadel-Station-13/upstream-merge-27497 
[MIRROR] fixes being able to transfer into golem shells after they're already taken and sending people into nullspace as a result.
 2017-05-23 07:14:58 -05:00
LetterJay
2deead1ab2 Merge pull request #1096 from Citadel-Station-13/upstream-merge-27427 
[MIRROR] Warden Compact Combat Shotgun
 2017-05-23 07:13:52 -05:00
LetterJay
b633ef0991 Merge pull request #1130 from Citadel-Station-13/GangSync 
Syncs all gang related PRs with upstream
 2017-05-23 06:17:29 -05:00
LetterJay
b85d2ea321 Syncs all gang related PRs with upstream 2017-05-23 06:10:40 -05:00
LetterJay
72b654b198 Merge pull request #1116 from Citadel-Station-13/upstream-merge-27518 
[MIRROR] Adds a toy weapon vendor into the syndie lavaland base firing range
 2017-05-23 05:14:48 -05:00
LetterJay
3ca696ac82 Merge pull request #1117 from Citadel-Station-13/upstream-merge-27526 
[MIRROR] Chasms will glow dimly, like lava
 2017-05-23 05:14:30 -05:00
LetterJay
939362fc94 Merge pull request #1120 from Citadel-Station-13/upstream-merge-27458 
[MIRROR] Adds webbing
 2017-05-23 05:13:38 -05:00
LetterJay
2fedf6b0e2 Merge pull request #1121 from Citadel-Station-13/upstream-merge-27409 
[MIRROR] Mesons no longer show turfs on lavaland, but miners no longer need mesons to see minerals scanned by a mineral scanner through walls
 2017-05-23 05:13:18 -05:00
LetterJay
b0c10c5898 Merge pull request #1122 from Citadel-Station-13/upstream-merge-27532 
[MIRROR] DNA injector inject proc now properly returns success
 2017-05-23 05:12:32 -05:00
CitadelStationBot
e9cdeec4f6 Removes HasProx testing message 2017-05-22 22:48:13 -05:00
CitadelStationBot
01cd2039e5 Changes investigate logs to use a define 2017-05-22 22:45:54 -05:00
CitadelStationBot
1b5d04bfb3 DNA injector inject proc now properly returns success 2017-05-22 22:44:49 -05:00
CitadelStationBot
6b4b6ee70d Mesons no longer show turfs on lavaland, but miners no longer need mesons to see minerals scanned by a mineral scanner through walls 2017-05-22 22:21:20 -05:00
CitadelStationBot
63dd699509 Adds webbing 2017-05-22 22:20:14 -05:00
CitadelStationBot
60f1e4348a Chasms will glow dimly, like lava 2017-05-22 22:11:53 -05:00
CitadelStationBot
4ac787e3bb Adds a toy weapon vendor into the syndie lavaland base firing range 2017-05-22 22:10:47 -05:00
LetterJay
3f24f033e5 Merge pull request #1106 from Citadel-Station-13/upstream-merge-27485 
[MIRROR] Prevents wizard from gaining infinite skeletons with a 3-use Necrostone
 2017-05-22 17:26:09 -05:00
LetterJay
64f288fda6 Merge pull request #1112 from Citadel-Station-13/upstream-merge-27502 
[MIRROR] Ripleys will collect all ore in front of them when they move with a clamp and stored ore box
 2017-05-22 17:21:09 -05:00