manual merge

code/game/machinery/telecomms/broadcasting.dm

@@ -144,30 +144,7 @@
 		// --- This following recording is intended for research and feedback in the use of department radio channels ---
 
 		var/blackbox_msg = "[AM] [AM.say_quote(message, spans)]"
-		if(istype(GLOB.blackbox))
-			switch(freq)
-				if(1459)
-					GLOB.blackbox.msg_common += blackbox_msg
-				if(1351)
-					GLOB.blackbox.msg_science += blackbox_msg
-				if(1353)
-					GLOB.blackbox.msg_command += blackbox_msg
-				if(1355)
-					GLOB.blackbox.msg_medical += blackbox_msg
-				if(1357)
-					GLOB.blackbox.msg_engineering += blackbox_msg
-				if(1359)
-					GLOB.blackbox.msg_security += blackbox_msg
-				if(1441)
-					GLOB.blackbox.msg_deathsquad += blackbox_msg
-				if(1213)
-					GLOB.blackbox.msg_syndicate += blackbox_msg
-				if(1349)
-					GLOB.blackbox.msg_service += blackbox_msg
-				if(1347)
-					GLOB.blackbox.msg_cargo += blackbox_msg
-				else
-					GLOB.blackbox.messages += blackbox_msg
+		SSblackbox.LogBroadcast(blackbox_msg, freq)
 
 	sleep(50)
 	if(!QDELETED(virt)) //It could happen to YOU

code/game/machinery/vending.dm

@@ -297,7 +297,7 @@
 			to_chat(user, "<span class='notice'>You [panel_open ? "open" : "close"] the maintenance panel.</span>")
 			cut_overlays()
 			if(panel_open)
-				add_overlay("[initial(icon_state)]-panel")
+				add_overlay("[initial(icon_state)]-panel")
 			playsound(src.loc, W.usesound, 50, 1)
 			updateUsrDialog()
 		else
@@ -528,7 +528,7 @@
 		if(icon_vend) //Show the vending animation if needed
 			flick(icon_vend,src)
 		new R.product_path(get_turf(src))
-		feedback_add_details("vending_machine_usage","[src.type]|[R.product_path]")
+		SSblackbox.add_details("vending_machine_usage","[src.type]|[R.product_path]")
 		vend_ready = 1
 		return