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

Refactor telecomms and consoles to operate on logical zlevels

Browse Source
This commit is contained in:
Atermonera
2020-04-28 14:55:04 -07:00
committed by VirgoBot
parent c66c3cec86
commit eb6eb7bcd6
13 changed files with 736 additions and 1 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,7 +111,11 @@
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]