diff --git a/code/modules/background/space_sectors/crescent_expanse.dm b/code/modules/background/space_sectors/crescent_expanse.dm index 06c63d3677f..7199145d90c 100644 --- a/code/modules/background/space_sectors/crescent_expanse.dm +++ b/code/modules/background/space_sectors/crescent_expanse.dm @@ -38,20 +38,11 @@ "95.8 Radio Masyara'Triq (Unlicensed)" = 'texts/lore_radio/crescent_expanse/95.8_CE-Unlicensed_Music_Station.txt' ) - lobby_tracks = list( - 'sound/music/lobby/crescent_expanse/crescent_expanse_1.ogg', - 'sound/music/lobby/crescent_expanse/crescent_expanse_2.ogg' - ) - /datum/space_sector/crescent_expanse/west name = SECTOR_CRESCENT_EXPANSE_WEST lore_radio_stations = list( "95.8 Radio Masyara'Triq (Unlicensed)" = 'texts/lore_radio/crescent_expanse/95.8_CE-Unlicensed_Music_Station.txt' ) - lobby_tracks = list( - 'sound/music/lobby/crescent_expanse/crescent_expanse_1.ogg', - 'sound/music/lobby/crescent_expanse/crescent_expanse_2.ogg' - ) /datum/space_sector/crescent_expanse/far name = SECTOR_CRESCENT_EXPANSE_FAR @@ -81,7 +72,6 @@ "95.8 Radio Masyara'Triq (Unlicensed)" = 'texts/lore_radio/crescent_expanse/95.8_CE-Unlicensed_Music_Station.txt' ) lobby_tracks = list( - 'sound/music/lobby/crescent_expanse/crescent_expanse_1.ogg', 'sound/music/lobby/dangerous_space/dangerous_space_1.ogg', 'sound/music/lobby/dangerous_space/dangerous_space_2.ogg' ) diff --git a/code/modules/client/preference_setup/loadout/items/utility.dm b/code/modules/client/preference_setup/loadout/items/utility.dm index b5d870dcc9e..8990974003d 100644 --- a/code/modules/client/preference_setup/loadout/items/utility.dm +++ b/code/modules/client/preference_setup/loadout/items/utility.dm @@ -206,7 +206,8 @@ music_cartridges["Konyang Vibes 2463"] = /obj/item/music_cartridge/konyang_retrowave music_cartridges["Top of the Charts 66 (Venusian Hits)"] = /obj/item/music_cartridge/venus_funkydisco music_cartridges["SCC Welcome Package"] = /obj/item/music_cartridge/audioconsole - music_cartridges["Spacer Classics Vol. 1"] = /obj/item/music_cartridge/ + music_cartridges["Spacer Classics Vol. 1"] = /obj/item/music_cartridge/ss13 music_cartridges["Indulgence EP (X-Rock)"] = /obj/item/music_cartridge/xanu_rock music_cartridges["Electro-Swing of Adhomai"] = /obj/item/music_cartridge/adhomai_swing + music_cartridges["Europa: Best of the 50s"] = /obj/item/music_cartridge/europa_various gear_tweaks += new /datum/gear_tweak/path(music_cartridges) diff --git a/code/modules/clothing/ears/earphones.dm b/code/modules/clothing/ears/earphones.dm index a1c9be58907..37b5afad5d7 100644 --- a/code/modules/clothing/ears/earphones.dm +++ b/code/modules/clothing/ears/earphones.dm @@ -435,3 +435,18 @@ Earphone Variants new/datum/track("Le Swing", 'sound/music/phonograph/le_swing.ogg'), new/datum/track("Posin", 'sound/music/phonograph/posin.ogg') ) + +/obj/item/music_cartridge/europa_various + name = "Europa: Best of the 50s" + desc = "A music cartridge storing the best tracks to listen to on a submarine dive." + icon_state = "generic" + + tracks = list( + new/datum/track("Where The Rays Leap", 'sound/music/regional/europa/where_the_dusks_rays_leap.ogg'), + new/datum/track("Casting Faint Shadows", 'sound/music/regional/europa/casting_faint_shadows.ogg'), + new/datum/track("Weedance", 'sound/music/regional/europa/weedance.ogg'), + new/datum/track("Instrumental Park", 'sound/music/regional/europa/instrumental_park.ogg'), + new/datum/track("Way Between The Shadows", 'sound/music/regional/europa/way_between_the_shadows.ogg'), + new/datum/track("Deep Beneath the Solemn Waves a Vast Underwater Landscape, Brimming With Bizarre, Eerily Gleaming Cyclopean Structures of, What Must Surely Be, Non-Human Origin, Stretched Out Across the Ocean Floor", 'sound/music/regional/europa/deep_beneath-.ogg'), + ) + diff --git a/html/changelogs/kermit-music-sorting-tweaks-fixes.yml b/html/changelogs/kermit-music-sorting-tweaks-fixes.yml new file mode 100644 index 00000000000..3f5b8d416ed --- /dev/null +++ b/html/changelogs/kermit-music-sorting-tweaks-fixes.yml @@ -0,0 +1,8 @@ +author: kermit + +delete-after: True + +changes: + - rscadd: "Adds a Europa music cartridge and tracks to go with it." + - bugfix: "Fixes the 'Spacer Classics' music cartridge loadout selection not working." + - qol: "Reduces volume of most recently added music tracks." diff --git a/sound/attributions.txt b/sound/attributions.txt index 871d69fb10d..2c5f8534476 100644 --- a/sound/attributions.txt +++ b/sound/attributions.txt @@ -156,12 +156,18 @@ sound/music/regional/xanu/xanu_rock_3.ogg - "Shimmer" by Swara Sutra, licensed u ATTRIBUTIONS SECTION END ATTRIBUTIONS SECTOR START -sound/music/lobby/crescent_expanse/crescent_expanse_1.ogg - "Lüüü - Weedance" by Lüüü, licensed under CC BY-NC-SA 3.0. Obtained from https://myprivateunderground.bandcamp.com/track/lu-u-u-weedance -sound/music/lobby/crescent_expanse/crescent_expanse_2.ogg - "Little Bradley - Sunset Drive" by Little Bradley, licensed under CC BY-NC 3.0. Obtained from https://myprivateunderground.bandcamp.com/track/little-bradley-sunset-drive sound/music/lobby/lights_edge/lights_edge_1.ogg - "Is Anyone Left?" by Karl Casey, licensed under CC BY 3.0. Obtained from https://karlcasey.bandcamp.com/track/is-anyone-left sound/music/lobby/lights_edge/lights_edge_2.ogg - "Running From The Wendigo" by Karl Casey, licensed under CC BY 3.0. Obtained from https://karlcasey.bandcamp.com/track/running-from-the-wendigo sound/music/lobby/dangerous_space/dangerous_space_1.ogg - "You Can't Kill The Boogeyman" by Karl Casey, licensed under CC BY 3.0. Obtained From https://karlcasey.bandcamp.com/track/you-can-t-kill-the-boogeyman sound/music/lobby/dangerous_space/dangerous_space_2.ogg - "Prison Planet" by Karl Casey, licensed under CC BY 3.0. Obtained from https://karlcasey.bandcamp.com/track/prison-planet + +ATTRIBUTIONS SECTOR START +sound/music/regional/europa/weedance.ogg - "Lüüü - Weedance" by Lüüü, licensed under CC BY-NC-SA 3.0. Obtained from https://myprivateunderground.bandcamp.com/track/lu-u-u-weedance +sound/music/regional/europa/casting_faint_shadows.ogg - "casting faint shadows" by Ikaiora (https://ikaiora.bandcamp.com/track/casting-faint-shadows-2) - CC BY-NC-ND 3.0 +sound/music/regional/europa/where_the_dusks_rays_leap.ogg - "where the dusk's rays leap" by Ikaiora (https://ikaiora.bandcamp.com/track/where-the-dusks-rays-leap) - CC BY-NC-ND 3.0 +sound/music/regional/europa/deep_beneath-.ogg - "Deep Beneath the Solemn Waves a Vast Underwater Landscape, Brimming With Bizarre, Eerily Gleaming Cyclopean Structures of, What Must Surely Be, Non​​​​-​​​​Human Origin, Stretched Out Across the Ocean Floor" by Unknown Oceanographer/Under Jorden (https://under-jorden.bandcamp.com/album/deep-beneath-the-solemn-waves-a-vast-underwater-landscape-brimming-with-bizarre-eerily-gleaming-cyclopean-structures-of-what-must-surely-be-non-human-origin-stretched-out-across-the-ocean-floor) - CC BY-NC-ND 3.0 +sound/music/regional/europa/instrument_park.ogg - "Instrument Park" by Little Bradley (https://myprivateunderground.bandcamp.com/track/little-bradley-instrumental-park) - CC BY-NC 3.0 +sound/music/regional/europa/way_between_the_shadows.ogg -"Way Between The Shadows" by Mokusei No Maguro (https://mokuseinomaguro.bandcamp.com/track/way-between-the-shadows) - CC BY-SA 3.0 ATTRIBUTIONS SECTION END ATTRIBUTIONS SECTION START diff --git a/sound/music/lobby/crescent_expanse/crescent_expanse_2.ogg b/sound/music/lobby/crescent_expanse/crescent_expanse_2.ogg deleted file mode 100644 index 799670bfb5d..00000000000 Binary files a/sound/music/lobby/crescent_expanse/crescent_expanse_2.ogg and /dev/null differ diff --git a/sound/music/lobby/dangerous_space/dangerous_space_1.ogg b/sound/music/lobby/dangerous_space/dangerous_space_1.ogg index a413f063075..a8c5254ae26 100644 Binary files a/sound/music/lobby/dangerous_space/dangerous_space_1.ogg and b/sound/music/lobby/dangerous_space/dangerous_space_1.ogg differ diff --git a/sound/music/lobby/dangerous_space/dangerous_space_2.ogg b/sound/music/lobby/dangerous_space/dangerous_space_2.ogg index 1a7771091c0..3090f85fff4 100644 Binary files a/sound/music/lobby/dangerous_space/dangerous_space_2.ogg and b/sound/music/lobby/dangerous_space/dangerous_space_2.ogg differ diff --git a/sound/music/regional/europa/casting_faint_shadows.ogg b/sound/music/regional/europa/casting_faint_shadows.ogg new file mode 100644 index 00000000000..4e64d15b09f Binary files /dev/null and b/sound/music/regional/europa/casting_faint_shadows.ogg differ diff --git a/sound/music/regional/europa/deep_beneath-.ogg b/sound/music/regional/europa/deep_beneath-.ogg new file mode 100644 index 00000000000..23381e1828c Binary files /dev/null and b/sound/music/regional/europa/deep_beneath-.ogg differ diff --git a/sound/music/regional/europa/instrumental_park.ogg b/sound/music/regional/europa/instrumental_park.ogg new file mode 100644 index 00000000000..25f2552ef37 Binary files /dev/null and b/sound/music/regional/europa/instrumental_park.ogg differ diff --git a/sound/music/regional/europa/way_between_the_shadows.ogg b/sound/music/regional/europa/way_between_the_shadows.ogg new file mode 100644 index 00000000000..650ee0d1346 Binary files /dev/null and b/sound/music/regional/europa/way_between_the_shadows.ogg differ diff --git a/sound/music/lobby/crescent_expanse/crescent_expanse_1.ogg b/sound/music/regional/europa/weedance.ogg similarity index 100% rename from sound/music/lobby/crescent_expanse/crescent_expanse_1.ogg rename to sound/music/regional/europa/weedance.ogg diff --git a/sound/music/regional/europa/where_the_dusks_rays_leap.ogg b/sound/music/regional/europa/where_the_dusks_rays_leap.ogg new file mode 100644 index 00000000000..10f4335e4a7 Binary files /dev/null and b/sound/music/regional/europa/where_the_dusks_rays_leap.ogg differ diff --git a/sound/music/regional/venus/all_night.ogg b/sound/music/regional/venus/all_night.ogg index ed71ab30dcb..adb4810fb96 100644 Binary files a/sound/music/regional/venus/all_night.ogg and b/sound/music/regional/venus/all_night.ogg differ diff --git a/sound/music/regional/venus/artificially_sweetened.ogg b/sound/music/regional/venus/artificially_sweetened.ogg index 326f7a46f65..5b414187f2e 100644 Binary files a/sound/music/regional/venus/artificially_sweetened.ogg and b/sound/music/regional/venus/artificially_sweetened.ogg differ diff --git a/sound/music/regional/venus/billy_ocean.ogg b/sound/music/regional/venus/billy_ocean.ogg index 377a9b4dbba..38f692e3113 100644 Binary files a/sound/music/regional/venus/billy_ocean.ogg and b/sound/music/regional/venus/billy_ocean.ogg differ diff --git a/sound/music/regional/venus/break_the_system.ogg b/sound/music/regional/venus/break_the_system.ogg index 16e2dbc7bc3..88a1185afd2 100644 Binary files a/sound/music/regional/venus/break_the_system.ogg and b/sound/music/regional/venus/break_the_system.ogg differ diff --git a/sound/music/regional/venus/dance.ogg b/sound/music/regional/venus/dance.ogg index 30f865094f9..d2fb84b3acf 100644 Binary files a/sound/music/regional/venus/dance.ogg and b/sound/music/regional/venus/dance.ogg differ diff --git a/sound/music/regional/venus/funky_girl.ogg b/sound/music/regional/venus/funky_girl.ogg index 730b156c6ce..af7cfe902e3 100644 Binary files a/sound/music/regional/venus/funky_girl.ogg and b/sound/music/regional/venus/funky_girl.ogg differ diff --git a/sound/music/regional/venus/love_sensation.ogg b/sound/music/regional/venus/love_sensation.ogg index 4eaa90669c3..775edc47a24 100644 Binary files a/sound/music/regional/venus/love_sensation.ogg and b/sound/music/regional/venus/love_sensation.ogg differ diff --git a/sound/music/regional/venus/real_love.ogg b/sound/music/regional/venus/real_love.ogg index 55e901e9d4b..233c6327a80 100644 Binary files a/sound/music/regional/venus/real_love.ogg and b/sound/music/regional/venus/real_love.ogg differ diff --git a/sound/music/regional/xanu/xanu_rock_1.ogg b/sound/music/regional/xanu/xanu_rock_1.ogg index ae29bb8ea1d..720446e310a 100644 Binary files a/sound/music/regional/xanu/xanu_rock_1.ogg and b/sound/music/regional/xanu/xanu_rock_1.ogg differ diff --git a/sound/music/regional/xanu/xanu_rock_2.ogg b/sound/music/regional/xanu/xanu_rock_2.ogg index a2286668eed..2987dae2c05 100644 Binary files a/sound/music/regional/xanu/xanu_rock_2.ogg and b/sound/music/regional/xanu/xanu_rock_2.ogg differ diff --git a/sound/music/regional/xanu/xanu_rock_3.ogg b/sound/music/regional/xanu/xanu_rock_3.ogg index d95ba707ae0..e18d4fa8436 100644 Binary files a/sound/music/regional/xanu/xanu_rock_3.ogg and b/sound/music/regional/xanu/xanu_rock_3.ogg differ