Hopefully cut down on ressource size and speed up loading

code/game/gamemodes/gameticker.dm

@@ -16,7 +16,6 @@ var/global/datum/controller/gameticker/ticker
 	var/event_time = null
 	var/event = 0
 
-	var/login_music			// music played in pregame lobby
 
 	var/list/datum/mind/minds = list()//The people in the game. Used for objective tracking.
 
@@ -39,14 +38,6 @@ var/global/datum/controller/gameticker/ticker
 	var/initialtpass = 0 //holder for inital autotransfer vote timer
 
 /datum/controller/gameticker/proc/pregame()
-	login_music = pick(\
-	'sound/music/therock.ogg',\
-	'sound/music/klendathu.ogg',\
-	'sound/music/knights.ogg',\
-	'sound/music/space.ogg',\
-	'sound/music/Title1.ogg',\
-	'sound/music/Title2.ogg',\
-	'sound/music/space_oddity.ogg') //Ground Control to Major Tom, this song is cool, what's going on?
 	do
 		pregame_timeleft = 180
 		world << "<B><FONT color='blue'>Welcome to the pre-game lobby!</FONT></B>"

code/game/sound.dm

@@ -53,11 +53,6 @@ var/const/SURROUND_CAP = 7
 
 	src << S
 
-/client/proc/playtitlemusic()
-	if(!ticker || !ticker.login_music)	return
-	if(prefs.sound & SOUND_LOBBY)
-		src << sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS
-
 /proc/get_rand_frequency()
 	return rand(32000, 55000) //Frequency stuff only works with 45kbps oggs.
 

code/modules/client/client procs.dm

@@ -329,10 +329,7 @@
 
 	send_resources()
 
-/*
-	if(prefs.lastchangelog != changelog_hash) //bolds the changelog button on the interface so we know there are updates.
-		winset(src, "rpane.changelog", "background-color=#eaeaea;font-style=bold")
-*/
+	nanomanager.send_resources(src)
 
 	//////////////
 	//DISCONNECT//

code/modules/client/preferences.dm

@@ -310,7 +310,6 @@ datum/preferences
 				dat += "-Color: <a href='?_src_=prefs;preference=UIcolor'><b>[UI_style_color]</b></a> <table style='display:inline;' bgcolor='[UI_style_color]'><tr><td>__</td></tr></table><br>"
 				dat += "-Alpha(transparence): <a href='?_src_=prefs;preference=UIalpha'><b>[UI_style_alpha]</b></a><br>"
 				dat += "<b>Play admin midis:</b> <a href='?_src_=prefs;preference=hear_midis'><b>[(sound & SOUND_MIDI) ? "Yes" : "No"]</b></a><br>"
-				dat += "<b>Play lobby music:</b> <a href='?_src_=prefs;preference=lobby_music'><b>[(sound & SOUND_LOBBY) ? "Yes" : "No"]</b></a><br>"
 				dat += "<b>Randomized Character Slot:</b> <a href='?_src_=prefs;preference=randomslot'><b>[randomslot ? "Yes" : "No"]</b></a><br>"
 				dat += "<b>Ghost ears:</b> <a href='?_src_=prefs;preference=ghost_ears'><b>[(toggles & CHAT_GHOSTEARS) ? "Nearest Creatures" : "All Speech"]</b></a><br>"
 				dat += "<b>Ghost sight:</b> <a href='?_src_=prefs;preference=ghost_sight'><b>[(toggles & CHAT_GHOSTSIGHT) ? "Nearest Creatures" : "All Emotes"]</b></a><br>"
@@ -1290,13 +1289,6 @@ datum/preferences
 					if("hear_midis")
 						sound ^= SOUND_MIDI
 
-					if("lobby_music")
-						sound ^= SOUND_LOBBY
-						if(sound & SOUND_LOBBY)
-							user << sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1)
-						else
-							user << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1)
-
 					if("ghost_ears")
 						toggles ^= CHAT_GHOSTEARS
 

code/modules/client/preferences_toggles.dm

@@ -68,32 +68,6 @@
 	src << "You will [(prefs.toggles & CHAT_PRAYER) ? "now" : "no longer"] see prayerchat."
 	feedback_add_details("admin_verb","TP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-/client/verb/toggletitlemusic()
-	set name = "Hear/Silence LobbyMusic"
-	set category = "Preferences"
-	set desc = "Toggles hearing the GameLobby music"
-	prefs.sound ^= SOUND_LOBBY
-	prefs.save_preferences(src)
-	if(prefs.sound & SOUND_LOBBY)
-		src << "You will now hear music in the game lobby."
-		if(istype(mob, /mob/new_player))
-			playtitlemusic()
-	else
-		src << "You will no longer hear music in the game lobby."
-		if(istype(mob, /mob/new_player))
-			src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // stop the jamsz
-	feedback_add_details("admin_verb","TLobby") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/*
-/client/verb/togglevoices()
-	set name = "Toggle player voices"
-	set category = "Preferences"
-	set desc = "Toggle hearing player voice sounds"
-	prefs.sound ^= SOUND_VOICES
-	prefs.save_preferences()
-	src << "You will [(prefs.sound & SOUND_VOICES) ? "now" : "no longer"] hear voices of players around you, or your own voice."
-	feedback_add_details("admin_verb","TVoice") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-*/
 
 /client/verb/togglemidis()
 	set name = "Hear/Silence Midis"

code/modules/media/jukebox.dm

@@ -322,3 +322,11 @@ var/global/loopModeNames=list(
 	)
 	invisibility=101 // FAK U NO SONG 4 U
 
+/obj/machinery/media/jukebox/lobby
+	playlist_id="lobby"
+	// Must be defined on your server.
+	playlists=list(
+		"lobby" = "Lobby Mix"
+	)
+	invisibility=101
+	autoplay = 1

code/modules/mob/new_player/login.dm

@@ -29,6 +29,4 @@
 	new_player_panel()
 	spawn(40)
 		if(client)
-			nanomanager.send_resources(client)
 			handle_privacy_poll()
-			client.playtitlemusic()

code/setup.dm

@@ -687,7 +687,7 @@ var/list/TAGGERLOCATIONS = list("Disposals",
 #define SOUND_ADMINHELP	1
 #define SOUND_MIDI		2
 #define SOUND_AMBIENCE	4
-#define SOUND_LOBBY		8
+#define SOUND_LOBBY		8 //Removed, can be replaced with any other sound bitflag as needed.
 #define SOUND_STREAMING	16
 
 #define SOUND_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|SOUND_STREAMING)