From 84a3b3598951cf85712d1d89c36e3caa8383cc69 Mon Sep 17 00:00:00 2001 From: D3athrow Date: Wed, 28 Jan 2015 10:42:02 -0600 Subject: [PATCH] I'm an idiot --- code/modules/mob/dead/observer/observer.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 6f9fd7c4967..3673294344e 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -371,12 +371,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp usr << "Another consciousness is in your body...It is resisting you." return if(mind.current.ajourn && mind.current.stat != DEAD) //check if the corpse is astral-journeying (it's client ghosted using a cultist rune). - var/obj/effect/rune/R = locate() in mind.current.loc //whilst corpse is alive, we can only reenter the body if it's on the rune + var/obj/effect/rune/R = mind.current.ajourn //whilst corpse is alive, we can only reenter the body if it's on the rune if(!(R && R.word1 == cultwords["hell"] && R.word2 == cultwords["travel"] && R.word3 == cultwords["self"])) //astral journeying rune usr << "The astral cord that ties your body and your spirit has been severed. You are likely to wander the realm beyond until your body is finally dead and thus reunited with you." return - mind.current.ajourn.ajourn = null - mind.current.ajourn=null + if(mind && mind.current && mind.current.ajourn) + mind.current.ajourn.ajourn = null + mind.current.ajourn = null mind.current.key = key return 1