From cbead4224b56f2630c2574d5712924073836c176 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sat, 6 Jun 2015 15:44:49 +0200 Subject: [PATCH] Fixes #9685. Observer from the lobby do not have minds, while observers that once lived do. Re-arranges the MayRespawn() logic to handle these situation. --- code/modules/mob/dead/observer/observer.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index e9f000eb3f..f65b07b2c7 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -620,9 +620,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return 1 mob/dead/observer/MayRespawn(var/feedback = 0) - if(!client || !mind) + if(!client) return 0 - if(mind.current && mind.current.stat != DEAD) + if(mind && mind.current && mind.current.stat != DEAD) if(feedback) src << "Your non-dead body prevent you from respawning." return 0