Merge pull request #5459 from Citadel-Station-13/upstream-merge-35574

[MIRROR] Sanity check for sentience event
2018-02-13 10:27:09 -06:00
parent 42c197b1df cdc8eea447
commit 311463c03d
1 changed files with 1 additions and 1 deletions
@@ -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