Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adds music to cassettes #130

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

adds music to cassettes #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8503ad
adds music to cassettes
npukoJl Feb 16, 2025
b19902b
config no more
npukoJl Feb 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 62 additions & 63 deletions code/game/objects/items/devices/walkman.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,132 +358,131 @@
desc = "A plastic cassette tape with a blue sticker."
icon_state = "cassette_blue"
side1_icon = "cassette_blue"
songs = list("side1" = list("sound/music/walkman/pop1/1-1-1.ogg",\
"sound/music/walkman/pop1/1-1-2.ogg",\
"sound/music/walkman/pop1/1-1-3.ogg"),\
"side2" = list("sound/music/walkman/pop1/1-2-1.ogg",\
"sound/music/walkman/pop1/1-2-2.ogg",\
"sound/music/walkman/pop1/1-2-3.ogg"))
songs = list("side1" = list('config/music/walkman/pop1/1-1-1.ogg',\
'config/music/walkman/pop1/1-1-2.ogg',\
'config/music/walkman/pop1/1-1-3.ogg'),\
"side2" = list('config/music/walkman/pop1/1-2-1.ogg',\
'config/music/walkman/pop1/1-2-2.ogg',\
'config/music/walkman/pop1/1-2-3.ogg'))

/obj/item/device/cassette_tape/pop2
name = "rainbow cassette"
id = 3
desc = "A plastic cassette tape with a rainbow-colored sticker."
icon_state = "cassette_rainbow"
side1_icon = "cassette_rainbow"
songs = list("side1" = list("sound/music/walkman/pop2/2-1-1.ogg",\
"sound/music/walkman/pop2/2-1-2.ogg",\
"sound/music/walkman/pop2/2-1-3.ogg"),\
"side2" = list("sound/music/walkman/pop2/2-2-1.ogg",\
"sound/music/walkman/pop2/2-2-2.ogg",\
"sound/music/walkman/pop2/2-2-3.ogg"))
songs = list("side1" = list('config/music/walkman/pop2/2-1-1.ogg',\
'config/music/walkman/pop2/2-1-2.ogg',\
'config/music/walkman/pop2/2-1-3.ogg'),\
"side2" = list('config/music/walkman/pop2/2-2-1.ogg',\
'config/music/walkman/pop2/2-2-2.ogg',\
'config/music/walkman/pop2/2-2-3.ogg'))

/obj/item/device/cassette_tape/pop3
name = "orange cassette"
id = 4
desc = "A plastic cassette tape with an orange sticker."
icon_state = "cassette_orange"
side1_icon = "cassette_orange"
songs = list("side1" = list("sound/music/walkman/pop3/3-1-1.ogg",\
"sound/music/walkman/pop3/3-1-2.ogg",\
"sound/music/walkman/pop3/3-1-3.ogg"),\
"side2" = list("sound/music/walkman/pop3/3-2-1.ogg",\
"sound/music/walkman/pop3/3-2-2.ogg",\
"sound/music/walkman/pop3/3-2-3.ogg"))
songs = list("side1" = list('config/music/walkman/pop3/3-1-1.ogg',\
'config/music/walkman/pop3/3-1-2.ogg',\
'config/music/walkman/pop3/3-1-3.ogg'),\
"side2" = list('config/music/walkman/pop3/3-2-1.ogg',\
'config/music/walkman/pop3/3-2-2.ogg',\
'config/music/walkman/pop3/3-2-3.ogg'))

/obj/item/device/cassette_tape/pop4
name = "pink cassette"
id = 5
desc = "A plastic cassette tape with a pink striped sticker."
icon_state = "cassette_pink_stripe"
side1_icon = "cassette_pink_stripe"
songs = list("side1" = list("sound/music/walkman/pop4/4-1-1.ogg",\
"sound/music/walkman/pop4/4-1-2.ogg",\
"sound/music/walkman/pop4/4-1-3.ogg"),\
"side2" = list("sound/music/walkman/pop4/4-2-1.ogg",\
"sound/music/walkman/pop4/4-2-2.ogg",\
"sound/music/walkman/pop4/4-2-3.ogg"))
songs = list("side1" = list('config/music/walkman/pop4/4-1-1.ogg',\
'config/music/walkman/pop4/4-1-2.ogg',\
'config/music/walkman/pop4/4-1-3.ogg'),\
"side2" = list('config/music/walkman/pop4/4-2-1.ogg',\
'config/music/walkman/pop4/4-2-2.ogg',\
'config/music/walkman/pop4/4-2-3.ogg'))

/obj/item/device/cassette_tape/heavymetal
name = "red-black cassette"
id = 6
desc = "A plastic cassette tape with a red and black sticker."
icon_state = "cassette_red_black"
side1_icon = "cassette_red_black"
songs = list("side1" = list("sound/music/walkman/heavymetal/5-1-1.ogg",\
"sound/music/walkman/heavymetal/5-1-2.ogg",\
"sound/music/walkman/heavymetal/5-1-3.ogg"),\
"side2" = list("sound/music/walkman/heavymetal/5-2-1.ogg",\
"sound/music/walkman/heavymetal/5-2-2.ogg",\
"sound/music/walkman/heavymetal/5-2-3.ogg"))
songs = list("side1" = list('config/music/walkman/heavymetal/5-1-1.ogg',\
'config/music/walkman/heavymetal/5-1-2.ogg',\
'config/music/walkman/heavymetal/5-1-3.ogg'),\
"side2" = list('config/music/walkman/heavymetal/5-2-1.ogg',\
'config/music/walkman/heavymetal/5-2-2.ogg',\
'config/music/walkman/heavymetal/5-2-3.ogg'))

/obj/item/device/cassette_tape/hairmetal
name = "red striped cassette"
id = 7
desc = "A plastic cassette tape with a gray sticker with red stripes."
icon_state = "cassette_red_stripe"
side1_icon = "cassette_red_stripe"
songs = list("side1" = list("sound/music/walkman/hairmetal/6-1-1.ogg",\
"sound/music/walkman/hairmetal/6-1-2.ogg",\
"sound/music/walkman/hairmetal/6-1-3.ogg"),\
"side2" = list("sound/music/walkman/hairmetal/6-2-1.ogg",\
"sound/music/walkman/hairmetal/6-2-2.ogg",\
"sound/music/walkman/hairmetal/6-2-3.ogg"))
songs = list("side1" = list('config/music/walkman/hairmetal/6-1-1.ogg',\
'config/music/walkman/hairmetal/6-1-2.ogg',\
'config/music/walkman/hairmetal/6-1-3.ogg'),\
"side2" = list('config/music/walkman/hairmetal/6-2-1.ogg',\
'config/music/walkman/hairmetal/6-2-2.ogg',\
'config/music/walkman/hairmetal/6-2-3.ogg'))

/obj/item/device/cassette_tape/indie
name = "rising sun cassette"
id = 8
desc = "A plastic cassette tape with the Japanese Rising Sun."
icon_state = "cassette_rising_sun"
side1_icon = "cassette_rising_sun"
songs = list("side1" = list("sound/music/walkman/indie/7-1-1.ogg",\
"sound/music/walkman/indie/7-1-2.ogg",\
"sound/music/walkman/indie/7-1-3.ogg"),\
"side2" = list("sound/music/walkman/indie/7-2-1.ogg",\
"sound/music/walkman/indie/7-2-2.ogg",\
"sound/music/walkman/indie/7-2-3.ogg"))
songs = list("side1" = list('config/music/walkman/indie/7-1-1.ogg',\
'config/music/walkman/indie/7-1-2.ogg',\
'config/music/walkman/indie/7-1-3.ogg'),\
"side2" = list('config/music/walkman/indie/7-2-1.ogg',\
'config/music/walkman/indie/7-2-2.ogg',\
'config/music/walkman/indie/7-2-3.ogg'))

/obj/item/device/cassette_tape/hiphop
name = "blue stripe cassette"
id = 9
desc = "An orange plastic cassette tape with a blue stripe."
icon_state = "cassette_orange_blue"
side1_icon = "cassette_orange_blue"
songs = list("side1" = list("sound/music/walkman/hiphop/8-1-1.ogg",\
"sound/music/walkman/hiphop/8-1-2.ogg",\
"sound/music/walkman/hiphop/8-1-3.ogg"),\
"side2" = list("sound/music/walkman/hiphop/8-2-1.ogg",\
"sound/music/walkman/hiphop/8-2-2.ogg",\
"sound/music/walkman/hiphop/8-2-3.ogg"))
songs = list("side1" = list('config/music/walkman/hiphop/8-1-1.ogg',\
'config/music/walkman/hiphop/8-1-2.ogg',\
'config/music/walkman/hiphop/8-1-3.ogg'),\
"side2" = list('config/music/walkman/hiphop/8-2-1.ogg',\
'config/music/walkman/hiphop/8-2-2.ogg',\
'config/music/walkman/hiphop/8-2-3.ogg'))

/obj/item/device/cassette_tape/nam
name = "green cassette"
id = 10
desc = "A green plastic cassette tape."
icon_state = "cassette_green"
side1_icon = "cassette_green"
songs = list("side1" = list("sound/music/walkman/nam/9-1-1.ogg",\
"sound/music/walkman/nam/9-1-2.ogg",\
"sound/music/walkman/nam/9-1-3.ogg"),\
"side2" = list("sound/music/walkman/nam/9-2-1.ogg",\
"sound/music/walkman/nam/9-2-2.ogg",\
"sound/music/walkman/nam/9-2-3.ogg"))
songs = list("side1" = list('config/music/walkman/nam/9-1-1.ogg',\
'config/music/walkman/nam/9-1-2.ogg',\
'config/music/walkman/nam/9-1-3.ogg'),\
"side2" = list('config/music/walkman/nam/9-2-1.ogg',\
'config/music/walkman/nam/9-2-2.ogg',\
'config/music/walkman/nam/9-2-3.ogg'))

/obj/item/device/cassette_tape/ocean
name = "ocean cassette"
id = 11
desc = "A blue and white plastic cassette tape."
icon_state = "cassette_ocean"
side1_icon = "cassette_ocean"
songs = list("side1" = list("sound/music/walkman/surf/10-1-1.ogg",\
"sound/music/walkman/surf/10-1-2.ogg",\
"sound/music/walkman/surf/10-1-3.ogg",\
"sound/music/walkman/surf/10-1-4.ogg"),\
"side2" = list("sound/music/walkman/surf/10-2-1.ogg",\
"sound/music/walkman/surf/10-2-2.ogg",\
"sound/music/walkman/surf/10-2-3.ogg",\
"sound/music/walkman/surf/10-2-4.ogg"))

songs = list("side1" = list('config/music/walkman/surf/10-1-1.ogg',\
'config/music/walkman/surf/10-1-2.ogg',\
'config/music/walkman/surf/10-1-3.ogg',\
'config/music/walkman/surf/10-1-4.ogg'),\
"side2" = list('config/music/walkman/surf/10-2-1.ogg',\
'config/music/walkman/surf/10-2-2.ogg',\
'config/music/walkman/surf/10-2-3.ogg',\
'config/music/walkman/surf/10-2-4.ogg'))
// hotline reference
/obj/item/device/cassette_tape/aesthetic
name = "aesthetic cassette"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/decorators/cassette_decorator.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
var/list/cassette_data

/datum/decorator/cassette/is_active_decor()
cassette_data = file2list("sound/music/walkman/playlist.txt")
cassette_data = file2list("config/music/walkman/playlist.txt")
return length(cassette_data) > 0

/datum/decorator/cassette/get_decor_types()
Expand Down