shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes brain_damage_lines.json compile errors

Browse Source
This commit is contained in:
deathride58
2017-12-15 12:57:29 -05:00
committed by kevinz000
parent 253c819bc1
commit b1efb191bc
12 changed files with 4823 additions and 2074 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/secrets.dm
+1
View File
@@ -54,6 +54,7 @@
<A href='?src=[REF(src)];[HrefToken()];secrets=quickpower'>Power all SMES</A><BR>
<A href='?src=[REF(src)];[HrefToken()];secrets=tripleAI'>Triple AI mode (needs to be used in the lobby)</A><BR>
<A href='?src=[REF(src)];[HrefToken()];secrets=traitor_all'>Everyone is the traitor</A><BR>
<A href='?src=[REF(src)];[HrefToken()];secrets=ak47s'>AK47s for everyone!</A><BR>
<A href='?src=[REF(src)];[HrefToken()];secrets=guns'>Summon Guns</A><BR>
<A href='?src=[REF(src)];[HrefToken()];secrets=magic'>Summon Magic</A><BR>
<A href='?src=[REF(src)];[HrefToken()];secrets=events'>Summon Events (Toggle)</A><BR>
code/modules/mob/living/carbon/human/human_defense.dm
+1 -1
View File
@@ -141,7 +141,7 @@
/mob/living/carbon/human/grabbedby(mob/living/carbon/user, supress_message = 0)
if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && (disabilities & FAT) && ismonkey(pulling))
devour_mob(pulling)
vore_attack(user, pulling)
else
..()
code/modules/mob/living/carbon/life.dm
+5 -1
View File
@@ -49,6 +49,10 @@
return
if(istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell))
return
if(istype(loc, /obj/item/device/dogborg/sleeper))
return
if(ismob(loc))
return
var/datum/gas_mixture/environment
if(loc)
@@ -456,4 +460,4 @@
death()
var/obj/item/organ/brain/B = getorganslot(ORGAN_SLOT_BRAIN)
if(B)
B.damaged_brain = TRUE
B.damaged_brain = TRUE