Adds custom Konyang lobby music. (#18478)

* Adds custom Konyang lobby music.

* fix the credits before the police kills my ass

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>

code/controllers/subsystems/ticker.dm

@@ -49,11 +49,11 @@ var/datum/controller/subsystem/ticker/SSticker
 	//Now we have a general cinematic centrally held within the gameticker....far more efficient!
 	var/obj/screen/cinematic = null
 
-	var/list/possible_lobby_tracks = list(
-		'sound/music/space.ogg',
-		'sound/music/traitor.ogg',
-		'sound/music/title2.ogg',
-		'sound/music/clouds.s3m'
+	var/list/default_lobby_tracks = list(
+		'sound/music/lobby/space.ogg',
+		'sound/music/lobby/traitor.ogg',
+		'sound/music/lobby/title2.ogg',
+		'sound/music/lobby/clouds.s3m'
 	)
 
 	var/lobby_ready = FALSE
@@ -417,8 +417,11 @@ var/datum/controller/subsystem/ticker/SSticker
 /datum/controller/subsystem/ticker/proc/pregame()
 	set waitfor = FALSE
 	sleep(1)	// Sleep so the MC has a chance to update its init time.
-	if (!login_music)
-		login_music = pick(possible_lobby_tracks)
+	if(!login_music)
+		if(SSatlas.current_sector && SSatlas.current_sector.lobby_tracks)
+			login_music = pick(SSatlas.current_sector.lobby_tracks)
+		else
+			login_music = pick(default_lobby_tracks)
 
 	if (is_revote)
 		pregame_timeleft = LOBBY_TIME

code/game/machinery/jukebox.dm

@@ -24,13 +24,13 @@
 	var/datum/track/current_track
 	var/list/datum/track/tracks = list(
 		new/datum/track("Beyond", 'sound/music/ambispace.ogg'),
-		new/datum/track("Clouds of Fire", 'sound/music/clouds.s3m'),
-		new/datum/track("D`Bert", 'sound/music/title2.ogg'),
+		new/datum/track("Clouds of Fire", 'sound/music/lobby/clouds.s3m'),
+		new/datum/track("D`Bert", 'sound/music/lobby/title2.ogg'),
 		new/datum/track("D`Fort", 'sound/music/song_game.ogg'),
 		new/datum/track("Floating", 'sound/music/main.ogg'),
-		new/datum/track("Endless Space", 'sound/music/space.ogg'),
+		new/datum/track("Endless Space", 'sound/music/lobby/space.ogg'),
 		new/datum/track("Scratch", 'sound/music/title1.ogg'),
-		new/datum/track("Suspenseful", 'sound/music/traitor.ogg'),
+		new/datum/track("Suspenseful", 'sound/music/lobby/traitor.ogg'),
 		new/datum/track("Thunderdome", 'sound/music/THUNDERDOME.ogg'),
 		new/datum/track("Velvet Rose", 'sound/music/velvet_rose.ogg')
 	)

code/modules/background/space_sectors/coalition/coalition.dm

@@ -73,6 +73,13 @@
 	sector_hud_menu = 'icons/misc/hudmenu/konyang_hud.dmi'
 	sector_hud_arrow = "menu_arrow"
 
+	lobby_tracks = list(
+		'sound/music/lobby/konyang/konyang-1.ogg',
+		'sound/music/lobby/konyang/konyang-2.ogg',
+		'sound/music/lobby/konyang/konyang-3.ogg',
+		'sound/music/lobby/konyang/konyang-4.ogg'
+	)
+
 	lore_radio_stations = list(
 		"73.2 Navy Broadcasting Service" = "config/lore_radio/konyang/73.2_Navy_Broadcasting_Service.txt",
 		"122 Great Blue Dot" = "config/lore_radio/konyang//122_Great_Blue_Dot.txt",

code/modules/background/space_sectors/space_sector.dm

@@ -27,6 +27,9 @@
 	var/sector_hud_menu_sound = null //if this is set, it will override the hud menu click sound
 	var/sector_hud_arrow = null //if this is set, it will use an overlay instead of the animation that makes the button bigger
 
+	/// Lobby music overrides.
+	var/list/lobby_tracks
+
 	//vars used by the meteor random event
 
 	var/list/meteors_minor = list(

html/changelogs/mattatlas-lobbytracks.yml

@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: MattAtlas (Code), TheLancer (Sound)
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Added a system to allow space sectors to override lobby music."
+  - rscdel: "Added Haneunim (Konyang) lobby music."

maps/aurora/code/aurora_holodeck.dm

@@ -40,15 +40,15 @@
 			)
 		),
 		"picnicarea" = new /datum/holodeck_program(/area/holodeck/source_picnicarea,
-			list('sound/music/title2.ogg')
+			list('sound/music/lobby/title2.ogg')
 		),
 		"dininghall" = new /datum/holodeck_program(/area/holodeck/source_dininghall,
-			list('sound/music/title2.ogg')
+			list('sound/music/lobby/title2.ogg')
 		),
 		"theatre" = new /datum/holodeck_program(/area/holodeck/source_theatre),
 		"meetinghall" = new /datum/holodeck_program(/area/holodeck/source_meetinghall),
 		"courtroom" = new /datum/holodeck_program(/area/holodeck/source_courtroom,
-			list('sound/music/traitor.ogg')
+			list('sound/music/lobby/traitor.ogg')
 		),
 		"burntest" = new /datum/holodeck_program(/area/holodeck/source_burntest, list()),
 		"wildlifecarp" = new /datum/holodeck_program(/area/holodeck/source_wildlife, list()),

maps/sccv_horizon/code/sccv_horizon_holodeck.dm

@@ -37,20 +37,20 @@
 			list(
 				'sound/music/ambispace.ogg',
 				'sound/music/main.ogg',
-				'sound/music/space.ogg',
-				'sound/music/traitor.ogg'
+				'sound/music/lobby/space.ogg',
+				'sound/music/lobby/traitor.ogg'
 			)
 		),
 		"picnicarea" = new /datum/holodeck_program(/area/horizon/holodeck/source_picnicarea,
-			list('sound/music/title2.ogg')
+			list('sound/music/lobby/title2.ogg')
 		),
 		"dininghall" = new /datum/holodeck_program(/area/horizon/holodeck/source_dininghall,
-			list('sound/music/title2.ogg')
+			list('sound/music/lobby/title2.ogg')
 		),
 		"theatre" = new /datum/holodeck_program(/area/horizon/holodeck/source_theatre),
 		"meetinghall" = new /datum/holodeck_program(/area/horizon/holodeck/source_meetinghall),
 		"courtroom" = new /datum/holodeck_program(/area/horizon/holodeck/source_courtroom,
-			list('sound/music/traitor.ogg')
+			list('sound/music/lobby/traitor.ogg')
 		),
 		"burntest" = new /datum/holodeck_program(/area/horizon/holodeck/source_burntest, list()),
 		"wildlifecarp" = new /datum/holodeck_program(/area/horizon/holodeck/source_wildlife, list()),

sound/attributions.txt

@@ -82,3 +82,10 @@ ATTRIBUTIONS SECTION START
 /sound/items/devices/minedetector/minedetector_medium.ogg - Part of "Detector", licensed under CC0. Obtained from https://freesound.org/people/fennelliott/sounds/426404/
 /sound/items/devices/minedetector/minedetector_far.ogg - Part of "Detector", licensed under CC0. Obtained from https://freesound.org/people/fennelliott/sounds/426404/
 ATTRIBUTIONS SECTION END
+
+ATTRIBUTIONS SECTOR START
+sound/music/lobby/konyang/konyang-1.ogg - PocketNoMoney
+sound/music/lobby/konyang/konyang-2.ogg - BGM gongbang
+sound/music/lobby/konyang/konyang-3.ogg - zolezzi
+sound/music/lobby/konyang/konyang-4.ogg - Karl Casey @ White Bat Audio
+ATTRIBUTIONS SECTION END

sound/serversound_list.txt

@@ -9,5 +9,5 @@ sound/music/space.ogg
 sound/music/thunderdome.ogg
 sound/music/title1.ogg
 sound/music/title2.ogg
-sound/music/traitor.ogg
-sound/music/velvet_rose.ogg
+sound/music/lobby/traitor.ogg
+sound/music/velvet_rose.ogg