Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

[MIRROR] Unorphans the blackbox

code/game/objects/items/charter.dm

@@ -86,7 +86,7 @@
 	name = "station charter for [station_name()]"
 	desc = "An official document entrusting the governance of \
 		[station_name()] and surrounding space to Captain [uname]."
-	feedback_set_details("station_renames","[station_name()]")
+	SSblackbox.set_details("station_renames","[station_name()]")
 	if(!unlimited_uses)
 		used = TRUE
 

code/game/objects/items/robot/robot_parts.dm

@@ -58,7 +58,7 @@
 	if(src.l_arm && src.r_arm)
 		if(src.l_leg && src.r_leg)
 			if(src.chest && src.head)
-				feedback_inc("cyborg_frames_built",1)
+				SSblackbox.inc("cyborg_frames_built",1)
 				return 1
 	return 0
 
@@ -235,7 +235,7 @@
 			O.mmi = W //and give the real mmi to the borg.
 			O.updatename()
 
-			feedback_inc("cyborg_birth",1)
+			SSblackbox.inc("cyborg_birth",1)
 
 			forceMove(O)
 			O.robot_suit = src

code/game/objects/items/weapons/handcuffs.dm

@@ -45,7 +45,7 @@
 			if(do_mob(user, C, 30) && (C.get_num_arms() >= 2 || C.get_arm_ignore()))
 				apply_cuffs(C,user)
 				to_chat(user, "<span class='notice'>You handcuff [C].</span>")
-				feedback_add_details("handcuffs","[type]")
+				SSblackbox.add_details("handcuffs","[type]")
 
 				add_logs(user, C, "handcuffed")
 			else
@@ -275,7 +275,7 @@
 						C.legcuffed = src
 						src.loc = C
 						C.update_inv_legcuffed()
-						feedback_add_details("handcuffs","[type]")
+						SSblackbox.add_details("handcuffs","[type]")
 			else if(isanimal(L))
 				var/mob/living/simple_animal/SA = L
 				if(SA.mob_size > MOB_SIZE_TINY)
@@ -336,7 +336,7 @@
 		C.legcuffed = src
 		src.loc = C
 		C.update_inv_legcuffed()
-		feedback_add_details("handcuffs","[type]")
+		SSblackbox.add_details("handcuffs","[type]")
 		to_chat(C, "<span class='userdanger'>\The [src] ensnares you!</span>")
 		C.Weaken(weaken)
 

code/game/objects/items/weapons/handcuffs.dm.rej

@@ -0,0 +1,31 @@
+diff a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm	(rejected hunks)
+@@ -46,9 +46,9 @@
+ 				apply_cuffs(C,user)
+ 				to_chat(user, "<span class='notice'>You handcuff [C].</span>")
+ 				if(istype(src, /obj/item/weapon/restraints/handcuffs/cable))
+-					feedback_add_details("handcuffs","C")
++					SSblackbox.add_details("handcuffs","C")
+ 				else
+-					feedback_add_details("handcuffs","H")
++					SSblackbox.add_details("handcuffs","H")
+ 
+ 				add_logs(user, C, "handcuffed")
+ 			else
+@@ -278,7 +278,7 @@
+ 						C.legcuffed = src
+ 						src.loc = C
+ 						C.update_inv_legcuffed()
+-						feedback_add_details("handcuffs","B") //Yes, I know they're legcuffs. Don't change this, no need for an extra variable. The "B" is used to tell them apart.
++						SSblackbox.add_details("handcuffs","B") //Yes, I know they're legcuffs. Don't change this, no need for an extra variable. The "B" is used to tell them apart.
+ 			else if(isanimal(L))
+ 				var/mob/living/simple_animal/SA = L
+ 				if(SA.mob_size > MOB_SIZE_TINY)
+@@ -341,7 +341,7 @@
+ 		C.legcuffed = src
+ 		src.loc = C
+ 		C.update_inv_legcuffed()
+-		feedback_add_details("handcuffs","B")
++		SSblackbox.add_details("handcuffs","B")
+ 		to_chat(C, "<span class='userdanger'>\The [src] ensnares you!</span>")
+ 		C.Weaken(weaken)
+ 

code/game/objects/items/weapons/holy_weapons.dm

@@ -39,7 +39,7 @@
 
 	SSreligion.holy_weapon_type = holy_weapon.type
 
-	feedback_set_details("chaplain_weapon","[choice]")
+	SSblackbox.set_details("chaplain_weapon","[choice]")
 
 	if(holy_weapon)
 		holy_weapon.reskinned = TRUE

code/game/objects/items/weapons/storage/book.dm

@@ -62,7 +62,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
 		SSreligion.bible_icon_state = B.icon_state
 		SSreligion.bible_item_state = B.item_state
 
-		feedback_set_details("religion_book","[biblename]")
+		SSblackbox.set_details("religion_book","[biblename]")
 		usr << browse(null, "window=editicon")
 
 /obj/item/weapon/storage/book/bible/proc/bless(mob/living/carbon/human/H, mob/living/user)

code/game/objects/structures/ai_core.dm

@@ -180,7 +180,7 @@
 						var/mob/living/silicon/ai/A = new /mob/living/silicon/ai(loc, laws, brain.brainmob)
 						if(brain.force_replace_ai_name)
 							A.fully_replace_character_name(A.name, brain.replacement_ai_name())
-						feedback_inc("cyborg_ais_created",1)
+						SSblackbox.inc("cyborg_ais_created",1)
 						qdel(src)
 					else
 						state = AI_READY_CORE