From a103a44252d4bc1c0a815872c7cdf3219253cb81 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Tue, 13 Feb 2018 18:00:10 +0200 Subject: [PATCH] Merge pull request #35574 from ShizCalev/sentience-fix Sanity check for sentience event --- code/modules/events/sentience.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/sentience.dm b/code/modules/events/sentience.dm index 50ed1211c4..b4b939fdba 100644 --- a/code/modules/events/sentience.dm +++ b/code/modules/events/sentience.dm @@ -31,7 +31,7 @@ var/list/potential = list() for(var/mob/living/simple_animal/L in GLOB.alive_mob_list) var/turf/T = get_turf(L) - if(!is_station_level(T.z)) + if(!T || !is_station_level(T.z)) continue if(!(L in GLOB.player_list) && !L.mind) potential += L