From 71ec0b26c28ba42e6395d83b5e962c4522dcdb23 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Sat, 19 Aug 2017 21:37:14 -0400 Subject: [PATCH] Quieter title music is now played when the round ends --- code/controllers/subsystem/ticker.dm | 3 +++ code/game/sound.dm | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 7af1ad20c9c..ab591dc84df 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -465,6 +465,9 @@ SUBSYSTEM_DEF(ticker) to_chat(world, "


The round has ended.") + for(var/client/C in GLOB.clients) + C.playtitlemusic(40) + //Player status report for(var/mob/Player in GLOB.mob_list) if(Player.mind && !isnewplayer(Player)) diff --git a/code/game/sound.dm b/code/game/sound.dm index 5303e01e4dd..ae74fca171e 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -96,11 +96,11 @@ /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) 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.