diff --git a/code/game/sound.dm.rej b/code/game/sound.dm.rej index 003c8b9975..007e3e17b5 100644 --- a/code/game/sound.dm.rej +++ b/code/game/sound.dm.rej @@ -1,9 +1,9 @@ diff a/code/game/sound.dm b/code/game/sound.dm (rejected hunks) -@@ -145,7 +145,3 @@ - if ("can_open") - soundin = pick('sound/effects/can_open1.ogg', 'sound/effects/can_open2.ogg', 'sound/effects/can_open3.ogg') - return soundin -- --/proc/playsound_global(file, repeat = 0, wait, channel, volume) -- for(var/V in GLOB.clients) -- V << sound(file, repeat, wait, channel, volume) +@@ -98,6 +98,7 @@ + SEND_SOUND(src, sound(null, repeat = 0, wait = 0, channel = chan)) + + /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))