From a94c8828087b006105136f03fa7aebb9535bb998 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 7 Apr 2023 01:12:56 +0200 Subject: [PATCH] [MIRROR] Fixes critical condition not clearing up [MDB IGNORE] (#20379) * Fixes critical condition not clearing up (#74536) ## About The Pull Request A recent refactor accidentally removed critical condition clearing up upon becoming conscious and healthy again. This PR fixes it. ## Why It's Good For The Game Now when you are healed, you are not considered being in crit, so you can not succumb while healthy, or will you get killed by nightwatcher's rebirth. Fixes #74149 ## Changelog :cl: fix: Critical condition will clear properly when you leave crit /:cl: * Fixes critical condition not clearing up --------- Co-authored-by: Profakos --- code/modules/mob/living/living.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 10e0d40df68..03b3853c303 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -2131,7 +2131,7 @@ GLOBAL_LIST_EMPTY(fire_appearances) if(CONSCIOUS) if(. >= UNCONSCIOUS) REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_KNOCKEDOUT) - remove_traits(list(TRAIT_HANDS_BLOCKED, TRAIT_INCAPACITATED, TRAIT_FLOORED), STAT_TRAIT) + remove_traits(list(TRAIT_HANDS_BLOCKED, TRAIT_INCAPACITATED, TRAIT_FLOORED, TRAIT_CRITICAL_CONDITION), STAT_TRAIT) if(SOFT_CRIT) if(pulledby) ADD_TRAIT(src, TRAIT_IMMOBILIZED, PULLED_WHILE_SOFTCRIT_TRAIT) //adding trait sources should come before removing to avoid unnecessary updates