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

Merge pull request #6260 from Heroman3003/alarmchange

Browse Source 
Properly splits security and engineering alarms
This commit is contained in:
Anewbe
2019-07-03 12:10:14 -05:00
committed by VirgoBot
parent bcd2e28e65
commit e08616f1ee
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm
View File

@@ -1,12 +1,12 @@
/datum/computer_file/program/alarm_monitor /datum/computer_file/program/alarm_monitor
filename = "alarmmonitor" filename = "alarmmonitoreng"
filedesc = "Alarm Monitoring" filedesc = "Alarm Monitoring (Engineering)"
nanomodule_path = /datum/nano_module/alarm_monitor/engineering nanomodule_path = /datum/nano_module/alarm_monitor/engineering
ui_header = "alarm_green.gif" ui_header = "alarm_green.gif"
program_icon_state = "alert-green" program_icon_state = "alert-green"
program_key_state = "atmos_key" program_key_state = "atmos_key"
program_menu_icon = "alert" 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 required_access = access_engine
requires_ntnet = 1 requires_ntnet = 1
network_destination = "alarm monitoring network" network_destination = "alarm monitoring network"
@@ -46,7 +46,7 @@
/datum/nano_module/alarm_monitor/engineering/New() /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() /datum/nano_module/alarm_monitor/security/New()
..() ..()
@@ -132,4 +132,4 @@
ui.auto_update_layout = 1 ui.auto_update_layout = 1
ui.set_initial_data(data) ui.set_initial_data(data)
ui.open() ui.open()
ui.set_auto_update(1) ui.set_auto_update(1)

6
code/modules/modular_computers/file_system/programs/security/alarm_monitor.dm Normal file
View File

@@ -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

1
vorestation.dme
View File

@@ -2528,6 +2528,7 @@
#include "code\modules\modular_computers\file_system\programs\medical\suit_sensors.dm" #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\email_administration.dm"
#include "code\modules\modular_computers\file_system\programs\research\ntmonitor.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\file_system\programs\security\digitalwarrant.dm"
#include "code\modules\modular_computers\hardware\_hardware.dm" #include "code\modules\modular_computers\hardware\_hardware.dm"
#include "code\modules\modular_computers\hardware\battery_module.dm" #include "code\modules\modular_computers\hardware\battery_module.dm"