Merge pull request #11424 from necromanceranne/death_coma_stuff

Some fakedeath fixes requested by kev also ports a fix from tg to regen coma
This commit is contained in:
kevinz000
2020-03-11 17:24:03 -07:00
committed by GitHub
2 changed files with 4 additions and 2 deletions
@@ -257,6 +257,8 @@
/datum/symptom/heal/coma/End(datum/disease/advance/A)
if(!..())
return
if(active_coma)
uncoma()
REMOVE_TRAIT(A.affected_mob, TRAIT_NOCRITDAMAGE, DISEASE_TRAIT)
/datum/symptom/heal/coma/CanHeal(datum/disease/advance/A)
@@ -277,7 +279,7 @@
/datum/symptom/heal/coma/proc/coma(mob/living/M)
if(deathgasp)
M.emote("deathgasp")
M.fakedeath("regenerative_coma")
M.fakedeath("regenerative_coma", TRUE)
M.update_stat()
M.update_mobility()
addtimer(CALLBACK(src, .proc/uncoma, M), 300)
@@ -107,7 +107,7 @@
/datum/nanite_program/fake_death/enable_passive_effect()
. = ..()
host_mob.emote("deathgasp")
host_mob.fakedeath("nanites")
host_mob.fakedeath("nanites", TRUE)
/datum/nanite_program/fake_death/disable_passive_effect()
. = ..()