From 57794421e31a2f488b92b367c713fbc5579fab7e Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Wed, 16 Oct 2019 23:57:31 +0200 Subject: [PATCH] Ports "Fixes morgues being able to consume ghosts, AI-eyes, etc." --- 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 eaf3629718..98a26faae2 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -133,9 +133,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) recursive_organ_check(src) update_icon()