From d86060dcff4df89f45fa47b18c75c36349532c9c Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 14 Sep 2017 07:51:34 -0500 Subject: [PATCH] [MIRROR] Lobby music won't be the same as the last round (#2727) * Merge pull request #30636 from Cyberboss/NoDupeMusic Lobby music won't be the same as the last round * Lobby music won't be the same as the last round --- code/controllers/subsystem/ticker.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 04677f593f..dc75345965 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -69,6 +69,9 @@ SUBSYSTEM_DEF(ticker) /datum/controller/subsystem/ticker/Initialize(timeofday) load_mode() var/list/music = world.file2list(ROUND_START_MUSIC_LIST, "\n") + var/old_login_music = trim(file2text("data/last_round_lobby_music.txt")) + if(music.len > 1) + music -= old_login_music login_music = pick(music) if(!GLOB.syndicate_code_phrase) @@ -856,3 +859,4 @@ SUBSYSTEM_DEF(ticker) ) SEND_SOUND(world, sound(round_end_sound)) + text2file(login_music, "data/last_round_lobby_music.txt")