Merge upstream

code/modules/client/preferences.dm

@@ -1181,10 +1181,10 @@ var/list/preferences_datums = list()
 
 				if("lobby_music")
 					toggles ^= SOUND_LOBBY
-					if(toggles & SOUND_LOBBY)
-						user << sound(SSticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1)
+					if((toggles & SOUND_LOBBY) && user.client)
+						user.client.playtitlemusic()
 					else
-						user.stopLobbySound()
+						user.stop_sound_channel(CHANNEL_LOBBYMUSIC)
 
 				if("ghost_ears")
 					chat_toggles ^= CHAT_GHOSTEARS

code/modules/client/preferences_toggles.dm

@@ -147,8 +147,7 @@
 			playtitlemusic()
 	else
 		to_chat(src, "You will no longer hear music in the game lobby.")
-		if(isnewplayer(mob))
-			mob.stopLobbySound()
+		mob.stop_sound_channel(CHANNEL_LOBBYMUSIC)
 	feedback_add_details("admin_verb","TLobby") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/verb/togglemidis()