From ea69ea0fef2041cec3ffc1c9834aee20edfab6ec Mon Sep 17 00:00:00 2001 From: Leo Date: Tue, 12 Jan 2016 03:12:42 -0200 Subject: [PATCH] Change so it works as intended But at least stops triggering the message when you don't have a body --- code/modules/admin/admin_verbs.dm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index f416cc777ee..c272e985e59 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -322,10 +322,12 @@ var/list/admin_verbs_hideable = list( if(istype(mob,/mob/dead/observer)) //re-enter var/mob/dead/observer/ghost = mob - if (ghost.mind && ghost.mind.current) - log_admin("[key_name(usr)] re-entered corpse") - message_admins("[key_name_admin(usr)] re-entered corpse") - ghost.can_reenter_corpse = 1 //So you can re-enter if you ghost out without aghost + if(!ghost.mind || !ghost.mind.current) //won't do anything if there is no body + return + if(!ghost.can_reenter_corpse) + log_admin("[key_name(usr)] re-entered corpse") + message_admins("[key_name_admin(usr)] re-entered corpse") + ghost.can_reenter_corpse = 1 //force re-entering even when otherwise not possible ghost.reenter_corpse() feedback_add_details("admin_verb","P") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! else if(istype(mob,/mob/new_player))