cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 20:45:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

[NON-MODULAR] stops medhuds from seeing DNRs as revivable (#9716)

Browse Source 
* stops medhuds from seeing DNRs as revivable

* annnd now on examine text
This commit is contained in:
Seris02
2021-11-27 04:37:33 +08:00
committed by GitHub
parent 3420c40ec5
commit 67bdbbd496
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/data_huds.dm
+3 -1
View File
@@ -193,7 +193,9 @@ Medical HUD! Basic mode needs suit sensors on.
if(HAS_TRAIT(src, TRAIT_XENO_HOST))
holder.icon_state = "hudxeno"
else if(stat == DEAD || (HAS_TRAIT(src, TRAIT_FAKEDEATH)))
if((key || get_ghost(FALSE, TRUE)) && (can_defib() & DEFIB_REVIVABLE_STATES))
//if((key || get_ghost(FALSE, TRUE)) && (can_defib() & DEFIB_REVIVABLE_STATES))
//SKYRAT EDIT CHANGE
if(!HAS_TRAIT(src, TRAIT_DNR) && (key || get_ghost(FALSE, TRUE)) && (can_defib() & DEFIB_REVIVABLE_STATES))
holder.icon_state = "huddefib"
else
holder.icon_state = "huddead"
modular_skyrat/master_files/code/modules/mob/living/carbon/human_helpers.dm
+1 -1
View File
@@ -4,7 +4,7 @@
var/t_his = p_their(TRUE)
var/t_is = p_are()
//This checks to see if the body is revivable
if(key || !getorgan(/obj/item/organ/brain) || ghost?.can_reenter_corpse)
if(!HAS_TRAIT(src, TRAIT_DNR) && (key || !getorgan(/obj/item/organ/brain) || ghost?.can_reenter_corpse))
return span_deadsay("[t_He] [t_is] limp and unresponsive; there are no signs of life...")
else
return span_deadsay("[t_He] [t_is] limp and unresponsive. [t_his] consciousness has degraded beyond revival.")