From 6eb4dbc578fc82b7dca1243b5caada578b034892 Mon Sep 17 00:00:00 2001 From: Archie Date: Wed, 23 Jun 2021 02:36:27 -0300 Subject: [PATCH] LMAO YES WE CAN --- code/controllers/subsystem/jukeboxes.dm | 2 +- config/jukebox_music/README.txt | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/controllers/subsystem/jukeboxes.dm b/code/controllers/subsystem/jukeboxes.dm index d2777843..751dc801 100644 --- a/code/controllers/subsystem/jukeboxes.dm +++ b/code/controllers/subsystem/jukeboxes.dm @@ -72,7 +72,7 @@ SUBSYSTEM_DEF(jukeboxes) 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_beat = round(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++ diff --git a/config/jukebox_music/README.txt b/config/jukebox_music/README.txt index b984ccae..c87be071 100644 --- a/config/jukebox_music/README.txt +++ b/config/jukebox_music/README.txt @@ -12,6 +12,4 @@ Every sound you add must have a unique name. Avoid using the plus sign "+" and t Sound names must be in the format of [song name]+[length in seconds]+[beats per minute].ogg -A three minute song title "SS13" that lasted 3 minutes and had a BPM value of 120 would need the file name SS13+180+120.ogg - -A final note: BPM divided by 6 must NEVER result in a decimal value. If a song has a BPM that results in a decimal when divided by 6, it will outright not work. \ No newline at end of file +A three minute song title "SS13" that lasted 3 minutes and had a BPM value of 120 would need the file name SS13+180+120.ogg \ No newline at end of file