From 045836192d22508f71f075675ea755c3556e2be9 Mon Sep 17 00:00:00 2001 From: Neocloudy <88008002+Neocloudy@users.noreply.github.com> Date: Thu, 13 Nov 2025 01:53:37 -0600 Subject: [PATCH] Ties security level looping sounds to ambience volume (#93877) --- code/controllers/subsystem/security_level.dm | 2 +- code/game/sound/sound.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystem/security_level.dm b/code/controllers/subsystem/security_level.dm index 11bb96b3d2d..2e48d593fae 100644 --- a/code/controllers/subsystem/security_level.dm +++ b/code/controllers/subsystem/security_level.dm @@ -20,7 +20,7 @@ SUBSYSTEM_DEF(security_level) if(!current_security_level.looping_sound) // No sound? No play. can_fire = FALSE return - sound_to_playing_players(current_security_level.looping_sound) + sound_to_playing_players(current_security_level.looping_sound, volume_preference = /datum/preference/numeric/volume/sound_ambience_volume) /** diff --git a/code/game/sound/sound.dm b/code/game/sound/sound.dm index d68c1794e08..06eecd94681 100644 --- a/code/game/sound/sound.dm +++ b/code/game/sound/sound.dm @@ -179,13 +179,13 @@ SEND_SOUND(src, sound_to_use) -/proc/sound_to_playing_players(soundin, volume = 100, vary = FALSE, frequency = 0, channel = 0, pressure_affected = FALSE, sound/S) +/proc/sound_to_playing_players(soundin, volume = 100, vary = FALSE, frequency = 0, channel = 0, pressure_affected = FALSE, sound/S, datum/preference/numeric/volume/volume_preference = null) if(!S) S = sound(get_sfx(soundin)) for(var/m in GLOB.player_list) if(ismob(m) && !isnewplayer(m)) var/mob/M = m - M.playsound_local(M, null, volume, vary, frequency, null, channel, pressure_affected, S) + M.playsound_local(M, null, volume, vary, frequency, null, channel, pressure_affected, S, volume_preference = volume_preference) /mob/proc/stop_sound_channel(chan) SEND_SOUND(src, sound(null, repeat = 0, wait = 0, channel = chan))