Unorphans the blackbox

code/game/machinery/computer/arcade.dm

@@ -234,7 +234,7 @@
 			playsound(loc, 'sound/arcade/Win.ogg', 50, 1, extrarange = -3, falloff = 10)
 
 			if(emagged)
-				feedback_inc("arcade_win_emagged")
+				SSblackbox.inc("arcade_win_emagged")
 				new /obj/effect/spawner/newbomb/timer/syndicate(loc)
 				new /obj/item/clothing/head/collectable/petehat(loc)
 				message_admins("[key_name_admin(usr)] has outbombed Cuban Pete and been awarded a bomb.")
@@ -242,7 +242,7 @@
 				Reset()
 				emagged = 0
 			else
-				feedback_inc("arcade_win_normal")
+				SSblackbox.inc("arcade_win_normal")
 				prizevend()
 
 	else if (emagged && (turtle >= 4))
@@ -264,10 +264,10 @@
 			temp = "You have been drained! GAME OVER"
 			playsound(loc, 'sound/arcade/Lose.ogg', 50, 1, extrarange = -3, falloff = 10)
 			if(emagged)
-				feedback_inc("arcade_loss_mana_emagged")
+				SSblackbox.inc("arcade_loss_mana_emagged")
 				usr.gib()
 			else
-				feedback_inc("arcade_loss_mana_normal")
+				SSblackbox.inc("arcade_loss_mana_normal")
 
 	else if ((enemy_hp <= 10) && (enemy_mp > 4))
 		temp = "[enemy_name] heals for 4 health!"
@@ -286,10 +286,10 @@
 		temp = "You have been crushed! GAME OVER"
 		playsound(loc, 'sound/arcade/Lose.ogg', 50, 1, extrarange = -3, falloff = 10)
 		if(emagged)
-			feedback_inc("arcade_loss_hp_emagged")
+			SSblackbox.inc("arcade_loss_hp_emagged")
 			usr.gib()
 		else
-			feedback_inc("arcade_loss_hp_normal")
+			SSblackbox.inc("arcade_loss_hp_normal")
 
 	blocked = FALSE
 	return

code/game/machinery/computer/communications.dm

@@ -115,9 +115,9 @@
 						message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].")
 						switch(GLOB.security_level)
 							if(SEC_LEVEL_GREEN)
-								feedback_inc("alert_comms_green",1)
+								SSblackbox.inc("alert_comms_green",1)
 							if(SEC_LEVEL_BLUE)
-								feedback_inc("alert_comms_blue",1)
+								SSblackbox.inc("alert_comms_blue",1)
 					tmp_alertlevel = 0
 				else
 					to_chat(usr, "<span class='warning'>You are not authorized to do this!</span>")
@@ -176,7 +176,7 @@
 								SSshuttle.points -= S.credit_cost
 								minor_announce("[usr.name] has purchased [S.name] for [S.credit_cost] credits." , "Shuttle Purchase")
 								message_admins("[key_name_admin(usr)] purchased [S.name].")
-								feedback_add_details("shuttle_purchase", S.name)
+								SSblackbox.add_details("shuttle_purchase", S.name)
 							else
 								to_chat(usr, "Something went wrong! The shuttle exchange system seems to be down.")
 						else
@@ -368,9 +368,9 @@
 				message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].")
 				switch(GLOB.security_level)
 					if(SEC_LEVEL_GREEN)
-						feedback_inc("alert_comms_green",1)
+						SSblackbox.inc("alert_comms_green",1)
 					if(SEC_LEVEL_BLUE)
-						feedback_inc("alert_comms_blue",1)
+						SSblackbox.inc("alert_comms_blue",1)
 			tmp_alertlevel = 0
 			src.aistate = STATE_DEFAULT
 		if("ai-changeseclevel")

code/game/machinery/newscaster.dm

@@ -535,7 +535,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 				if(choice=="Confirm")
 					scan_user(usr)
 					GLOB.news_network.CreateFeedChannel(channel_name, scanned_user, c_locked)
-					feedback_inc("newscaster_channels",1)
+					SSblackbox.inc("newscaster_channels",1)
 					screen=5
 			updateUsrDialog()
 		else if(href_list["set_channel_receiving"])
@@ -558,7 +558,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 				screen=6
 			else
 				GLOB.news_network.SubmitArticle("<font face=\"[PEN_FONT]\">[parsepencode(msg, usr, SIGNFONT)]</font>", scanned_user, channel_name, photo, 0, allow_comments)
-				feedback_inc("newscaster_stories",1)
+				SSblackbox.inc("newscaster_stories",1)
 				screen=4
 				msg = ""
 			updateUsrDialog()
@@ -850,7 +850,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 		return
 
 /obj/machinery/newscaster/proc/print_paper()
-	feedback_inc("newscaster_newspapers_printed",1)
+	SSblackbox.inc("newscaster_newspapers_printed",1)
 	var/obj/item/weapon/newspaper/NEWSPAPER = new /obj/item/weapon/newspaper
 	for(var/datum/newscaster/feed_channel/FC in GLOB.news_network.network_channels)
 		NEWSPAPER.news_content += FC

code/game/machinery/telecomms/broadcasting.dm.rej

@@ -0,0 +1,33 @@
+diff a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm	(rejected hunks)
+@@ -142,30 +142,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)
+ 
+ 	spawn(50)
+ 		qdel(virt)

code/game/machinery/vending.dm.rej

@@ -0,0 +1,10 @@
+diff a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm	(rejected hunks)
+@@ -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","[R.product_path]|[src.type]")
++		SSblackbox.add_details("vending_machine_usage","[R.product_path]|[src.type]")
+ 		vend_ready = 1
+ 		return
+