From 0a14bf3fd49c0f2daaaa0e6a6f3dcee82c8404fe Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Sat, 21 Oct 2017 19:52:03 -0400 Subject: [PATCH] Adds sanity check to Narsie pickcultist proc (#31937) * Adds sanity check to Narsie pickcultist proc * claned up src * cleaned --- code/modules/power/singularity/narsie.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm index b566d65f49..81dcd573f5 100644 --- a/code/modules/power/singularity/narsie.dm +++ b/code/modules/power/singularity/narsie.dm @@ -142,7 +142,7 @@ for(var/mob/living/carbon/food in GLOB.living_mob_list) //we don't care about constructs or cult-Ians or whatever. cult-monkeys are fair game i guess var/turf/pos = get_turf(food) - if(pos.z != src.z) + if(!pos || (pos.z != z)) continue if(iscultist(food)) @@ -163,7 +163,7 @@ if(!ghost.client) continue var/turf/pos = get_turf(ghost) - if(pos.z != src.z) + if(!pos || (pos.z != z)) continue cultists += ghost if(cultists.len)