cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00: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

8
code/modules/alarm/atmosphere_alarm.dm
View File

@@ -5,7 +5,11 @@
var/list/major_alarms = new()
var/list/map_levels = using_map.get_map_levels(z)
for(var/datum/alarm/A in visible_alarms())
<<<<<<< HEAD
if(z && (z && !(A.origin?.z in map_levels)))
=======
if(z && !(A.origin?.z in map_levels))
>>>>>>> e92ed43... Merge pull request #6990 from VOREStation/pol-tcomupdate
continue
if(A.max_severity() > 1)
major_alarms.Add(A)
@@ -15,7 +19,11 @@
var/list/minor_alarms = new()
var/list/map_levels = using_map.get_map_levels(z)
for(var/datum/alarm/A in visible_alarms())
<<<<<<< HEAD
if(z && (z && !(A.origin?.z in map_levels)))
=======
if(z && !(A.origin?.z in map_levels))
>>>>>>> e92ed43... Merge pull request #6990 from VOREStation/pol-tcomupdate
continue
if(A.max_severity() == 1)
minor_alarms.Add(A)