Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins

All hail glorious leader tigercat

code/modules/media/jukebox.dm

@@ -183,12 +183,12 @@ var/global/loopModeNames=list(
 		to_chat(usr, "\red You touch the bluescreened menu. Nothing happens. You feel dumber.")
 		return
 
-	if (href_list["power"])
+	if(href_list["power"])
 		playing=!playing
 		update_music()
 		update_icon()
 
-	if (href_list["playlist"])
+	if(href_list["playlist"])
 		if(!check_reload())
 			to_chat(usr, "\red You must wait 60 seconds between playlist reloads.")
 			return
@@ -199,12 +199,12 @@ var/global/loopModeNames=list(
 		update_music()
 		update_icon()
 
-	if (href_list["song"])
+	if(href_list["song"])
 		current_song=Clamp(text2num(href_list["song"]),1,playlist.len)
 		update_music()
 		update_icon()
 
-	if (href_list["mode"])
+	if(href_list["mode"])
 		loop_mode = (loop_mode % JUKEMODE_COUNT) + 1
 
 	return attack_hand(usr)

code/modules/media/mediamanager.dm

@@ -70,7 +70,7 @@ if(vlc.attachEvent) {
 			M.update_music()
 
 /mob/proc/update_music()
-	if (client && client.media)
+	if(client && client.media)
 		client.media.update_music()
 	//else
 	//	testing("[src] - client: [client?"Y":"N"]; client.media: [client && client.media ? "Y":"N"]")
@@ -124,7 +124,7 @@ to_chat(#define MP_DEBUG(x) owner, x)
 		var/targetURL = ""
 		var/targetStartTime = 0
 
-		if (!owner)
+		if(!owner)
 			//testing("owner is null")
 			return
 
@@ -141,7 +141,7 @@ to_chat(#define MP_DEBUG(x) owner, x)
 		//else
 		//	testing("M is not playing or null.")
 
-		if (url != targetURL || abs(targetStartTime - start_time) > 1)
+		if(url != targetURL || abs(targetStartTime - start_time) > 1)
 			url = targetURL
 			start_time = targetStartTime
 			send_update()