From a4f4ad4e7a2baa20332492c6087207e166723b80 Mon Sep 17 00:00:00 2001 From: MrDoomBringer Date: Sun, 30 Sep 2018 20:57:44 -0400 Subject: [PATCH] Fixes morgues being able to consume ghosts, AI-eyes, etc. (#40594) --- code/game/objects/structures/morgue.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 695395afd2a..5ff3e91d6c9 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -130,9 +130,11 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an /obj/structure/bodycontainer/proc/close() playsound(src, 'sound/effects/roll.ogg', 5, 1) - playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/deconstruct.ogg', 50, 1) for(var/atom/movable/AM in connected.loc) if(!AM.anchored || AM == connected) + if(ismob(AM) && !isliving(AM)) + continue AM.forceMove(src) update_icon()