diff --git a/code/controllers/subsystem/jukeboxes.dm b/code/controllers/subsystem/jukeboxes.dm index 5f360758..35754799 100644 --- a/code/controllers/subsystem/jukeboxes.dm +++ b/code/controllers/subsystem/jukeboxes.dm @@ -65,7 +65,6 @@ SUBSYSTEM_DEF(jukeboxes) /datum/controller/subsystem/jukeboxes/Initialize() var/list/tracks = flist("config/jukebox_music/sounds/") - var/list/fallbacktracks = flist("config/jukebox_music/fallback/") var/songID = 1 for(var/S in tracks) // Tracks that will not be in the repo, aka, localhost tracks. var/datum/track/T = new() @@ -77,16 +76,6 @@ SUBSYSTEM_DEF(jukeboxes) T.song_associated_id = songID songs |= T songID++ - for(var/S in fallbacktracks) // Tracks that will always be in the repo. - var/datum/track/T = new() - T.song_path = file("config/jukebox_music/fallback/[S]") - var/list/L = splittext(S,"+") - T.song_name = L[1] - T.song_length = text2num(L[2])*10 //We multiply it by ten because the system requires it in deciseconds - T.song_beat = (text2num(L[3])/6) //We divide it by six because it requires the Beats per seconds value, but in deciseconds. (Result/60) * 10) - T.song_associated_id = songID - songs |= T - songID++ for(var/i in CHANNEL_JUKEBOX_START to CHANNEL_JUKEBOX) freejukeboxchannels |= i return ..() diff --git a/config/jukebox_music/fallback/Goodbye_Moonmen+192+120.ogg b/config/jukebox_music/fallback/Goodbye_Moonmen+192+120.ogg deleted file mode 100644 index ec6665d3..00000000 Binary files a/config/jukebox_music/fallback/Goodbye_Moonmen+192+120.ogg and /dev/null differ