From d7679264fc3a3a682722806f8a347ff2bc9684b0 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Fri, 1 May 2020 14:19:58 -0400 Subject: [PATCH] Show all alarms on modular alarm monitor and mark major ones (#7002) Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com> --- .../file_system/programs/engineering/alarm_monitor.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm index bb45191f2f..8c03238bff 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm @@ -111,7 +111,7 @@ var/z = get_z(nano_host()) for(var/datum/alarm_handler/AH in alarm_handlers) categories[++categories.len] = list("category" = AH.category, "alarms" = list()) - for(var/datum/alarm/A in AH.major_alarms(z)) + for(var/datum/alarm/A in AH.visible_alarms(z)) var/cameras[0] var/lost_sources[0] @@ -123,7 +123,7 @@ lost_sources[++lost_sources.len] = AS.source_name categories[categories.len]["alarms"] += list(list( - "name" = sanitize(A.alarm_name()), + "name" = sanitize("[A.alarm_name()]" + "[A.max_severity() > 1 ? "(MAJOR)" : ""]"), "origin_lost" = A.origin == null, "has_cameras" = cameras.len, "cameras" = cameras,