JSON feedback

code/modules/shuttle/arrivals.dm

@@ -200,5 +200,5 @@
 /obj/docking_port/mobile/arrivals/vv_edit_var(var_name, var_value)
 	switch(var_name)
 		if("perma_docked")
-			SSblackbox.add_details("admin_secrets_fun_used","ShA[var_value ? "s" : "g"]")
+			SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "ShA[var_value ? "s" : "g"]")
 	return ..()

code/modules/shuttle/manipulator.dm

@@ -151,7 +151,7 @@
 					message_admins("[key_name_admin(usr)] fast travelled \
 						[M]")
 					log_admin("[key_name(usr)] fast travelled [M]")
-					SSblackbox.add_details("shuttle_fasttravel", M.name)
+					SSblackbox.record_feedback("text", "shuttle_manipulator", 1, "[M.name]")
 					break
 
 		if("preview")
@@ -178,7 +178,7 @@
 						with the shuttle manipulator.")
 					log_admin("[key_name(usr)] loaded [mdp] with the \
 						shuttle manipulator.</span>")
-					SSblackbox.add_details("shuttle_manipulator", mdp.name)
+					SSblackbox.record_feedback("text", "shuttle_manipulator", 1, "[mdp.name]")
 
 	update_icon()
 

code/modules/shuttle/on_move.dm

@@ -26,11 +26,16 @@ All ShuttleMove procs go here
 				if(M.pulledby)
 					M.pulledby.stop_pulling()
 				M.stop_pulling()
+<<<<<<< HEAD
 				M.visible_message("<span class='warning'>[src] slams into [M]!</span>")
 				if(M.key || M.get_ghost(TRUE))
 					SSblackbox.add_details("shuttle_gib", "[type]")
 				else
 					SSblackbox.add_details("shuttle_gib_unintelligent", "[type]")
+=======
+				M.visible_message("<span class='warning'>[shuttle] slams into [M]!</span>")
+				SSblackbox.record_feedback("tally", "shuttle_gib", 1, M.type)
+>>>>>>> 8b19b49... JSON feedback (#32188)
 				M.gib()
 
 		else //non-living mobs shouldn't be affected by shuttles, which is why this is an else
@@ -183,7 +188,7 @@ All ShuttleMove procs go here
 /obj/machinery/computer/auxillary_base/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
 	. = ..()
 	if(z == ZLEVEL_MINING) //Avoids double logging and landing on other Z-levels due to badminnery
-		SSblackbox.add_details("colonies_dropped", "[x]|[y]|[z]") //Number of times a base has been dropped!
+		SSblackbox.record_feedback("associative", "colonies_dropped", 1, list("x" = x, "y" = y, "z" = z))
 
 /obj/machinery/gravity_generator/main/beforeShuttleMove(turf/newT, rotation, move_mode)
 	. = ..()

code/modules/shuttle/supply.dm

@@ -99,8 +99,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
 		SSshuttle.orderhistory += SO
 
 		SO.generate(pick_n_take(empty_turfs))
-		SSblackbox.add_details("cargo_imports",
-			"[SO.pack.type]|[SO.pack.name]|[SO.pack.cost]")
+		SSblackbox.record_feedback("nested tally", "cargo_imports", 1, list("[SO.pack.cost]", "[SO.pack.name]"))
 		investigate_log("Order #[SO.id] ([SO.pack.name], placed by [key_name(SO.orderer_ckey)]) has shipped.", INVESTIGATE_CARGO)
 		if(SO.pack.dangerous)
 			message_admins("\A [SO.pack.name] ordered by [key_name_admin(SO.orderer_ckey)] has shipped.")