From 96f06521155f2de3978096c79d1fe4dbb66cf66a Mon Sep 17 00:00:00 2001 From: Ryal Date: Wed, 18 Nov 2020 10:09:37 -0800 Subject: [PATCH] Makes morgue tray respect unrevivable mobs (#14908) * Makes morgue tray respect unrevivable mobs * Removes unneeded logic * Cleans up logic --- code/game/objects/structures/morgue.dm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index e7b95ba7122..9375b6dce72 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -49,12 +49,16 @@ if(M) var/mob/dead/observer/G = M.get_ghost() - if(M.client) - icon_state = "morgue3" - desc = initial(desc) + "\n[status_descriptors[4]]" - else if(G && G.client) //There is a ghost and it is connected to the server - icon_state = "morgue5" - desc = initial(desc) + "\n[status_descriptors[6]]" + if(M.mind && M.mind.is_revivable() && !M.mind.suicided) + if(M.client) + icon_state = "morgue3" + desc = initial(desc) + "\n[status_descriptors[4]]" + else if(G && G.client) //There is a ghost and it is connected to the server + icon_state = "morgue5" + desc = initial(desc) + "\n[status_descriptors[6]]" + else + icon_state = "morgue2" + desc = initial(desc) + "\n[status_descriptors[3]]" else icon_state = "morgue2" desc = initial(desc) + "\n[status_descriptors[3]]"