moves all contraband into the bm properly

cmss13-devs · Jan 2, 2025 · 0e0383d · 0e0383d
1 parent 40dd655
commit 0e0383d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 21 deletions.
diff --git a/code/datums/supply_packs/black_market.dm b/code/datums/supply_packs/black_market.dm
@@ -1124,6 +1124,16 @@ This is where the RO can reclaim their lost honor and purchase the M44 custom, t
 	crate_heat = 4
 	containertype = /obj/structure/largecrate/black_market
 
+/datum/supply_packs/contraband/deep_storage/gunslinger_holster
+	name = "Red Ranger Cowboy Gunbelt Crate (x2)"
+	contains = list(
+		/obj/item/storage/belt/gun/m44/gunslinger,
+		/obj/item/storage/belt/gun/m44/gunslinger,
+	)
+	dollar_cost = 20
+	crate_heat = 4
+	containertype = /obj/structure/largecrate/black_market
+
 /* --- MISCELLANEOUS --- */
 
 /*

diff --git a/code/datums/supply_packs/clothing.dm b/code/datums/supply_packs/clothing.dm
@@ -96,18 +96,6 @@
 	containername = "Shoulder Holster Crate"
 	group = "Clothing"
 
-/datum/supply_packs/gunslinger_holster
-	contains = list(
-		/obj/item/storage/belt/gun/m44/gunslinger,
-		/obj/item/storage/belt/gun/m44/gunslinger,
-	)
-	name = "Red Ranger Cowboy Gunbelt Crate (x2)"
-	cost = 20
-	contraband = 1
-	containertype = /obj/structure/closet/crate
-	containername = "Cowboy Costume Crate"
-	group = "Clothing"
-
 /datum/supply_packs/officer_outfits//lmao this shit is so hideously out of date
 	contains = list(
 		/obj/item/clothing/under/rank/qm_suit,

diff --git a/code/datums/supply_packs/weapons.dm b/code/datums/supply_packs/weapons.dm
@@ -130,12 +130,3 @@
 	containername = "M707 crate"
 	group = "Weapons"
 */
-
-/datum/supply_packs/gun/merc
-	contains = list()
-	name = "black market firearms (x1)"
-	cost = 40
-	contraband = 1
-	containertype = /obj/structure/largecrate/guns/merc
-	containername = "\improper black market firearms crate"
-	group = "Weapons"