From e08616f1ee260c6b5016bce955bd7f26b08c1570 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Wed, 3 Jul 2019 12:10:14 -0500 Subject: [PATCH] Merge pull request #6260 from Heroman3003/alarmchange Properly splits security and engineering alarms --- .../file_system/programs/engineering/alarm_monitor.dm | 10 +++++----- .../file_system/programs/security/alarm_monitor.dm | 6 ++++++ vorestation.dme | 1 + 3 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 code/modules/modular_computers/file_system/programs/security/alarm_monitor.dm 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 482872b533..20c4dde1ca 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 @@ -1,12 +1,12 @@ /datum/computer_file/program/alarm_monitor - filename = "alarmmonitor" - filedesc = "Alarm Monitoring" + filename = "alarmmonitoreng" + filedesc = "Alarm Monitoring (Engineering)" nanomodule_path = /datum/nano_module/alarm_monitor/engineering ui_header = "alarm_green.gif" program_icon_state = "alert-green" program_key_state = "atmos_key" program_menu_icon = "alert" - extended_desc = "This program provides visual interface for the alarm system." + extended_desc = "This program provides visual interface for the engineering alarm system." required_access = access_engine requires_ntnet = 1 network_destination = "alarm monitoring network" @@ -46,7 +46,7 @@ /datum/nano_module/alarm_monitor/engineering/New() ..() - alarm_handlers = list(atmosphere_alarm, camera_alarm, fire_alarm, power_alarm) + alarm_handlers = list(atmosphere_alarm, fire_alarm, power_alarm) /datum/nano_module/alarm_monitor/security/New() ..() @@ -132,4 +132,4 @@ ui.auto_update_layout = 1 ui.set_initial_data(data) ui.open() - ui.set_auto_update(1) + ui.set_auto_update(1) \ No newline at end of file diff --git a/code/modules/modular_computers/file_system/programs/security/alarm_monitor.dm b/code/modules/modular_computers/file_system/programs/security/alarm_monitor.dm new file mode 100644 index 0000000000..2254cc1dae --- /dev/null +++ b/code/modules/modular_computers/file_system/programs/security/alarm_monitor.dm @@ -0,0 +1,6 @@ +/datum/computer_file/program/alarm_monitor/security //Subtype of engineering alarm monitor, look at /engineering/alarm_monitor for details + filename = "alarmmonitorsec" + filedesc = "Alarm Monitoring (Security)" + extended_desc = "This program provides visual interface for the security alarm system." + nanomodule_path = /datum/nano_module/alarm_monitor/security + required_access = access_security \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index fe700420d6..85498b9246 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2528,6 +2528,7 @@ #include "code\modules\modular_computers\file_system\programs\medical\suit_sensors.dm" #include "code\modules\modular_computers\file_system\programs\research\email_administration.dm" #include "code\modules\modular_computers\file_system\programs\research\ntmonitor.dm" +#include "code\modules\modular_computers\file_system\programs\security\alarm_monitor.dm" #include "code\modules\modular_computers\file_system\programs\security\digitalwarrant.dm" #include "code\modules\modular_computers\hardware\_hardware.dm" #include "code\modules\modular_computers\hardware\battery_module.dm"