cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 06:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11361 from AffectedArc07/ss-alarms

Browse Source 
SSalarms
This commit is contained in:
Fox McCloud
2019-04-23 15:56:20 -04:00
committed by GitHub
parent 5619dba2f2 fa6ba7343f
commit 4431f2ef22
14 changed files with 60 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/area/areas.dm
+4 -4
View File
@@ -78,9 +78,9 @@
/area/proc/atmosalert(danger_level, var/alarm_source, var/force = FALSE)
if(danger_level == ATMOS_ALARM_NONE)
atmosphere_alarm.clearAlarm(src, alarm_source)
SSalarms.atmosphere_alarm.clearAlarm(src, alarm_source)
else
atmosphere_alarm.triggerAlarm(src, alarm_source, severity = danger_level)
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)
@@ -158,9 +158,9 @@
if(A.density)
A.lock()
burglar_alarm.triggerAlarm(src, trigger)
SSalarms.burglar_alarm.triggerAlarm(src, trigger)
spawn(600)
burglar_alarm.clearAlarm(src, trigger)
SSalarms.burglar_alarm.clearAlarm(src, trigger)
/area/proc/set_fire_alarm_effect()
fire = 1
code/game/machinery/camera/camera.dm
+2 -2
View File
@@ -295,10 +295,10 @@
to_chat(O, "The screen bursts into static.")
/obj/machinery/camera/proc/triggerCameraAlarm()
camera_alarm.triggerAlarm(loc, src)
SSalarms.camera_alarm.triggerAlarm(loc, src)
/obj/machinery/camera/proc/cancelCameraAlarm()
camera_alarm.clearAlarm(loc, src)
SSalarms.camera_alarm.clearAlarm(loc, src)
/obj/machinery/camera/proc/can_use()
if(!status)
code/game/machinery/camera/motion.dm
+2 -2
View File
@@ -45,7 +45,7 @@
if(!status || (stat & NOPOWER))
return 0
if(detectTime == -1)
motion_alarm.clearAlarm(loc, src)
SSalarms.motion_alarm.clearAlarm(loc, src)
detectTime = 0
return 1
@@ -53,7 +53,7 @@
if(!status || (stat & NOPOWER))
return 0
if(!detectTime) return 0
motion_alarm.triggerAlarm(loc, src)
SSalarms.motion_alarm.triggerAlarm(loc, src)
detectTime = -1
return 1
code/game/machinery/computer/atmos_alert.dm
+7 -7
View File
@@ -12,10 +12,10 @@ var/global/list/minor_air_alarms = list()
/obj/machinery/computer/atmos_alert/New()
..()
atmosphere_alarm.register(src, /obj/machinery/computer/station_alert/update_icon)
SSalarms.atmosphere_alarm.register(src, /obj/machinery/computer/station_alert/update_icon)
/obj/machinery/computer/atmos_alert/Destroy()
atmosphere_alarm.unregister(src)
SSalarms.atmosphere_alarm.unregister(src)
return ..()
/obj/machinery/computer/atmos_alert/attack_hand(mob/user)
@@ -33,10 +33,10 @@ var/global/list/minor_air_alarms = list()
var/major_alarms[0]
var/minor_alarms[0]
for(var/datum/alarm/alarm in atmosphere_alarm.major_alarms())
for(var/datum/alarm/alarm in SSalarms.atmosphere_alarm.major_alarms())
major_alarms[++major_alarms.len] = list("name" = sanitize(alarm.alarm_name()), "ref" = "\ref[alarm]")
for(var/datum/alarm/alarm in atmosphere_alarm.minor_alarms())
for(var/datum/alarm/alarm in SSalarms.atmosphere_alarm.minor_alarms())
minor_alarms[++minor_alarms.len] = list("name" = sanitize(alarm.alarm_name()), "ref" = "\ref[alarm]")
data["priority_alarms"] = major_alarms
@@ -45,11 +45,11 @@ var/global/list/minor_air_alarms = list()
return data
/obj/machinery/computer/atmos_alert/update_icon()
var/list/alarms = atmosphere_alarm.major_alarms()
var/list/alarms = SSalarms.atmosphere_alarm.major_alarms()
if(alarms.len)
icon_screen = "alert:2"
else
alarms = atmosphere_alarm.minor_alarms()
alarms = SSalarms.atmosphere_alarm.minor_alarms()
if(alarms.len)
icon_screen = "alert:1"
else
@@ -61,7 +61,7 @@ var/global/list/minor_air_alarms = list()
return 1
if(href_list["clear_alarm"])
var/datum/alarm/alarm = locate(href_list["clear_alarm"]) in atmosphere_alarm.alarms
var/datum/alarm/alarm = locate(href_list["clear_alarm"]) in SSalarms.atmosphere_alarm.alarms
if(alarm)
for(var/datum/alarm_source/alarm_source in alarm.sources)
var/obj/machinery/alarm/air_alarm = alarm_source.source
code/game/machinery/firealarm.dm
+2 -2
View File
@@ -220,7 +220,7 @@ FIRE ALARM
var/area/A = get_area(src)
A.fire_reset()
for(var/obj/machinery/firealarm/FA in A)
fire_alarm.clearAlarm(loc, FA)
SSalarms.fire_alarm.clearAlarm(loc, FA)
return
/obj/machinery/firealarm/proc/alarm(var/duration = 0)
@@ -228,7 +228,7 @@ FIRE ALARM
return
var/area/A = get_area(src)
for(var/obj/machinery/firealarm/FA in A)
fire_alarm.triggerAlarm(loc, FA, duration)
SSalarms.fire_alarm.triggerAlarm(loc, FA, duration)
update_icon()
//playsound(loc, 'sound/ambience/signal.ogg', 75, 0)
return