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

Specifies if DNR was pushed in body examine text (#55399)

Browse Source 
Adds the examine text " and [t_his] soul has lost the will to live..." instead of the usual "soul departed" message if the person hits DNR.
This commit is contained in:
Emmanuel S
2020-12-24 06:17:14 -05:00
committed by GitHub
parent 161c734e11
commit 23cd239d05
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/dead/observer/observer.dm
+2
View File
@@ -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()
code/modules/mob/living/carbon/human/examine.dm
+7 -3
View File
@@ -123,9 +123,13 @@
if(!just_sleeping)
if(suiciding)
. += "<span class='warning'>[t_He] appear[p_s()] to have committed suicide... there is no hope of recovery.</span>"
. += ""
if(getorgan(/obj/item/organ/brain) && !key && !get_ghost(FALSE, TRUE))
. += "<span class='deadsay'>[t_He] [t_is] limp and unresponsive; there are no signs of life and [t_his] soul has departed...</span>"
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
. += "<span class='deadsay'>[t_He] [t_is] limp and unresponsive; there are no signs of life and [t_his] soul has departed...</span>"
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
. += "<span class='deadsay'>[t_He] [t_is] limp and unresponsive; there are no signs of life and [t_his] soul has lost the will to live...</span>"
else
. += "<span class='deadsay'>[t_He] [t_is] limp and unresponsive; there are no signs of life...</span>"