From 54d2ac2ca5176b3eae0e0911c4d983eef629d092 Mon Sep 17 00:00:00 2001 From: Divulf <134484326+Divulf@users.noreply.github.com> Date: Sat, 8 Jul 2023 00:56:48 +1200 Subject: [PATCH] Adds the name of the occupant to the examine text of sleepers and body scanners (#21324) * Adds a line featuring the name of the occupant and whether they are dead to the examine text of sleepers and body scanners. * Gives to description. Also adds the feature to cryo cells. * Now using occupant.p_are() --- code/game/machinery/Sleeper.dm | 5 +++++ code/game/machinery/adv_med.dm | 5 +++++ .../atmospherics/machinery/components/unary_devices/cryo.dm | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index c791b02c7f5..0fc6c748a4e 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -33,6 +33,11 @@ /obj/machinery/sleeper/examine(mob/user) . = ..() + if(occupant) + if(occupant.is_dead()) + . += "You see [occupant.name] inside. [occupant.p_they(TRUE)] [occupant.p_are()] dead!" + else + . += "You see [occupant.name] inside." if(Adjacent(user)) . += "You can Alt-Click to eject the current occupant. Click-drag someone to the sleeper to place them in it after a short delay." diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 426904f918a..e35c125f33c 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -14,6 +14,11 @@ /obj/machinery/bodyscanner/examine(mob/user) . = ..() + if(occupant) + if(occupant.is_dead()) + . += "You see [occupant.name] inside. [occupant.p_they(TRUE)] [occupant.p_are()] dead!" + else + . += "You see [occupant.name] inside." if(Adjacent(user)) . += "You can Alt-Click to eject the current occupant. Click-drag someone to the scanner to place them inside." diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index 915415952fb..c7a89b7df42 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -31,6 +31,11 @@ /obj/machinery/atmospherics/unary/cryo_cell/examine(mob/user) . = ..() + if(occupant) + if(occupant.is_dead()) + . += "You see [occupant.name] inside. [occupant.p_they(TRUE)] [occupant.p_are()] dead!" + else + . += "You see [occupant.name] inside." . += "The Cryogenic cell chamber is effective at treating those with genetic damage, but all other damage types at a moderate rate." . += "Mostly using cryogenic chemicals, such as cryoxadone for it's medical purposes, requires that the inside of the cell be kept cool at all times. Hooking up a freezer and cooling the pipeline will do this nicely." . += "Click-drag someone to a cell to place them in it, use the 'Eject occupant' verb to remove them."