diff --git a/code/game/sound.dm b/code/game/sound.dm index 86fdceb3c3..a7db2439b0 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -97,11 +97,12 @@ /mob/proc/stop_sound_channel(chan) SEND_SOUND(src, sound(null, repeat = 0, wait = 0, channel = chan)) -/client/proc/playtitlemusic() +/client/proc/playtitlemusic(vol = 85) + set waitfor = FALSE UNTIL(SSticker.login_music) //wait for SSticker init to set the login music if(prefs && (prefs.toggles & SOUND_LOBBY)) - SEND_SOUND(src, sound(SSticker.login_music, repeat = 0, wait = 0, volume = 85, channel = CHANNEL_LOBBYMUSIC) // MAD JAMS) + SEND_SOUND(src, sound(SSticker.login_music, repeat = 0, wait = 0, volume = vol, channel = CHANNEL_LOBBYMUSIC) // MAD JAMS) /proc/get_rand_frequency() return rand(32000, 55000) //Frequency stuff only works with 45kbps oggs.