From 653f417d367811893f4444de5b66accfb141b413 Mon Sep 17 00:00:00 2001 From: Dave Date: Tue, 24 Sep 2019 18:37:11 -0400 Subject: [PATCH] Fixes sequencing on mob spawner safties (#12399) --- code/modules/awaymissions/corpse.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 3598a1469b7..7131b79b03b 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -48,13 +48,14 @@ if(!O.can_reenter_corpse) to_chat(user, "You have forfeited the right to respawn.") return - if(QDELETED(src) || QDELETED(user)) - return var/ghost_role = alert("Become [mob_name]? (Warning, You can no longer be cloned!)",,"Yes","No") - if(ghost_role == "No" || !loc) + if(ghost_role == "No") return if(!species_prompt()) return + if(!loc || !uses || QDELETED(src) || QDELETED(user)) + to_chat(user, "The [name] is no longer usable!") + return log_game("[user.ckey] became [mob_name]") create(ckey = user.ckey)