cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-10 22:55:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS changes for telecomms

Browse Source
This commit is contained in:
Aronai Sieyes
2020-04-29 10:24:37 -04:00
parent eb6eb7bcd6
commit c2ca984d18
12 changed files with 0 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm
-4
View File
@@ -111,11 +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())
<<<<<<< HEAD
for(var/datum/alarm/A in AH.visible_alarms(z))
=======
for(var/datum/alarm/A in AH.major_alarms(z))
>>>>>>> e92ed43... Merge pull request #6990 from VOREStation/pol-tcomupdate
var/cameras[0]
var/lost_sources[0]