Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Ports "Makes alarm manager update even while off and fire alarms clear" #4561 #12601

Merged
JamieD1 merged 2 commits into from
Nov 14, 2021
Merged

Ports "Makes alarm manager update even while off and fire alarms clear" #4561 #12601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29fbea7
Ported "Makes alarm manager update even while off and fire alarms clear"
nmajask Nov 5, 2021
9399359
Forgot this
nmajask Nov 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/_globalvars/lists/objects.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,4 @@ GLOBAL_LIST_EMPTY(ai_status_displays)

GLOBAL_LIST_EMPTY(mob_spawners) // All mob_spawn objects
GLOBAL_LIST_EMPTY(alert_consoles) // Station alert consoles, /obj/machinery/computer/station_alert
GLOBAL_LIST_INIT(alarms, list("Fire" = list(), "Atmosphere" = list(), "Power" = list())) //all engineering alerts for station alert consoles and alarm manager
15 changes: 7 additions & 8 deletions code/game/machinery/computer/station_alert.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
icon_screen = "alert:0"
icon_keyboard = "atmos_key"
circuit = /obj/item/circuitboard/computer/stationalert
var/alarms = list("Fire" = list(), "Atmosphere" = list(), "Power" = list())

light_color = LIGHT_COLOR_CYAN

Expand All @@ -26,9 +25,9 @@
var/list/data = list()

data["alarms"] = list()
for(var/class in alarms)
for(var/class in GLOB.alarms)
data["alarms"][class] = list()
for(var/area in alarms[class])
for(var/area in GLOB.alarms[class])
data["alarms"][class] += area

return data
Expand All @@ -39,7 +38,7 @@
if(stat & (BROKEN))
return

var/list/L = alarms[class]
var/list/L = GLOB.alarms[class]
for(var/I in L)
if (I == A.name)
var/list/alarm = L[I]
Expand All @@ -62,7 +61,7 @@
/obj/machinery/computer/station_alert/proc/cancelAlarm(class, area/A, obj/origin)
if(stat & (BROKEN))
return
var/list/L = alarms[class]
var/list/L = GLOB.alarms[class]
var/cleared = 0
for (var/I in L)
if (I == A.name)
Expand All @@ -80,9 +79,9 @@
if(stat & (NOPOWER|BROKEN))
return
var/active_alarms = FALSE
for(var/cat in alarms)
var/list/L = alarms[cat]
for(var/cat in GLOB.alarms)
var/list/L = GLOB.alarms[cat]
if(L.len)
active_alarms = TRUE
if(active_alarms)
add_overlay("alert:2")
add_overlay("alert:2")
13 changes: 6 additions & 7 deletions code/modules/modular_computers/file_system/programs/alarm.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
tgui_id = "NtosStationAlertConsole"

var/has_alert = 0
var/alarms = list("Fire" = list(), "Atmosphere" = list(), "Power" = list())

/datum/computer_file/program/alarm_monitor/process_tick()
..()
Expand All @@ -30,9 +29,9 @@
var/list/data = get_header_data()

data["alarms"] = list()
for(var/class in alarms)
for(var/class in GLOB.alarms)
data["alarms"][class] = list()
for(var/area in alarms[class])
for(var/area in GLOB.alarms[class])
data["alarms"][class] += area

return data
Expand All @@ -44,7 +43,7 @@
else if(!is_mining_level(source.z) || istype(A, /area/ruin))
return

var/list/L = alarms[class]
var/list/L = GLOB.alarms[class]
for(var/I in L)
if (I == A.name)
var/list/alarm = L[I]
Expand All @@ -68,7 +67,7 @@


/datum/computer_file/program/alarm_monitor/proc/cancelAlarm(class, area/A, obj/origin)
var/list/L = alarms[class]
var/list/L = GLOB.alarms[class]
var/cleared = 0
for (var/I in L)
if (I == A.name)
Expand All @@ -85,8 +84,8 @@

/datum/computer_file/program/alarm_monitor/proc/update_alarm_display()
has_alert = FALSE
for(var/cat in alarms)
var/list/L = alarms[cat]
for(var/cat in GLOB.alarms)
var/list/L = GLOB.alarms[cat]
if(L.len)
has_alert = TRUE

Expand Down