Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fire alarms now eventually stop blaring #28518

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

ExusA
Copy link
Contributor

@ExusA ExusA commented Feb 23, 2025

What Does This PR Do

This makes fire alarms stop the racket after 4 minutes.
They still do all the other fire alarm stuff after that, just not the noise.

Why It's Good For The Game

The sound is really grating and carries across half the station, and the immersive effect wears thin a bit after hearing it for ages when atmos hazards haven't been repaired. It's good for a bit, but after a while of being on it's just a nuisance to anyone in a huge radius, who has to hear it or mess with their volume until engi fixes whatever caused the alarm.

I think 4 minutes is a good amount of time to alert everyone and get engi called, without being too painfully long, but I can change it if need be.

Also, the silence is nice and thematic when things have really gone to hell on the station after a plasmaflood or huge explosion.
Between this and #28517, hopefully we can get an eerily quiet, dark environment when the station is falling apart.

Testing

Turned on an alarm, waited for it to stop making sounds.
Turned it off and on again quickly to make sure it kept making sounds again the second time and didn't get interrupted for the full cooldown.


Declaration

  • I confirm that I either do not require pre-approval for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.

Changelog

🆑
tweak: Fire alarms eventually stop making noise
/:cl:

@ExusA ExusA marked this pull request as ready for review February 23, 2025 20:22
@ParadiseSS13-Bot ParadiseSS13-Bot added the -Status: Awaiting approval This PR is waiting for approval internally label Feb 23, 2025
@@ -338,6 +340,8 @@
var/obj/machinery/firealarm/F = item
F.update_icon()
GLOB.firealarm_soundloop.start(F)
if(!firealarm_sound_stop_timer)
firealarm_sound_stop_timer = addtimer(CALLBACK(src, PROC_REF(stop_alarm_sounds)), 4 MINUTES, TIMER_STOPPABLE || TIMER_UNIQUE)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
firealarm_sound_stop_timer = addtimer(CALLBACK(src, PROC_REF(stop_alarm_sounds)), 4 MINUTES, TIMER_STOPPABLE || TIMER_UNIQUE)
firealarm_sound_stop_timer = addtimer(CALLBACK(src, PROC_REF(stop_alarm_sounds)), 4 MINUTES, TIMER_STOPPABLE | TIMER_UNIQUE)

Comment on lines +356 to +357
for(var/item in firealarms)
var/obj/machinery/firealarm/F = item
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
for(var/item in firealarms)
var/obj/machinery/firealarm/F = item
for(var/obj/machinery/firealarm/F in firealarms)

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
-Status: Awaiting approval This PR is waiting for approval internally
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants