Better examine descriptions to prevent medics from wasting time trying to revive people that left the server (#28751)

* better examine

* different message
This commit is contained in:
kyunkyunkyun
2025-04-11 17:33:06 +00:00
committed by GitHub
parent da7973ee7c
commit e8006a8c8a
5 changed files with 18 additions and 10 deletions
+5
View File
@@ -1764,6 +1764,11 @@
return G
break
/datum/mind/proc/check_ghost_client()
var/mob/dead/observer/G = get_ghost()
if(G.client)
return TRUE
/datum/mind/proc/grab_ghost(force)
var/mob/dead/observer/G = get_ghost(even_if_they_cant_reenter = force)
. = G
+5 -8
View File
@@ -205,14 +205,11 @@
// To the right of health bar
if(stat == DEAD || HAS_TRAIT(src, TRAIT_FAKEDEATH))
var/revivable_state = "dead"
if(!ghost_can_reenter()) // DNR or AntagHUD
revivable_state = "dead"
else if(ismachineperson(src) || (timeofdeath && is_revivable()))
revivable_state = "flatline"
else if(!mind)
revivable_state = "dead"
else if(get_ghost() || key)
revivable_state = "hassoul"
if(ghost_can_reenter()) // Not DNR or AntagHUD
if((ismachineperson(src) && client) || (!ismachineperson(src) && timeofdeath && is_revivable()))
revivable_state = "flatline"
else if(get_ghost() || key)
revivable_state = "hassoul"
holder.icon_state = "hud[revivable_state]"
+3 -1
View File
@@ -252,8 +252,10 @@
if(suiciding)
msg += "<span class='warning'>[p_they(TRUE)] appear[p_s()] to have committed suicide... there is no hope of recovery.</span>\n"
if(!just_sleeping)
msg += "<span class='deadsay'>[p_they(TRUE)] [p_are()] limp and unresponsive; there are no signs of life"
msg += "<span class='deadsay'>[p_they(TRUE)] [p_are()] limp and unresponsive"
if(get_int_organ(/obj/item/organ/internal/brain) && !key)
if(!check_ghost_client())
msg += "; there are no signs of life"
if(!get_ghost())
msg += " and [p_their()] soul has departed"
msg += "...</span>\n"
+4
View File
@@ -1108,6 +1108,10 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
if(mind)
return mind.get_ghost(even_if_they_cant_reenter)
/mob/proc/check_ghost_client()
if(mind)
return mind.check_ghost_client()
/mob/proc/grab_ghost(force)
if(mind)
return mind.grab_ghost(force = force)
+1 -1
View File
@@ -61,7 +61,7 @@
. += "You can feel a bright spark of life in this one!"
return
if(brainmob?.mind)
if(brainmob.get_ghost())
if(brainmob.check_ghost_client())
. += "You can feel the small spark of life still left in this one."
return