From 5f5fc4b0a616a8f91e1340c5a17dd84a7820ed6b Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Tue, 20 Jan 2015 13:32:59 +0100 Subject: [PATCH] Fixes #7880. Adds () around the "M.z in list" check, otherwise BYOND attempts to check "M.z in (list && hassensorlevel)". Also attempts to properly acquire the current Z position. --- code/game/machinery/camera/tracking.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index f274a1d07ea..4e64b9a6606 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -236,7 +236,11 @@ return 1 /proc/trackable(var/mob/living/M) - return near_camera(M) || (M.loc.z in config.station_levels && hassensorlevel(M, SUIT_SENSOR_TRACKING)) + var/turf/T = get_turf(M) + if(T && (T.z in config.station_levels) && hassensorlevel(M, SUIT_SENSOR_TRACKING)) + return 1 + + return near_camera(M) /obj/machinery/camera/attack_ai(var/mob/living/silicon/ai/user as mob) if (!istype(user))