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

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

@@ -5,11 +5,7 @@
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)
@@ -19,11 +15,7 @@
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)