From 1d0b84addbdb646e8a7422a4f716f0c357b4ef6d Mon Sep 17 00:00:00 2001 From: moxian Date: Sat, 9 Nov 2019 10:17:41 +0000 Subject: [PATCH] Fix prisoner implant z-level checking. - Can no longer hide in a locker from prisoner computer tracking - locator no longer tracks implanted people across z-levels --- code/game/machinery/computer/prisoner.dm | 4 ++-- code/game/objects/items/weapons/teleportation.dm | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 672ebed32e4..bcabdeb511e 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -71,8 +71,8 @@ health_display = "DEAD" else if(total_loss) health_display = "HURT ([total_loss])" - if(is_station_level(M.z) && !istype(M.loc, /turf/space)) - loc_display = "[get_area(M)]" + if(is_station_level(Tr.z) && !istype(Tr.loc, /turf/space)) + loc_display = "[get_area(Tr)]" dat += "ID: [T.id]
Subject: [M]
Location: [loc_display]
Health: [health_display]
" dat += "(Message Holder) |
" dat += "********************************
" diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index c463c7897fc..117bb90c35f 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -70,9 +70,10 @@ Frequency: for(var/obj/item/implant/tracking/T in GLOB.tracked_implants) if(!T.implanted || !T.imp_in) continue + var/turf/Tr = get_turf(T) - if(T && T.z == z) - temp += "[T.id]: [T.imp_in.x], [T.imp_in.y], [T.imp_in.z]
" + if(Tr && Tr.z == sr.z) + temp += "[T.id]: [Tr.x], [Tr.y], [Tr.z]
" temp += "You are at \[[sr.x],[sr.y],[sr.z]\]." temp += "

Refresh
"