From d06493d6f6018aa6555d35e070833da1838d739f Mon Sep 17 00:00:00 2001 From: Lzimann Date: Fri, 14 Jul 2017 00:27:41 -0300 Subject: [PATCH 1/2] Possibly fix player_list having a null --- code/modules/mob/dead/observer/observer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index c86c12476d4..06f4a2270a2 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -317,7 +317,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set name = "Re-enter Corpse" if(!client) return - if(!(mind && mind.current)) + if(!(mind && QDELETED(mind.current))) to_chat(src, "You have no body.") return if(!can_reenter_corpse) From 896095e3f154cd8d218d4017335729f7073e5c5c Mon Sep 17 00:00:00 2001 From: Lzimann Date: Fri, 14 Jul 2017 12:09:38 -0300 Subject: [PATCH 2/2] Corrects the check --- code/modules/mob/dead/observer/observer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 06f4a2270a2..430ee651794 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -317,7 +317,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set name = "Re-enter Corpse" if(!client) return - if(!(mind && QDELETED(mind.current))) + if(!mind || QDELETED(mind.current)) to_chat(src, "You have no body.") return if(!can_reenter_corpse)