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

386 Commits

Author SHA1 Message Date
CitadelStationBot
85d474885b Brains extracted from infectious zombies keep their old species 2017-05-24 16:30:36 -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
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
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
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
CitadelStationBot
fa9785e90e Prevents inserted inert legion cores from healing 2017-05-24 00:15:13 -05:00
LetterJay
febefa0c78 Something I broke in a previous PR that I didn't see 2017-05-23 10:11:19 -05:00
LetterJay
a80a00bc6e Merge branch 'master' into upstream-merge-27324 2017-05-23 07:17:45 -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
CitadelStationBot
3c892e0f46 Fixes space movement exploit 2017-05-22 22:47:04 -05:00
CitadelStationBot
01cd2039e5 Changes investigate logs to use a define 2017-05-22 22:45:54 -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
LetterJay
abbacd2c89 Merge branch 'master' into upstream-merge-27160 2017-05-22 16:29:43 -05:00
LetterJay
3548ed5e3e i'll fix this in another PR 2017-05-22 12:27:59 -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
CitadelStationBot
4533d31e34 Cult Fixes for Construct Icons and Spells 2017-05-22 10:49:33 -05:00
CitadelStationBot
25df88509a Reorganizes martial arts and stores them in the MIND. 2017-05-22 07:13:10 -05:00
CitadelStationBot
31ecd3cdd8 Nerfs monkeys 2017-05-21 22:28:25 -05:00
kevinz000
7e2cebe1db Merge branch 'master' into upstream-merge-27344 2017-05-21 17:50:29 -07:00
CitadelStationBot
0924db6d41 Re-removes "the station" from drone law 3 (#1075) 2017-05-21 17:45:06 -07:00
CitadelStationBot
e224a47f53 Two more types of Legion and makes environment_smash levels into defines 2017-05-21 02:52:23 -05:00
Poojawa
45ba084c6a Merge branch 'master' into upstream-merge-27344 2017-05-20 23:26:28 -05:00
CitadelStationBot
88ede32216 [MIRROR] Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition (#994) 
* Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition

* Rej cleanup

* update mob.dmi

* Update living_defense.dm
 2017-05-20 23:00:02 -05:00
cebutris
644a31ed98 Misc. guardian stuff (#1066) 
* beep boop

* Fixes one last inconsistency. Oops.

* punctuation
 2017-05-20 17:54:39 -07:00
LetterJay
186a63ad34 Merge pull request #1057 from Citadel-Station-13/upstream-merge-27395 
[MIRROR] Fixes having more movespeed when xenos hug themselves
 2017-05-19 22:54:52 -05:00
LetterJay
4d48592008 Merge pull request #1051 from cebutris/holofixes 
No More Free Parasites
 2017-05-19 22:46:30 -05:00
CitadelStationBot
4430e7d0c3 Fixes having more movespeed when xenos hug themselves 2017-05-19 12:31:59 -05:00
LetterJay
af815195bc Merge pull request #1034 from Citadel-Station-13/upstream-merge-27368 
[MIRROR] Fixes bane runtimes
 2017-05-19 05:32:31 -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
cebutris
893eb92833 no more free parasites 2017-05-18 18:04:42 -04:00
CitadelStationBot
a430e24555 Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2017-05-18 16:38:09 -05:00
CitadelStationBot
fe89b9ea8a Fixes bane runtimes 2017-05-18 16:37:02 -05:00
CitadelStationBot
36072177f9 [READY]Peacekeeper cyborg projectile dampening fields, attempt three 2017-05-18 16:36:50 -05:00
CitadelStationBot
d5b0150e99 Buffs hierophant club 2017-05-18 16:36:38 -05:00
CitadelStationBot
1da5a27b98 Adjusts ear/eye protection based on missing organs (#999) 2017-05-18 12:07:33 -05:00
CitadelStationBot
df9e22183d [MIRROR] Servant golems do not have special names (#939) 
* Servant golems do not have special names

* Update golems.dm
 2017-05-18 11:28:09 -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
7a9e05e9d9 Cerestation Tweaks MK VII: BEES edition (#925) 2017-05-18 10:36:51 -05:00
CitadelStationBot
33941c29c8 [MIRROR] People can be cloned from heads or brains (#919) 
* People can be cloned from heads or brains

* .rej fixes

* Update cloning.dm
 2017-05-18 09:49:26 -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
4022281599 [MIRROR] Plasma golem tweaks (#906) 
* Plasma golem tweaks

* Update golems.dm

* Delete golems.dm.rej
 2017-05-18 08:08:34 -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
43c05ad3da [MIRROR] Fixes status stat panel (#878) 
* Fixes status stat panel

* Update mob.dm

* Delete mob.dm.rej
 2017-05-18 06:12:18 -05:00
CitadelStationBot
8bcaa54cbe [MIRROR] Fixes language code ignoring holder restrictions (#858) 
* Fixes language code ignoring holder restrictions

* resolve .rej file.
 2017-05-18 04:13:57 -05:00
CitadelStationBot
4f971be3a9 [MIRROR] Golems do not have underclothing (#784) 
* Golems do not have underclothing

* Resolves .rej

* Update golems.dm

* Update golems.dm
 2017-05-18 03:53:14 -05:00
CitadelStationBot
257cf986c5 Repaths C4 (#808) 
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
 2017-05-18 00:37:20 -05:00
CitadelStationBot
cd122501fc Refactors blood regeneration from nutriment (#839) 
* Refactors blood regeneration from nutriment

* Update blood.dm

* Delete blood.dm.rej

* Update blood.dm
 2017-05-18 00:03:51 -05:00
LetterJay
5da8c5d520 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26952 2017-05-17 10:12:36 -05:00