From 0bc5a3530997b0cca7d63013ab20728e66fa5280 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Wed, 15 Apr 2020 22:03:39 -0400 Subject: [PATCH] Fix atmos alarm console and PDA power console zlevel confinement --- code/game/machinery/computer/atmos_alert.dm | 4 ++-- code/game/objects/items/devices/PDA/cart.dm | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index e2b3fc4638..7f5c27a0d4 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -28,10 +28,10 @@ var/global/list/minor_air_alarms = list() var/major_alarms[0] var/minor_alarms[0] - for(var/datum/alarm/alarm in atmosphere_alarm.major_alarms()) + for(var/datum/alarm/alarm in atmosphere_alarm.major_alarms(get_z(src))) major_alarms[++major_alarms.len] = list("name" = sanitize(alarm.alarm_name()), "ref" = "\ref[alarm]") - for(var/datum/alarm/alarm in atmosphere_alarm.minor_alarms()) + for(var/datum/alarm/alarm in atmosphere_alarm.minor_alarms(get_z(src))) minor_alarms[++minor_alarms.len] = list("name" = sanitize(alarm.alarm_name()), "ref" = "\ref[alarm]") data["priority_alarms"] = major_alarms diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 1ca1ae6506..ad4e1d7f3e 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -309,8 +309,12 @@ var/list/civilian_cartridges = list( if(mode==43 || mode==433) var/list/sensors = list() var/obj/machinery/power/sensor/MS = null + var/my_z = get_z(user) + var/list/levels = using_map.get_map_levels(my_z) for(var/obj/machinery/power/sensor/S in machines) + if(!(get_z(S) in levels)) + continue sensors.Add(list(list("name_tag" = S.name_tag))) if(S.name_tag == selected_sensor) MS = S