From 33358776ec2b0d4d61362d847db089ddc7d7743f Mon Sep 17 00:00:00 2001 From: Putnam Date: Sun, 27 Dec 2020 17:49:15 -0800 Subject: [PATCH 1/2] Makes regen coma properly work at 25% when sleeping --- code/datums/diseases/advance/symptoms/heal.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm index 2fc853500d..cd7b1eb67c 100644 --- a/code/datums/diseases/advance/symptoms/heal.dm +++ b/code/datums/diseases/advance/symptoms/heal.dm @@ -265,12 +265,12 @@ var/mob/living/M = A.affected_mob if(HAS_TRAIT(M, TRAIT_DEATHCOMA)) return power - else if(M.IsUnconscious() || M.stat == UNCONSCIOUS) - return power * 0.9 else if(M.stat == SOFT_CRIT) return power * 0.5 else if(M.IsSleeping()) return power * 0.25 + else if(M.IsUnconscious() || M.stat == UNCONSCIOUS) + return power * 0.9 else if(M.getBruteLoss() + M.getFireLoss() >= 70 && !active_coma) to_chat(M, "You feel yourself slip into a regenerative coma...") active_coma = TRUE From fd8f5c4afd06f58a2204fec3d03f77c5bf064b98 Mon Sep 17 00:00:00 2001 From: Putnam Date: Sun, 27 Dec 2020 17:54:53 -0800 Subject: [PATCH 2/2] Makes coma more precedent. --- code/datums/diseases/advance/symptoms/heal.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm index cd7b1eb67c..c19f23ed2a 100644 --- a/code/datums/diseases/advance/symptoms/heal.dm +++ b/code/datums/diseases/advance/symptoms/heal.dm @@ -263,6 +263,10 @@ /datum/symptom/heal/coma/CanHeal(datum/disease/advance/A) var/mob/living/M = A.affected_mob + if(M.getBruteLoss() + M.getFireLoss() >= 70 && !active_coma) + to_chat(M, "You feel yourself slip into a regenerative coma...") + active_coma = TRUE + addtimer(CALLBACK(src, .proc/coma, M), 60) if(HAS_TRAIT(M, TRAIT_DEATHCOMA)) return power else if(M.stat == SOFT_CRIT) @@ -271,10 +275,6 @@ return power * 0.25 else if(M.IsUnconscious() || M.stat == UNCONSCIOUS) return power * 0.9 - else if(M.getBruteLoss() + M.getFireLoss() >= 70 && !active_coma) - to_chat(M, "You feel yourself slip into a regenerative coma...") - active_coma = TRUE - addtimer(CALLBACK(src, .proc/coma, M), 60) /datum/symptom/heal/coma/proc/coma(mob/living/M) if(deathgasp)