YOOOOO0U. YOU GOT WHAT AH NEEEEEEEED

Conflicts:
	code/__HELPERS/game.dm
	code/game/machinery/alarm.dm
	code/game/machinery/doors/firedoor.dm
	code/modules/client/preferences_toggles.dm
	code/setup.dm
	maps/tgstation.2.1.0.0.1.dmm

code/modules/client/preferences_toggles.dm

@@ -183,11 +183,21 @@
 			I.color = UI_style_color_new
 			I.alpha = UI_style_alpha_new
 
-
-
 	if(alert("Like it? Save changes?",,"Yes", "No") == "Yes")
 		prefs.UI_style = UI_style_new
 		prefs.UI_style_alpha = UI_style_alpha_new
 		prefs.UI_style_color = UI_style_color_new
 		prefs.save_preferences()
 		usr << "UI was saved"
+
+/client/verb/toggle_media()
+	set name = "Hear/Silence Streaming"
+	set category = "Preferences"
+	set desc = "Toggle hearing streaming media (radios, jukeboxes, etc)"
+
+	prefs.toggles ^= SOUND_STREAMING
+	prefs.save_preferences()
+	usr << "You will [(prefs.toggles & SOUND_STREAMING) ? "now" : "no longer"] hear streamed media."
+	// Restart.
+	media.stop_music()
+	media.update_music()

code/modules/media/jukebox.dm

@@ -9,6 +9,8 @@
 #define JUKEMODE_PLAY_ONCE   3 // Play, then stop.
 #define JUKEMODE_COUNT       3
 
+#define JUKEBOX_RELOAD_COOLDOWN 600 // 60s
+
 // Represents a record returned.
 /datum/song_info
 	var/title  = ""
@@ -43,30 +45,40 @@ var/global/loopModeNames=list(
 	anchored = 1
 	luminosity = 4 // Why was this 16
 
+	playing=0
+
 	var/loop_mode = JUKEMODE_SHUFFLE
 	// /datum/song_info
 	var/list/playlist
-	var/current_song=0
+	var/current_song  = 0
+	var/autoplay      = 0
+	var/last_reload   = 0
 
 /obj/machinery/media/jukebox/attack_ai()
 	return
 
 /obj/machinery/media/jukebox/attack_paw()
 	return
-
+/obj/machinery/media/jukebox/proc/check_reload()
+	return world.time > last_reload + JUKEBOX_RELOAD_COOLDOWN
 /obj/machinery/media/jukebox/attack_hand(var/mob/user)
 	var/t = "<h1>Jukebox Interface</h1>"
 	t += "<b>Power:</b> <a href='?src=\ref[src];power=1'>[playing?"On":"Off"]</a><br />"
 	t += "<b>Play Mode:</b> <a href='?src=\ref[src];loop=1'>[loopModeNames[loop_mode]]</a><br />"
-	if(current_song)
-		var/datum/song_info/song=playlist[current_song]
-		t += "<b>Current song:</b> [song.artist] - [song.title]<br />"
-	t += "<table class='prettytable'><tr><th colspan='2'>Artist - Title</th><th>Album</th></tr>"
-	var/i
-	for(i = 1,i <= playlist.len,i++)
-		var/datum/song_info/song=playlist[i]
-		t += "<tr><th>#[i]</th><td><A href='?src=\ref[src];song=[i]'>[song.artist] - [song.title]</A></td><td>[song.album]</td></tr>"
-	t += "</table>"
+	if(playlist == null)
+		t += "\[DOWNLOADING PLAYLIST, PLEASE WAIT\]"
+	else
+		if(current_song)
+			var/datum/song_info/song=playlist[current_song]
+			t += "<b>Current song:</b> [song.artist] - [song.title]<br />"
+		if(check_reload())
+			t += "\[<a href='?src=\ref[src];reload=1'>Reload Playlist</a>\]"
+		t += "<table class='prettytable'><tr><th colspan='2'>Artist - Title</th><th>Album</th></tr>"
+		var/i
+		for(i = 1,i <= playlist.len,i++)
+			var/datum/song_info/song=playlist[i]
+			t += "<tr><th>#[i]</th><td><A href='?src=\ref[src];song=[i]'>[song.artist] - [song.title]</A></td><td>[song.album]</td></tr>"
+		t += "</table>"
 	user.set_machine(src)
 	var/datum/browser/popup = new (user,"jukebox",name,420,700)
 	popup.set_content(t)
@@ -78,6 +90,16 @@ var/global/loopModeNames=list(
 	..()
 	if (href_list["power"])
 		playing=!playing
+		update_music()
+
+	if (href_list["reload"])
+		if(!check_reload())
+			usr << "\red You must wait 60 seconds between reloads."
+			return
+		last_reload=world.time
+		playlist=null
+		current_song=0
+		update_music()
 
 	if (href_list["song"])
 		current_song=Clamp(text2num(href_list["song"]),1,playlist.len)
@@ -91,6 +113,7 @@ var/global/loopModeNames=list(
 /obj/machinery/media/jukebox/process()
 	if(!playlist)
 		var/url="[config.media_base_url]/index.php"
+		testing("[src] - Updating playlist from [url]...")
 		var/response = world.Export(url)
 		playlist=list()
 		if(response)
@@ -101,7 +124,9 @@ var/global/loopModeNames=list(
 			var/songdata = reader.read_value()
 			for(var/list/record in songdata)
 				playlist += new /datum/song_info(record)
+			visible_message("<span class='notice'>\icon[src] \The [src] beeps, and the menu on its front fills with [playlist.len] items.</span>","<em>You hear a beep.</em>")
 		else
+			//testing("Failed to update playlist: Response null.")
 			stat &= BROKEN
 			update_icon()
 			return
@@ -119,13 +144,18 @@ var/global/loopModeNames=list(
 				if(JUKEMODE_PLAY_ONCE)
 					playing=0
 					return
-			if(!playing) return
+			if(!playing)
+				return
 			update_music()
 
 /obj/machinery/media/jukebox/update_music()
-	var/datum/song_info/song = playlist[current_song]
-	media_url = song.url
-	media_start_time = world.time
-	visible_message("<span class='notice'>\icon[src] \The [src] begins to play \"[song.title]\", by [song.artist].</notice>","<em>You hear music.</em>")
-	visible_message("<span class='notice'>\icon[src] \The [src] warbles: [song.length]ds, [song.url]</notice>")
+	if(current_song)
+		var/datum/song_info/song = playlist[current_song]
+		media_url = song.url
+		media_start_time = world.time
+		visible_message("<span class='notice'>\icon[src] \The [src] begins to play \"[song.title]\", by [song.artist].</span>","<em>You hear music.</em>")
+		//visible_message("<span class='notice'>\icon[src] \The [src] warbles: [song.length/10]s @ [song.url]</notice>")
+	else
+		media_url=""
+		media_start_time = 0
 	..()

code/modules/media/machinery.dm

@@ -4,12 +4,63 @@
 	var/media_url=""
 	var/media_start_time=0
 
+	var/area/master_area
+
 // Notify everyone in the area of new music.
 // YOU MUST SET MEDIA_URL AND MEDIA_START_TIME YOURSELF!
 /obj/machinery/media/proc/update_music()
-	var/area/A = get_area(src)
-	if(A.master)
-		A=A.master
-	for(var/mob/M in A)
+	update_media_source()
+
+	// Bail if we lost connection to master.
+	if(!master_area)
+		return
+
+	// Send update to clients.
+	for(var/mob/M in mobs_in_area(master_area))
 		if(M && M.client)
-			M.update_music()
+			M.update_music()
+
+/obj/machinery/media/proc/update_media_source()
+	var/area/A = get_area_master(src)
+
+	// Check if there's a media source already.
+	if(A.media_source && A.media_source!=src)
+		master_area=null
+		return
+
+	// Update Media Source.
+	if(!A.media_source)
+		A.media_source=src
+
+	master_area=A
+
+/obj/machinery/media/proc/disconnect_media_source()
+	var/area/A = get_area_master(src)
+
+	// Sanity
+	if(!A)
+		master_area=null
+		return
+
+	// Check if there's a media source already.
+	if(A && A.media_source && A.media_source!=src)
+		master_area=null
+		return
+
+	// Update Media Source.
+	A.media_source=null
+
+	// Clients
+	for(var/mob/M in mobs_in_area(A))
+		if(M && M.client)
+			M.update_music()
+
+	master_area=null
+
+/obj/machinery/media/New()
+	..()
+	update_media_source()
+
+/obj/machinery/media/Destroy()
+	disconnect_media_source()
+	..()

code/modules/media/mediamanager.dm

@@ -25,20 +25,24 @@ function SetMusic(url, time, volume) {
 /hook_handler/soundmanager
 	// Set up player on login
 	proc/OnLogin(var/list/args)
+		//testing("Received OnLogin.")
 		var/client/C = args["client"]
-		C.media = new /datum/media_manager(C)
+		C.media = new /datum/media_manager(args["mob"])
 		C.media.open()
+		C.media.update_music()
 
 	// Update when moving between areas.
 	proc/OnMobAreaChange(var/list/args)
+		//testing("Received OnMobAreaChange.")
 		var/mob/M = args["mob"]
 
 		M.update_music()
 
 /mob/proc/update_music()
-	if (client)
-		if(client.media)
-			client.media.update_music()
+	if (client && client.media)
+		client.media.update_music()
+	//else
+	//	testing("[src] - client: [client?"Y":"N"]; client.media: [client && client.media ? "Y":"N"]")
 
 /area
 	// One media source per area.
@@ -50,18 +54,31 @@ function SetMusic(url, time, volume) {
 	var/volume = 100
 
 	var/client/owner
+	var/mob/mob
+
+	var/const/window = "rpane.hosttracker"
+	//var/const/window = "mediaplayer" // For debugging.
 
 	New(var/mob/holder)
-		src.owner=holder
+		src.mob=holder
+		owner=src.mob.client
 
 	// Actually pop open the player in the background.
 	proc/open()
-		owner << browse(PLAYER_HTML, "window=rpane.hosttracker")
+		owner << browse(PLAYER_HTML, "window=[window]")
 		send_update()
 
 	// Tell the player to play something via JS.
 	proc/send_update()
-		owner << output(list2params(list(url, (world.timeofday - start_time) / 10, volume)), "rpane.hosttracker:SetMusic")
+		if(!(owner.prefs.toggles & SOUND_STREAMING))
+			return // Nope.
+		//testing("Sending update to WMP...")
+		owner << output(list2params(list(url, (world.time - start_time) / 10, volume)), "[window]:SetMusic")
+
+	proc/stop_music()
+		url=""
+		start_time=world.time
+		send_update()
 
 	// Scan for media sources and use them.
 	proc/update_music()
@@ -69,16 +86,25 @@ function SetMusic(url, time, volume) {
 		var/targetStartTime = 0
 		var/targetVolume = 100
 
-		if (owner)
-			var/area/A = get_area()
-			var/obj/machinery/media/M = A.media_source
-			if(M.playing)
-				targetURL = M.media_url
-				targetStartTime = M.media_start_time
+		if (!owner)
+			//testing("owner is null")
+			return
+
+		var/area/A = get_area_master(mob)
+		if(!A)
+			//testing("[owner] in [mob.loc].  Aborting.")
+			stop_music()
+			return
+		var/obj/machinery/media/M = A.media_source
+		if(M && M.playing)
+			targetURL = M.media_url
+			targetStartTime = M.media_start_time
+			//owner << "Found audio source: [M.media_url] @ [(world.time - start_time) / 10]s."
+		//else
+		//	testing("M is not playing or null.")
 
 		if (url != targetURL || abs(targetStartTime - start_time) > 1 || targetVolume != volume)
 			url = targetURL
 			start_time = targetStartTime
 			volume = targetVolume
-
 			send_update()

code/modules/power/lighting.dm

@@ -611,8 +611,7 @@
 // called when area power state changes
 /obj/machinery/light/power_change()
 	spawn(10)
-		var/area/A = src.loc.loc
-		A = A.master
+		var/area/A = get_area_master(src)
 		seton(A.lightswitch && A.power_light)
 
 // called when on fire