diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 68d245d8cdb..76aa6f75b3c 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -22,6 +22,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) light_power = 2 light_on = FALSE var/can_reenter_corpse + var/pushed_do_not_resuscitate = FALSE var/datum/hud/living/carbon/hud = null // hud var/bootime = 0 var/started_as_observer //This variable is set to 1 when you enter the game as an observer. @@ -380,6 +381,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return can_reenter_corpse = FALSE + pushed_do_not_resuscitate = TRUE // Update med huds var/mob/living/carbon/current = mind.current current.med_hud_set_status() diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 7ee134321c7..befe8939439 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -123,9 +123,13 @@ if(!just_sleeping) if(suiciding) . += "[t_He] appear[p_s()] to have committed suicide... there is no hope of recovery." - . += "" - if(getorgan(/obj/item/organ/brain) && !key && !get_ghost(FALSE, TRUE)) - . += "[t_He] [t_is] limp and unresponsive; there are no signs of life and [t_his] soul has departed..." + + var/mob/dead/observer/ghost = get_ghost(TRUE, TRUE) + if(getorgan(/obj/item/organ/brain) && !key) + if(!ghost) //There's no ghost with a mind matching the body's, the ghost has likely disconnected + . += "[t_He] [t_is] limp and unresponsive; there are no signs of life and [t_his] soul has departed..." + else if (!ghost.can_reenter_corpse || ghost.pushed_do_not_resuscitate) //There is a ghost with a matching mind but they pushed DNR or otherwise can't reenter + . += "[t_He] [t_is] limp and unresponsive; there are no signs of life and [t_his] soul has lost the will to live..." else . += "[t_He] [t_is] limp and unresponsive; there are no signs of life..."