From cb1b91bc9ffb87c4a49d1746ea866d23071d7334 Mon Sep 17 00:00:00 2001 From: Lzimann Date: Sat, 9 Jan 2016 19:27:27 -0200 Subject: [PATCH 1/4] Fix re-enter corpse message --- code/modules/admin/admin_verbs.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 7c9dbc23474..fb3ddf70398 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -322,10 +322,9 @@ var/list/admin_verbs_hideable = list( if(istype(mob,/mob/dead/observer)) //re-enter var/mob/dead/observer/ghost = mob - if (!ghost.can_reenter_corpse) + 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 //just in-case. 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)) From cb8080dd60fc2b6d83acad6cfa15f96a07043944 Mon Sep 17 00:00:00 2001 From: Leo Date: Tue, 12 Jan 2016 02:43:25 -0200 Subject: [PATCH 2/4] Changed so you can re-enter corpse with normal ghost verb --- code/modules/admin/admin_verbs.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index fb3ddf70398..f416cc777ee 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -322,9 +322,10 @@ var/list/admin_verbs_hideable = list( if(istype(mob,/mob/dead/observer)) //re-enter var/mob/dead/observer/ghost = mob - if (ghost.can_reenter_corpse) + 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 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)) From ea69ea0fef2041cec3ffc1c9834aee20edfab6ec Mon Sep 17 00:00:00 2001 From: Leo Date: Tue, 12 Jan 2016 03:12:42 -0200 Subject: [PATCH 3/4] 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)) From 92584201f44e8e4e2301a631c0d6364daf878320 Mon Sep 17 00:00:00 2001 From: Leo Date: Tue, 12 Jan 2016 03:21:18 -0200 Subject: [PATCH 4/4] Fix indentation Because I am stupid. --- code/modules/admin/admin_verbs.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index c272e985e59..d0dc7652b51 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -323,10 +323,10 @@ var/list/admin_verbs_hideable = list( //re-enter var/mob/dead/observer/ghost = mob if(!ghost.mind || !ghost.mind.current) //won't do anything if there is no body - return + return if(!ghost.can_reenter_corpse) - log_admin("[key_name(usr)] re-entered corpse") - message_admins("[key_name_admin(usr)] re-entered 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!