-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
ExusA
wants to merge
3
commits into
ParadiseSS13:master
Choose a base branch
from
ExusA:emergencyalarm
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 task
lewcc
requested changes
Feb 24, 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) |
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
Changelog
🆑
tweak: Fire alarms eventually stop making noise
/:cl: