From 22dbf0ed23d6d5d4eacdaf023683fb423c5e63b8 Mon Sep 17 00:00:00 2001 From: skoglol <33292112+kriskog@users.noreply.github.com> Date: Mon, 9 Nov 2020 01:38:39 +0100 Subject: [PATCH] Rearranges and adds user check to ghost spawners. (#54684) --- code/modules/awaymissions/corpse.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 1a7d18f2c06..4b17482f2a6 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -40,6 +40,9 @@ /obj/effect/mob_spawn/attack_ghost(mob/user) if(!SSticker.HasRoundStarted() || !loc || !ghost_usable) return + var/ghost_role = alert("Become [mob_name]? (Warning, You can no longer be revived!)",,"Yes","No") + if(ghost_role == "No" || !loc || QDELETED(user)) + return if(!(GLOB.ghost_role_flags & GHOSTROLE_SPAWNER) && !(flags_1 & ADMIN_SPAWNED_1)) to_chat(user, "An admin has temporarily disabled non-admin ghost roles!") return @@ -53,10 +56,6 @@ return if(QDELETED(src) || QDELETED(user)) return - var/ghost_role = alert("Become [mob_name]? (Warning, You can no longer be revived!)",,"Yes","No") - - if(ghost_role == "No" || !loc) - return log_game("[key_name(user)] became [mob_name]") create(ckey = user.ckey)