mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Merge pull request #6260 from Heroman3003/alarmchange
Properly splits security and engineering alarms
This commit is contained in:
@@ -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()
|
||||
..()
|
||||
|
||||
@@ -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
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user