Skip to content

Commit

Permalink
123
Browse files Browse the repository at this point in the history
  • Loading branch information
Kar4es committed Jan 15, 2024
1 parent 8ecf3be commit 6b84ac3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
Binary file added config/drum_music/test1+2400+4.ogg
Binary file not shown.
6 changes: 4 additions & 2 deletions modular_ss220/jukebox/code/jukebox.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
var/datum/track/selection = null
var/volume = 25
var/max_volume = 25
var/songs_path = "config/jukebox_music/sounds/"
COOLDOWN_DECLARE(jukebox_error_cd)

/obj/machinery/jukebox/anchored
Expand Down Expand Up @@ -55,11 +56,11 @@

/obj/machinery/jukebox/Initialize(mapload)
. = ..()
var/list/tracks = flist("config/jukebox_music/sounds/")
var/list/tracks = flist(songs_path)

for(var/S in tracks)
var/datum/track/T = new()
T.song_path = file("config/jukebox_music/sounds/[S]")
T.song_path = file(songs_path + S)
var/list/L = splittext(S,"+")
if(L.len != 3)
continue
Expand Down Expand Up @@ -551,6 +552,7 @@
desc = "Крутые барабаны от какой-то группы."
icon = 'modular_ss220/jukebox/icons/jukebox.dmi'
icon_state = "drum_red"
songs_path = "config/drum_music/"

/obj/machinery/jukebox/drum_red/update_icon_state()
if(stat & BROKEN)
Expand Down

0 comments on commit 6b84ac3

Please sign in to comment.