From b17fcf4fbdbe7f861b8d33afda5ed842428d4207 Mon Sep 17 00:00:00 2001
From: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Date: Sun, 4 Jan 2026 05:46:13 -0500
Subject: [PATCH] Decouples Goal Crates from Station Goals (#31341)

---
 code/modules/station_goals/bluespace_tap.dm   |  4 +-
 code/modules/station_goals/bsa.dm             |  4 +-
 code/modules/station_goals/dna_vault.dm       |  8 +--
 code/modules/station_goals/shield.dm          |  8 +--
 .../supply/supply_packs/pack_engineering.dm   | 63 +++++++++++++++++
 .../supply/supply_packs/pack_miscellaneous.dm | 67 -------------------
 6 files changed, 75 insertions(+), 79 deletions(-)

diff --git a/code/modules/station_goals/bluespace_tap.dm b/code/modules/station_goals/bluespace_tap.dm
index 375948c667d..4c0475cab31 100644
--- a/code/modules/station_goals/bluespace_tap.dm
+++ b/code/modules/station_goals/bluespace_tap.dm
@@ -16,8 +16,8 @@
 	Nanotrasen Science Directorate"}
 
 /datum/station_goal/bluespace_tap/on_report()
-	var/datum/supply_packs/misc/station_goal/bluespace_tap/P = SSeconomy.supply_packs["[/datum/supply_packs/misc/station_goal/bluespace_tap]"]
-	P.special_enabled = TRUE
+	var/datum/supply_packs/engineering/bluespace_tap/P = SSeconomy.supply_packs["[/datum/supply_packs/engineering/bluespace_tap]"]
+	P.cost = 1000
 
 /datum/station_goal/bluespace_tap/check_completion()
 	if(..())
diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm
index f3a4f7e296d..2e905b5fa0a 100644
--- a/code/modules/station_goals/bsa.dm
+++ b/code/modules/station_goals/bsa.dm
@@ -16,8 +16,8 @@
 
 /datum/station_goal/bluespace_cannon/on_report()
 	//Unlock BSA parts
-	var/datum/supply_packs/misc/station_goal/bsa/P = SSeconomy.supply_packs["[/datum/supply_packs/misc/station_goal/bsa]"]
-	P.special_enabled = TRUE
+	var/datum/supply_packs/engineering/bsa/P = SSeconomy.supply_packs["[/datum/supply_packs/engineering/bsa]"]
+	P.cost = 1500
 
 /datum/station_goal/bluespace_cannon/check_completion()
 	if(..())
diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm
index 46f41aa1176..eaacf078f77 100644
--- a/code/modules/station_goals/dna_vault.dm
+++ b/code/modules/station_goals/dna_vault.dm
@@ -43,11 +43,11 @@
 	The base vault parts should be available for shipping by your cargo shuttle."}
 
 /datum/station_goal/dna_vault/on_report()
-	var/datum/supply_packs/P = SSeconomy.supply_packs["[/datum/supply_packs/misc/station_goal/dna_vault]"]
-	P.special_enabled = TRUE
+	var/datum/supply_packs/P = SSeconomy.supply_packs["[/datum/supply_packs/engineering/dna_vault]"]
+	P.cost = 1000
 
-	P = SSeconomy.supply_packs["[/datum/supply_packs/misc/station_goal/dna_probes]"]
-	P.special_enabled = TRUE
+	P = SSeconomy.supply_packs["[/datum/supply_packs/engineering/dna_probes]"]
+	P.cost = 250
 
 /datum/station_goal/dna_vault/check_completion()
 	if(..())
diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm
index 9e6fdd25cf7..4c605fa5e50 100644
--- a/code/modules/station_goals/shield.dm
+++ b/code/modules/station_goals/shield.dm
@@ -23,11 +23,11 @@
 
 /datum/station_goal/station_shield/on_report()
 	//Unlock
-	var/datum/supply_packs/P = SSeconomy.supply_packs["[/datum/supply_packs/misc/station_goal/shield_sat]"]
-	P.special_enabled = TRUE
+	var/datum/supply_packs/P = SSeconomy.supply_packs["[/datum/supply_packs/engineering/shield_sat]"]
+	P.cost = 100
 
-	P = SSeconomy.supply_packs["[/datum/supply_packs/misc/station_goal/shield_sat_control]"]
-	P.special_enabled = TRUE
+	P = SSeconomy.supply_packs["[/datum/supply_packs/engineering/shield_sat_control]"]
+	P.cost = 750
 
 /datum/station_goal/station_shield/check_completion()
 	if(..())
diff --git a/code/modules/supply/supply_packs/pack_engineering.dm b/code/modules/supply/supply_packs/pack_engineering.dm
index fa6e32a228e..e4af2067f05 100644
--- a/code/modules/supply/supply_packs/pack_engineering.dm
+++ b/code/modules/supply/supply_packs/pack_engineering.dm
@@ -298,3 +298,66 @@
 	cost = 400
 	containertype = /obj/structure/largecrate
 	containername = "Large Air Pump Crate"
+
+/datum/supply_packs/engineering/bsa
+	name = "Bluespace Artillery Parts"
+	cost = 2250
+	contains = list(/obj/item/circuitboard/machine/bsa/front,
+					/obj/item/circuitboard/machine/bsa/middle,
+					/obj/item/circuitboard/machine/bsa/back,
+					/obj/item/circuitboard/computer/bsa_control
+					)
+	containername = "bluespace artillery parts crate"
+	containertype = /obj/structure/closet/crate/nanotrasen
+
+/datum/supply_packs/engineering/bluespace_tap
+	name = "Bluespace Harvester Parts"
+	cost = 1750
+	contains = list(
+					/obj/item/circuitboard/machine/bluespace_tap,
+					/obj/item/paper/bluespace_tap
+					)
+	containername = "bluespace harvester parts crate"
+	containertype = /obj/structure/closet/crate/nanotrasen
+
+/datum/supply_packs/engineering/dna_vault
+	name = "DNA Vault Parts"
+	cost = 1500
+	contains = list(
+					/obj/item/circuitboard/machine/dna_vault
+					)
+	containername = "dna vault parts crate"
+	containertype = /obj/structure/closet/crate/nanotrasen
+
+/datum/supply_packs/engineering/dna_probes
+	name = "DNA Vault Samplers"
+	cost = 350
+	contains = list(/obj/item/dna_probe,
+					/obj/item/dna_probe,
+					/obj/item/dna_probe,
+					/obj/item/dna_probe,
+					/obj/item/dna_probe
+					)
+	containername = "dna samplers crate"
+	containertype = /obj/structure/closet/crate/nanotrasen
+
+/datum/supply_packs/engineering/shield_sat
+	name = "Shield Generator Satellites"
+	cost = 150
+	contains = list(
+					/obj/machinery/satellite/meteor_shield,
+					/obj/machinery/satellite/meteor_shield,
+					/obj/machinery/satellite/meteor_shield,
+					/obj/machinery/satellite/meteor_shield
+					)
+	containername = "shield sat crate"
+	containertype = /obj/structure/closet/crate/nanotrasen
+
+/datum/supply_packs/engineering/shield_sat_control
+	name = "Shield System Control Board"
+	cost = 1000
+	contains = list(
+					/obj/item/circuitboard/computer/sat_control
+					)
+	containername = "shield control board crate"
+	containertype = /obj/structure/closet/crate/nanotrasen
diff --git a/code/modules/supply/supply_packs/pack_miscellaneous.dm b/code/modules/supply/supply_packs/pack_miscellaneous.dm
index 0fffb02f166..4d3d999afc3 100644
--- a/code/modules/supply/supply_packs/pack_miscellaneous.dm
+++ b/code/modules/supply/supply_packs/pack_miscellaneous.dm
@@ -548,73 +548,6 @@
 	cost = 999 // Price of cool. Also under 1000 so it's not grand theft if stolen, lmao
 	containername = "hoverboard crate"
 
-///////////// Station Goals
-
-/datum/supply_packs/misc/station_goal
-	name = "Empty Station Goal Crate"
-	cost = 10
-	special = TRUE
-	containername = "empty station goal crate"
-	containertype = /obj/structure/closet/crate/nanotrasen
-
-/datum/supply_packs/misc/station_goal/bsa
-	name = "Bluespace Artillery Parts"
-	cost = 1500
-	contains = list(/obj/item/circuitboard/machine/bsa/front,
-					/obj/item/circuitboard/machine/bsa/middle,
-					/obj/item/circuitboard/machine/bsa/back,
-					/obj/item/circuitboard/computer/bsa_control
-					)
-	containername = "bluespace artillery parts crate"
-
-
-/datum/supply_packs/misc/station_goal/bluespace_tap
-	name = "Bluespace Harvester Parts"
-	cost = 1000
-	contains = list(
-					/obj/item/circuitboard/machine/bluespace_tap,
-					/obj/item/paper/bluespace_tap
-					)
-	containername = "bluespace harvester parts crate"
-
-/datum/supply_packs/misc/station_goal/dna_vault
-	name = "DNA Vault Parts"
-	cost = 1000
-	contains = list(
-					/obj/item/circuitboard/machine/dna_vault
-					)
-	containername = "dna vault parts crate"
-
-/datum/supply_packs/misc/station_goal/dna_probes
-	name = "DNA Vault Samplers"
-	cost = 250
-	contains = list(/obj/item/dna_probe,
-					/obj/item/dna_probe,
-					/obj/item/dna_probe,
-					/obj/item/dna_probe,
-					/obj/item/dna_probe
-					)
-	containername = "dna samplers crate"
-
-/datum/supply_packs/misc/station_goal/shield_sat
-	name = "Shield Generator Satellites"
-	cost = 100
-	contains = list(
-					/obj/machinery/satellite/meteor_shield,
-					/obj/machinery/satellite/meteor_shield,
-					/obj/machinery/satellite/meteor_shield,
-					/obj/machinery/satellite/meteor_shield
-					)
-	containername = "shield sat crate"
-
-/datum/supply_packs/misc/station_goal/shield_sat_control
-	name = "Shield System Control Board"
-	cost = 750
-	contains = list(
-					/obj/item/circuitboard/computer/sat_control
-					)
-	containername = "shield control board crate"
-
 /datum/supply_packs/misc/toilet
 	name = "Lavatory Crate"
 	cost = 100