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

171 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
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
CitadelStationBot
b089a14c53 Ports guns to Initialize 2017-05-26 19:06:39 -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
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
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
CitadelStationBot
3a97af10cf Water wets hide, you can microwave wet leather 2017-05-24 00:18:51 -05:00
LetterJay
a80a00bc6e Merge branch 'master' into upstream-merge-27324 2017-05-23 07:17:45 -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
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
63dd699509 Adds webbing 2017-05-22 22:20:14 -05:00
LetterJay
ab50a3eca5 Merge pull request #1068 from Citadel-Station-13/upstream-merge-27283 
[MIRROR] Decentralized and Vastly Improved Gang Influence System
 2017-05-22 16:28:57 -05:00
LetterJay
9df8057e0e Merge pull request #1050 from Citadel-Station-13/upstream-merge-27344 
[MIRROR] Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
 2017-05-22 12:40:18 -05:00
LetterJay
8791ad036f Merge pull request #1045 from Citadel-Station-13/upstream-merge-27268 
[MIRROR] World.dm Refactor
 2017-05-22 12:39:52 -05:00
LetterJay
d1db0044d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27344 2017-05-22 11:52:18 -05:00
LetterJay
b2a0fe64af Merge pull request #1094 from Citadel-Station-13/upstream-merge-27488 
[MIRROR] Fixes jetpacks working indoors/in areas with gravity
 2017-05-22 08:25:30 -05:00
CitadelStationBot
25df88509a Reorganizes martial arts and stores them in the MIND. 2017-05-22 07:13:10 -05:00
CitadelStationBot
9f75c7b317 Fixes jetpacks working indoors/in areas with gravity 2017-05-21 22:28:51 -05:00
CitadelStationBot
1dcad5fa0e Fixes pkborg fields not updating location or draining power 2017-05-21 22:28:20 -05:00
Poojawa
186ed2acbb Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268 2017-05-21 00:44:08 -05:00
Poojawa
45ba084c6a Merge branch 'master' into upstream-merge-27344 2017-05-20 23:26:28 -05:00
CitadelStationBot
c39b60b3cf Decentralized and Vastly Improved Gang Influence System 2017-05-20 18:37:48 -05:00
CitadelStationBot
c36eee94bd Adds modified syringe guns 2017-05-19 06:25:23 -05:00
LetterJay
6abf2a53be Merge pull request #1041 from Citadel-Station-13/upstream-merge-27359 
[MIRROR] Plastic explosives can no longer be detonated by EMPs
 2017-05-18 23:44:53 -04:00
LetterJay
50df0e608b Merge pull request #1038 from Citadel-Station-13/upstream-merge-27361 
[MIRROR] Vending machines are more dangerous when throwing items
 2017-05-18 23:40:42 -04:00
LetterJay
038e804348 Merge pull request #1035 from Citadel-Station-13/upstream-merge-27241 
[MIRROR] Clowns get an automatic self-recharging pie cannon as a traitor item for 10TC
 2017-05-18 23:40:11 -04:00
LetterJay
cda7d68cd6 Merge pull request #1031 from Citadel-Station-13/upstream-merge-27234 
[MIRROR] [READY]Peacekeeper cyborg projectile dampening fields, attempt three
 2017-05-18 23:39:25 -04:00
LetterJay
1b95027789 Merge pull request #1030 from Citadel-Station-13/upstream-merge-27372 
[MIRROR] Plasmaman Plasma Tanks are just as large as normal emergency tanks
 2017-05-18 23:38:47 -04:00
CitadelStationBot
a430e24555 Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2017-05-18 16:38:09 -05:00
CitadelStationBot
3a90a50af9 Plastic explosives can no longer be detonated by EMPs 2017-05-18 16:37:30 -05:00
CitadelStationBot
670a6f2126 Vending machines are more dangerous when throwing items 2017-05-18 16:37:18 -05:00
CitadelStationBot
552433143e Clowns get an automatic self-recharging pie cannon as a traitor item for 10TC 2017-05-18 16:37:07 -05:00
CitadelStationBot
36072177f9 [READY]Peacekeeper cyborg projectile dampening fields, attempt three 2017-05-18 16:36:50 -05:00
CitadelStationBot
4cab226611 Plasmaman Plasma Tanks are just as large as normal emergency tanks 2017-05-18 16:36:46 -05:00
CitadelStationBot
5956761df8 Adds a new toy to arcade prizes. A rumbling toy toolbox meant to mimic hisgrace 2017-05-18 16:36:43 -05:00
CitadelStationBot
42e8c5dbbd fixes triple latched toolboxes spawning too often than anticipated (#1019) 2017-05-18 12:42:09 -05:00
CitadelStationBot
e6a55a4131 Adds a really stupid syndicate bible, with a great sprite by JStheguy (#1017) 2017-05-18 12:41:30 -05:00
CitadelStationBot
1f4bd27f37 Eightballs are tiny items (#1013) 2017-05-18 12:37:43 -05:00
CitadelStationBot
1b39381ee7 Ports radios to Initialize (#983) 2017-05-18 12:19:55 -05:00
CitadelStationBot
acbaa45aee Adds a few new recipes created with plastic sheets (#979) 2017-05-18 11:53:17 -05:00
CitadelStationBot
c61bb0476f [MIRROR] Cleans up some Initializes (#943) 
* Cleans up some Initializes

* Update farm_animals.dm

* Delete farm_animals.dm.rej

* Update farm_animals.dm
 2017-05-18 11:13:53 -05:00
CitadelStationBot
a681b306a6 [MIRROR] Buffs plasma and nerfs snow (#924) 
* Buffs plasma and nerfs snow

* Update mineral.dm

* Delete mineral.dm.rej
 2017-05-18 11:13:28 -05:00
CitadelStationBot
a317d23a51 [MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie (#916) 
* Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie

* fixes .rej
 2017-05-18 09:37:30 -05:00
CitadelStationBot
c6a671a11b [MIRROR] Devil refactor+small revamp (#887) 
* Devil refactor+small revamp

* Delete mind.dm.rej

* clean up rej

* Delete admin_investigate.dm.rej

* Delete mapping.dm.rej

* compile fix
 2017-05-18 09:06:01 -05:00
CitadelStationBot
6617f68604 [MIRROR] Harvesters are more fun to play (#894) 
* Harvesters are more fun to play

* resolve .rej
 2017-05-18 07:12:29 -05:00
CitadelStationBot
eb359f1014 [MIRROR] Cerestation Tweaks VI: Shuttle Edition (#876) 
* Cerestation Tweaks VI: Shuttle Edition

* fix .rej
 2017-05-18 06:51:26 -05:00
CitadelStationBot
ff9928fdd7 [MIRROR] Makes it clear whether (in)complete golem shells are free or servant (#857) 
* Makes it clear whether (in)complete golem shells are free or servant

* resolves rej file
 2017-05-18 04:40:12 -05:00