From 02f5a2452dd1605b8fc8cacd9c3d4b9caad1a7dd Mon Sep 17 00:00:00 2001
From: warriorstar-orion <orion@snowfrost.garden>
Date: Mon, 23 Sep 2024 22:21:32 -0400
Subject: [PATCH] fix: only blackbox maintloot spawners (#26859)

---
 .../effects/spawners/random/engineering_spawners.dm       | 1 +
 .../game/objects/effects/spawners/random/food_spawners.dm | 1 +
 .../effects/spawners/random/maint_loot_spawners.dm        | 1 +
 .../game/objects/effects/spawners/random/misc_spawners.dm | 5 +++++
 .../objects/effects/spawners/random/random_spawner.dm     | 8 ++++++--
 .../objects/effects/spawners/random/trash_spawners.dm     | 1 +
 6 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/effects/spawners/random/engineering_spawners.dm b/code/game/objects/effects/spawners/random/engineering_spawners.dm
index d9978dc606b8..eb57cf825cc8 100644
--- a/code/game/objects/effects/spawners/random/engineering_spawners.dm
+++ b/code/game/objects/effects/spawners/random/engineering_spawners.dm
@@ -1,6 +1,7 @@
 /obj/effect/spawner/random/engineering
 	icon = 'icons/effects/random_spawners.dmi'
 	icon_state = "wrench"
+	record_spawn = TRUE
 
 /obj/effect/spawner/random/engineering/tools
 	name = "Tool spawner"
diff --git a/code/game/objects/effects/spawners/random/food_spawners.dm b/code/game/objects/effects/spawners/random/food_spawners.dm
index 069859f2ef52..426ddfe372f8 100644
--- a/code/game/objects/effects/spawners/random/food_spawners.dm
+++ b/code/game/objects/effects/spawners/random/food_spawners.dm
@@ -18,3 +18,4 @@
 
 		/obj/item/food/stroopwafel = 1,
 	)
+	record_spawn = TRUE
diff --git a/code/game/objects/effects/spawners/random/maint_loot_spawners.dm b/code/game/objects/effects/spawners/random/maint_loot_spawners.dm
index 2ad64ece299b..568389d8d2ee 100644
--- a/code/game/objects/effects/spawners/random/maint_loot_spawners.dm
+++ b/code/game/objects/effects/spawners/random/maint_loot_spawners.dm
@@ -4,6 +4,7 @@
 	name = "Maintenance loot spawner"
 	spawn_loot_chance = 65
 	spawn_random_offset_max_pixels = 8
+	record_spawn = TRUE
 
 /obj/effect/spawner/random/maintenance/Initialize(mapload)
 	loot = GLOB.maintenance_loot_tables
diff --git a/code/game/objects/effects/spawners/random/misc_spawners.dm b/code/game/objects/effects/spawners/random/misc_spawners.dm
index 7d4467767c23..6ce67943a30f 100644
--- a/code/game/objects/effects/spawners/random/misc_spawners.dm
+++ b/code/game/objects/effects/spawners/random/misc_spawners.dm
@@ -6,6 +6,7 @@
 		/obj/item/dice/d10,
 		/obj/item/dice/d12,
 	)
+	record_spawn = TRUE
 
 /obj/effect/spawner/random/dice/Initialize()
 	. = ..()
@@ -28,6 +29,7 @@
 		/obj/item/folder/yellow,
 		/obj/item/clipboard,
 	)
+	record_spawn = TRUE
 
 /obj/effect/spawner/random/book
 	icon = 'icons/effects/random_spawners.dmi'
@@ -67,6 +69,7 @@
 		/obj/item/book/manual/wiki/sop_supply,
 		/obj/item/book/manual/zombie_manual,
 	)
+	record_spawn = TRUE
 
 /obj/effect/spawner/random/book/record_item(type_path_to_make)
 	SSblackbox.record_feedback("tally", "random_spawners", 1, "[/obj/item/book]")
@@ -78,6 +81,7 @@
 		/obj/item/mod/module/balloon = 1,
 		/obj/item/mod/module/stamp = 1
 	)
+	record_spawn = TRUE
 
 /obj/effect/spawner/random/janitor/supplies
 	icon = 'icons/effects/random_spawners.dmi'
@@ -89,4 +93,5 @@
 		/obj/item/storage/box/lights/mixed,
 		/obj/item/storage/box/lights/bulbs,
 	)
+	record_spawn = TRUE
 
diff --git a/code/game/objects/effects/spawners/random/random_spawner.dm b/code/game/objects/effects/spawners/random/random_spawner.dm
index 91814b9bdfb5..880454842f71 100644
--- a/code/game/objects/effects/spawners/random/random_spawner.dm
+++ b/code/game/objects/effects/spawners/random/random_spawner.dm
@@ -33,6 +33,8 @@
 	var/spawn_random_offset_max_pixels = 16
 	/// Whether the spawned items should be rotated randomly.
 	var/spawn_random_angle = FALSE
+	/// Whether blackbox should record when the spawner spawns.
+	var/record_spawn = FALSE
 
 // Brief explanation:
 // Rather then setting up and then deleting spawners, we block all atomlike setup
@@ -96,7 +98,8 @@
 			loot_spawned++
 
 /**
- *  Makes the actual item related to our spawner.
+ *  Makes the actual item related to our spawner. If `record_spawn` is `TRUE`,
+ *  this is when the items spawned are recorded to blackbox (except for `/obj/effect`s).
  *
  * spawn_loc - where are we spawning it?
  * type_path_to_make - what are we spawning?
@@ -104,7 +107,8 @@
 /obj/effect/spawner/random/proc/make_item(spawn_loc, type_path_to_make)
 	var/result = new type_path_to_make(spawn_loc)
 
-	record_item(type_path_to_make)
+	if(record_spawn)
+		record_item(type_path_to_make)
 
 	var/atom/item = result
 	if(spawn_random_angle && istype(item))
diff --git a/code/game/objects/effects/spawners/random/trash_spawners.dm b/code/game/objects/effects/spawners/random/trash_spawners.dm
index 776a387c0b79..bc15b76c47d0 100644
--- a/code/game/objects/effects/spawners/random/trash_spawners.dm
+++ b/code/game/objects/effects/spawners/random/trash_spawners.dm
@@ -30,6 +30,7 @@
 	)
 
 	spawn_random_angle = TRUE
+	record_spawn = TRUE
 
 /obj/effect/spawner/random/food_trash/record_item(type_path_to_make)
 	SSblackbox.record_feedback("tally", "random_spawners", 1, "[/obj/item/trash]")