Add fire alarm functionality to air alarms (#31970)

* Add fire alarm functionality to air alarms

* prettier
This commit is contained in:
Toastical
2026-05-17 11:56:53 +00:00
committed by GitHub
parent 8a370088c1
commit 87877363a3
4 changed files with 31 additions and 10 deletions
+11 -8
View File
@@ -341,10 +341,7 @@
if(!fire)
set_fire_alarm_effect()
ModifyFiredoors(FALSE)
for(var/item in firealarms)
var/obj/machinery/firealarm/F = item
F.update_icon()
GLOB.firealarm_soundloop.start(F)
start_alarm_sounds()
if(!firealarm_sound_stop_timer)
firealarm_sound_stop_timer = addtimer(CALLBACK(src, PROC_REF(stop_alarm_sounds)), 4 MINUTES, TIMER_STOPPABLE | TIMER_UNIQUE)
@@ -357,10 +354,19 @@
START_PROCESSING(SSobj, src)
/area/proc/start_alarm_sounds()
for(var/obj/machinery/firealarm/F in firealarms)
F.update_icon()
GLOB.firealarm_soundloop.start(F)
for(var/obj/machinery/alarm/A in air_alarms)
GLOB.firealarm_soundloop.start(A)
/area/proc/stop_alarm_sounds()
for(var/obj/machinery/firealarm/F in firealarms)
F.update_icon()
GLOB.firealarm_soundloop.stop(F)
for(var/obj/machinery/alarm/A in air_alarms)
GLOB.firealarm_soundloop.stop(A)
/**
* Reset the firealarm alert for this area
*
@@ -376,10 +382,7 @@
if(firealarm_sound_stop_timer)
deltimer(firealarm_sound_stop_timer)
firealarm_sound_stop_timer = null
for(var/item in firealarms)
var/obj/machinery/firealarm/F = item
F.update_icon()
GLOB.firealarm_soundloop.stop(F, TRUE)
stop_alarm_sounds()
for(var/thing in cameras)
var/obj/machinery/camera/C = locateUID(thing)