cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 23:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes critical condition not clearing up (#74536)

Browse Source 
## 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

🆑
fix: Critical condition will clear properly when you leave crit
/🆑
This commit is contained in:
Profakos
2023-04-06 16:25:33 -06:00
committed by GitHub
parent 0cf7612345
commit 126624a0ac
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living.dm
+1 -1
View File
@@ -2072,7 +2072,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