cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix atmos alarm console and PDA power console zlevel confinement

Browse Source
This commit is contained in:
Aronai Sieyes
2020-04-15 22:03:39 -04:00
parent fc312dd9ea
commit 0bc5a35309
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/machinery/computer/atmos_alert.dm
View File

@@ -28,10 +28,10 @@ var/global/list/minor_air_alarms = list()
var/major_alarms[0] var/major_alarms[0]
var/minor_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]") 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]") minor_alarms[++minor_alarms.len] = list("name" = sanitize(alarm.alarm_name()), "ref" = "\ref[alarm]")
data["priority_alarms"] = major_alarms data["priority_alarms"] = major_alarms

4
code/game/objects/items/devices/PDA/cart.dm
View File

@@ -309,8 +309,12 @@ var/list/civilian_cartridges = list(
if(mode==43 || mode==433) if(mode==43 || mode==433)
var/list/sensors = list() var/list/sensors = list()
var/obj/machinery/power/sensor/MS = null 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) 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))) sensors.Add(list(list("name_tag" = S.name_tag)))
if(S.name_tag == selected_sensor) if(S.name_tag == selected_sensor)
MS = S MS = S