From c8989b36e14925309524397f9e4b1df0771c706e Mon Sep 17 00:00:00 2001 From: Krausus Date: Wed, 3 Aug 2016 19:21:36 -0400 Subject: [PATCH] Fixes cremation of self-deleting mobs --- code/game/objects/structures/morgue.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 71a0c8379a9..cf5c97ed593 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -361,6 +361,8 @@ user.attack_log +="\[[time_stamp()]\] Cremated [M.name] ([M.ckey])" log_attack("[user.name] ([user.ckey]) cremated [M.name] ([M.ckey])") M.death(1) + if(!M || !isnull(M.gcDestroyed)) + continue // Re-check for mobs that delete themselves on death M.ghostize() qdel(M)