From c37d30a61798a670cde465f3fc0e73794fd8884b Mon Sep 17 00:00:00 2001 From: necromanceranne Date: Wed, 11 Mar 2020 15:43:47 +1100 Subject: [PATCH] Some fixes requested by kev also ports a fix from tg --- code/datums/diseases/advance/symptoms/heal.dm | 4 +++- code/modules/research/nanites/nanite_programs/suppression.dm | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm index 84d652b77d..59afe163b4 100644 --- a/code/datums/diseases/advance/symptoms/heal.dm +++ b/code/datums/diseases/advance/symptoms/heal.dm @@ -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) diff --git a/code/modules/research/nanites/nanite_programs/suppression.dm b/code/modules/research/nanites/nanite_programs/suppression.dm index 1c882cead3..a6f3407c2e 100644 --- a/code/modules/research/nanites/nanite_programs/suppression.dm +++ b/code/modules/research/nanites/nanite_programs/suppression.dm @@ -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() . = ..()