Fix the Syndicate base causing atmos alerts

This commit is contained in:
Mark van Alphen
2019-06-03 00:52:14 +02:00
parent c6e6c6cefd
commit e7fa7fed34
5 changed files with 14 additions and 12 deletions
+3 -3
View File
@@ -1964,7 +1964,7 @@ var/list/ghostteleportlocs = list()
/area/traitor
name = "\improper Syndicate Base"
icon_state = "syndie_hall"
report_alerts = 0
report_alerts = FALSE
/area/traitor/rnd
name = "\improper Syndicate Research and Development"
@@ -2134,7 +2134,7 @@ var/list/ghostteleportlocs = list()
/area/awaymission
name = "\improper Strange Location"
icon_state = "away"
report_alerts = 0
report_alerts = FALSE
/area/awaymission/example
name = "\improper Strange Station"
@@ -2160,7 +2160,7 @@ var/list/ghostteleportlocs = list()
/area/awaycontent
name = "space"
report_alerts = 0
report_alerts = FALSE
/area/awaycontent/a1
icon_state = "awaycontent1"
+8 -7
View File
@@ -19,9 +19,9 @@
var/eject = null
var/debug = 0
var/debug = FALSE
var/requires_power = TRUE
var/always_unpowered = 0 //this gets overriden to 1 for space in area/New()
var/always_unpowered = FALSE //this gets overriden to 1 for space in area/New()
var/power_equip = TRUE
var/power_light = TRUE
@@ -33,7 +33,7 @@
var/static_equip
var/static_light = FALSE
var/static_environ
var/has_gravity = TRUE
var/list/apc = list()
var/no_air = null
@@ -128,10 +128,11 @@
/area/proc/atmosalert(danger_level, var/alarm_source, var/force = FALSE)
if(danger_level == ATMOS_ALARM_NONE)
SSalarms.atmosphere_alarm.clearAlarm(src, alarm_source)
else
SSalarms.atmosphere_alarm.triggerAlarm(src, alarm_source, severity = danger_level)
if(report_alerts)
if(danger_level == ATMOS_ALARM_NONE)
SSalarms.atmosphere_alarm.clearAlarm(src, alarm_source)
else
SSalarms.atmosphere_alarm.triggerAlarm(src, alarm_source, severity = danger_level)
//Check all the alarms before lowering atmosalm. Raising is perfectly fine. If force = 1 we don't care.
for(var/obj/machinery/alarm/AA in src)
+1
View File
@@ -36,6 +36,7 @@
name = "Secret Base"
icon_state = "dk_yellow"
ambientsounds = list('sound/ambience/ambidanger.ogg', 'sound/ambience/ambidanger2.ogg')
report_alerts = FALSE
/area/ruin/unpowered/syndicate_lava_base/engineering
name = "Syndicate Lavaland Engineering"
@@ -3,7 +3,7 @@
/area/awaymission/academy
name = "\improper Academy Asteroids"
icon_state = "away"
report_alerts = 0
report_alerts = FALSE
/area/awaymission/academy/headmaster
name = "\improper Academy Fore Block"
@@ -3,7 +3,7 @@
/area/awaymission/centcomAway
name = "XCC-P5831"
icon_state = "away"
report_alerts = 0
report_alerts = FALSE
/area/awaymission/centcomAway/general
name = "XCC-P5831"