req part 1

cmss13-devs · May 26, 2024 · 202119d · 202119d
1 parent 139fe26
commit 202119d
Show file tree

Hide file tree

Showing 11 changed files with 168 additions and 194 deletions.
diff --git a/code/datums/ASRS.dm b/code/datums/ASRS.dm
@@ -6,53 +6,63 @@
 
 /datum/supply_packs_asrs
 	/// How likely we are to select this pack over others
-	var/cost = ASRS_MEDIUM_WEIGHT
+	var/cost = ASRS_MEDIUM_WEIGHT // inheritance shall not be used to improve readability
 	/// Which pool of ASRS automatically dispensed supplies this belongs to
 	var/pool = ASRS_POOL_MAIN
 	/// What supply pack would this dispense
 	var/datum/supply_packs/reference_package
 
 //===================================
 // Rounds
+
 /datum/supply_packs_asrs/ammo_rounds_box_rifle
 	reference_package = /datum/supply_packs/ammo_rounds_box_rifle
-	cost = ASRS_MEDIUM_WEIGHT
+	cost = ASRS_VERY_LOW_WEIGHT
 
 /datum/supply_packs_asrs/ammo_rounds_box_rifle_ap
 	reference_package = /datum/supply_packs/ammo_rounds_box_rifle_ap
-	cost = ASRS_LOW_WEIGHT
+	cost = ASRS_VERY_LOW_WEIGHT
 
-/datum/supply_packs_asrs/ammo_rounds_box_xm88
-	reference_package = /datum/supply_packs/ammo_rounds_box_xm88
-	cost = ASRS_LOW_WEIGHT
+/datum/supply_packs_asrs/ammo_rounds_box_smg
+	reference_package = /datum/supply_packs/ammo_rounds_box_smg
+	cost = ASRS_VERY_LOW_WEIGHT
+
+/datum/supply_packs_asrs/ammo_rounds_box_smg_ap
+	reference_package = /datum/supply_packs/ammo_rounds_box_smg_ap
+	cost = ASRS_VERY_LOW_WEIGHT
 
 //===================================
 // Magazines
-/datum/supply_packs_asrs/gun/ammo_hpr
-	reference_package = /datum/supply_packs/ammo_hpr
-	cost = ASRS_LOWEST_WEIGHT
 
+// USCM secondary
 /datum/supply_packs_asrs/ammo_m4a3_mag_box
 	reference_package = /datum/supply_packs/ammo_m4a3_mag_box
-	cost = ASRS_LOW_WEIGHT
+	cost = ASRS_VERY_LOW_WEIGHT
+
+/datum/supply_packs_asrs/ammo_mod88_mag_box
+	reference_package = /datum/supply_packs/ammo_mod88_mag_box_ap
+	cost = ASRS_VERY_LOW_WEIGHT
 
-/datum/supply_packs_asrs/ammo_m4a3_mag_box_ap
-	reference_package = /datum/supply_packs/ammo_m4a3_mag_box_ap
+/datum/supply_packs_asrs/ammo_m44_mag_box
+	reference_package = /datum/supply_packs/ammo_m44_mag_box
 	cost = ASRS_VERY_LOW_WEIGHT
 
+// USCM Primary
 /datum/supply_packs_asrs/ammo_mag_box
 	reference_package = /datum/supply_packs/ammo_mag_box
-	cost = ASRS_VERY_LOW_WEIGHT
+	cost = ASRS_LOW_WEIGHT
 
 /datum/supply_packs_asrs/ammo_mag_box_ap
 	reference_package = /datum/supply_packs/ammo_mag_box_ap
+	cost = ASRS_LOW_WEIGHT
 
 /datum/supply_packs_asrs/ammo_m4ra_mag_box
 	reference_package = /datum/supply_packs/ammo_m4ra_mag_box
-	cost = ASRS_VERY_LOW_WEIGHT
+	cost = ASRS_LOW_WEIGHT
 
 /datum/supply_packs_asrs/ammo_m4ra_mag_box_ap
 	reference_package = /datum/supply_packs/ammo_m4ra_mag_box_ap
+	cost = ASRS_LOW_WEIGHT
 
 /datum/supply_packs_asrs/ammo_shell_box
 	reference_package = /datum/supply_packs/ammo_shell_box
@@ -66,42 +76,34 @@
 	reference_package = /datum/supply_packs/ammo_shell_box_flechette
 	cost = ASRS_VERY_LOW_WEIGHT
 
-/datum/supply_packs_asrs/ammo_shell_box_breaching
-	reference_package = /datum/supply_packs/ammo_shell_box_breaching
-	cost = ASRS_VERY_LOW_WEIGHT
-
-/datum/supply_packs_asrs/ammo_xm51
-	reference_package = /datum/supply_packs/ammo_xm51
-	cost = ASRS_VERY_LOW_WEIGHT
-
-/datum/supply_packs_asrs/ammo_smartgun
+/datum/supply_packs_asrs/ammo_smartgun //todo remove magazines and send raw bullet crates
 	reference_package = /datum/supply_packs/ammo_smartgun
-
-/datum/supply_packs_asrs/ammo_napalm
-	reference_package = /datum/supply_packs/ammo_napalm
-	cost = ASRS_VERY_LOW_WEIGHT
-
-/datum/supply_packs_asrs/ammo_napalm_gel
-	reference_package = /datum/supply_packs/ammo_napalm_gel
-	cost = ASRS_VERY_LOW_WEIGHT
-
-/datum/supply_packs_asrs/ammo_flamer_mixed
-	reference_package = /datum/supply_packs/ammo_flamer_mixed
-	cost = ASRS_VERY_LOW_WEIGHT
+	cost = ASRS_MEDIUM_WEIGHT
 
 //===================================
 // Mortar ammo
 /datum/supply_packs_asrs/ammo_mortar_he
 	reference_package = /datum/supply_packs/ammo_mortar_he
+	cost = ASRS_MEDIUM_WEIGHT
 
 /datum/supply_packs_asrs/ammo_mortar_incend
 	reference_package = /datum/supply_packs/ammo_mortar_incend
+	cost = ASRS_MEDIUM_WEIGHT
 
 /datum/supply_packs_asrs/ammo_mortar_flare
 	reference_package = /datum/supply_packs/ammo_mortar_flare
+	cost = ASRS_MEDIUM_WEIGHT
 
 //===================================
 // Misc supplies
+/datum/supply_packs_asrs/metal_sheets
+	reference_package = /datum/supply_packs/flares
+	cost = ASRS_LOW_WEIGHT
+
+/datum/supply_packs_asrs/plasteel_sheets
+	reference_package = /datum/supply_packs/flares
+	cost = ASRS_MEDIUM_WEIGHT
+
 /datum/supply_packs_asrs/flares
 	reference_package = /datum/supply_packs/flares
 	cost = ASRS_LOW_WEIGHT

diff --git a/code/datums/supply_packs/black_market.dm b/code/datums/supply_packs/black_market.dm
@@ -507,6 +507,18 @@ Primarily made up of things that would be best utilized, well, shipside. Recreat
 	crate_heat = -5
 	containertype = /obj/structure/largecrate/black_market
 
+/datum/supply_packs/contraband/shipside/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)"
+	dollar_cost = 35
+	crate_heat = -5
+	containertype = /obj/structure/closet/crate
+	containername = "Cowboy Costume Crate"
+	group = "Clothing"
+
 /datum/supply_packs/contraband/shipside/confiscated_medicine
 	name = "confiscated medicinal supplies crate"
 	randomised_num_contained = 5

diff --git a/code/datums/supply_packs/clothing.dm b/code/datums/supply_packs/clothing.dm
@@ -5,24 +5,25 @@
 		/obj/item/storage/pouch/magazine/large,
 		/obj/item/storage/pouch/magazine/pistol/large,
 		/obj/item/storage/pouch/magazine/pistol/large,
-		/obj/item/storage/pouch/general,
-		/obj/item/storage/pouch/general,
+		/obj/item/storage/pouch/general/large,
+		/obj/item/storage/pouch/general/large,
 	)
-	cost = 20
+	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "Large Pouch"
 	group = "Clothing"
 
 /datum/supply_packs/pouches_medical
-	name = "medical pouches crate (1x firstaid, medical, syringe, medkit, autoinjector)"
+	name = "Combat medical pouches crate (6x autoinjector)"
 	contains = list(
-		/obj/item/storage/pouch/firstaid,
-		/obj/item/storage/pouch/medical,
-		/obj/item/storage/pouch/syringe,
-		/obj/item/storage/pouch/medkit,
+		/obj/item/storage/pouch/autoinjector,
+		/obj/item/storage/pouch/autoinjector,
+		/obj/item/storage/pouch/autoinjector,
+		/obj/item/storage/pouch/autoinjector,
+		/obj/item/storage/pouch/autoinjector,
 		/obj/item/storage/pouch/autoinjector,
 	)
-	cost = 20
+	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "medical pouches crate"
 	group = "Clothing"
@@ -32,40 +33,46 @@
 //---------------------------------------------
 
 /datum/supply_packs/webbing_brown_black
-	name = "Brown And Black Webbing Crate (x2 each)"
+	name = "Brown And Black Webbing Crate (x6)"
 	contains = list(
 		/obj/item/clothing/accessory/storage/black_vest/brown_vest,
 		/obj/item/clothing/accessory/storage/black_vest/brown_vest,
+		/obj/item/clothing/accessory/storage/black_vest/brown_vest,
+		/obj/item/clothing/accessory/storage/black_vest,
 		/obj/item/clothing/accessory/storage/black_vest,
 		/obj/item/clothing/accessory/storage/black_vest,
 	)
-	cost = 20
+	cost = 10
 	containertype = /obj/structure/closet/crate/green
 	containername = "Brown And Black Webbing Crate"
 	group = "Clothing"
 
 /datum/supply_packs/webbing_large
-	name = "Webbing Crate (x4)"
+	name = "Ammo Webbing Crate (x6)"
 	contains = list(
 		/obj/item/clothing/accessory/storage/webbing,
 		/obj/item/clothing/accessory/storage/webbing,
 		/obj/item/clothing/accessory/storage/webbing,
 		/obj/item/clothing/accessory/storage/webbing,
+		/obj/item/clothing/accessory/storage/webbing,
+		/obj/item/clothing/accessory/storage/webbing,
 	)
-	cost = 20
+	cost = 10
 	containertype = /obj/structure/closet/crate/green
 	containername = "Webbing Crate"
 	group = "Clothing"
 
 /datum/supply_packs/drop_pouches
-	name = "Drop Pouch Crate (x4)"
+	name = "Drop Pouch Crate (x6)"
 	contains = list(
 		/obj/item/clothing/accessory/storage/droppouch,
 		/obj/item/clothing/accessory/storage/droppouch,
 		/obj/item/clothing/accessory/storage/droppouch,
 		/obj/item/clothing/accessory/storage/droppouch,
+		/obj/item/clothing/accessory/storage/droppouch,
+		/obj/item/clothing/accessory/storage/droppouch,
 	)
-	cost = 20
+	cost = 10
 	containertype = /obj/structure/closet/crate/green
 	containername = "Drop Pouch Crate"
 	group = "Clothing"
@@ -76,9 +83,9 @@
 	contains = list(
 		/obj/item/clothing/accessory/storage/knifeharness,//old unathi knife harness updated for our needs
 		/obj/item/clothing/accessory/storage/knifeharness,
-		/obj/item/clothing/accessory/storage/knifeharness
+		/obj/item/clothing/accessory/storage/knifeharness,
 	)
-	cost = 30
+	cost = 10
 	containertype = /obj/structure/closet/crate/green
 	containername = "Knife Vest Crate"
 	group = "Clothing"
@@ -91,33 +98,52 @@
 		/obj/item/clothing/accessory/storage/holster,
 		/obj/item/clothing/accessory/storage/holster,
 	)
-	cost = 20
+	cost = 10
 	containertype = /obj/structure/closet/crate/green
 	containername = "Shoulder Holster Crate"
 	group = "Clothing"
 
-/datum/supply_packs/gunslinger_holster
+/datum/supply_packs/officer_outfits//up to date :)
+	name = "officer outfit crate(x1 each)"
 	contains = list(
-		/obj/item/storage/belt/gun/m44/gunslinger,
-		/obj/item/storage/belt/gun/m44/gunslinger,
+		/obj/item/clothing/under/rank/qm_suit,
+		/obj/item/clothing/under/marine/officer/warrant,
+		/obj/item/clothing/under/marine/chef,
+		/obj/item/clothing/under/marine/officer/command,
+		/obj/item/clothing/under/marine/officer/command,
+		/obj/item/clothing/under/marine/officer/ce,
 	)
-	name = "Red Ranger Cowboy Gunbelt Crate (x2)"
-	cost = 20
-	contraband = 1
+	cost = 10
 	containertype = /obj/structure/closet/crate
-	containername = "Cowboy Costume Crate"
+	containername = "officer dress crate"
 	group = "Clothing"
 
-/datum/supply_packs/officer_outfits//lmao this shit is so hideously out of date
+/datum/supply_packs/marine_formal_outfits
+	name = "Formal Marine outfit crate(x6)"
 	contains = list(
-		/obj/item/clothing/under/rank/qm_suit,
-		/obj/item/clothing/under/marine/officer/bridge,
-		/obj/item/clothing/under/marine/officer/bridge,
 		/obj/item/clothing/under/marine/dress,
-		/obj/item/clothing/under/marine/officer/ce,
+		/obj/item/clothing/under/marine/dress,
+		/obj/item/clothing/under/marine/dress,
+		/obj/item/clothing/under/marine/dress,
+		/obj/item/clothing/under/marine/dress,
+		/obj/item/clothing/under/marine/dress,
+	)
+	cost = 10
+	containertype = /obj/structure/closet/crate
+	containername = "officer dress crate"
+	group = "Clothing"
+
+/datum/supply_packs/officer_formal_outfits
+	name = "Formal officer outfit crate(x6)"
+	contains = list(
+		/obj/item/clothing/under/marine/dress/command,
+		/obj/item/clothing/under/marine/dress/command,
+		/obj/item/clothing/under/marine/dress/command,
+		/obj/item/clothing/under/marine/dress/command,
+		/obj/item/clothing/under/marine/dress/command,
+		/obj/item/clothing/under/marine/dress/command,
 	)
-	name = "officer outfit crate"
-	cost = 30
+	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "officer dress crate"
 	group = "Clothing"
diff --git a/code/datums/supply_packs/engineering.dm b/code/datums/supply_packs/engineering.dm
@@ -22,6 +22,7 @@
 	name = "metal sheets (x50)"
 	contains = list(/obj/item/stack/sheet/metal/large_stack)
 	cost = 20
+	buyable = FALSE
 	containertype = /obj/structure/closet/crate/supply
 	containername = "metal sheets crate"
 	group = "Engineering"
@@ -30,6 +31,7 @@
 	name = "plasteel sheets (x40)"
 	contains = list(/obj/item/stack/sheet/plasteel/med_large_stack)
 	cost = 30
+	buyable = FALSE
 	containertype = /obj/structure/closet/crate/supply
 	containername = "plasteel sheets crate"
 	group = "Engineering"
@@ -50,6 +52,17 @@
 	containername = "wooden planks crate"
 	group = "Engineering"
 
+/datum/supply_packs/plastic
+	name = "plastic crate"
+	contains = list(
+		/obj/item/stack/sheet/mineral/plastic/small_stack,
+		/obj/item/stack/sheet/mineral/plastic/small_stack,
+	)
+	cost = 20
+	containertype = /obj/structure/closet/crate/secure/phoron
+	containername = "plastic crate"
+	group = "Engineering"
+
 /datum/supply_packs/folding_barricades
 	contains = list(
 		/obj/item/stack/folding_barricade/three,

diff --git a/code/datums/supply_packs/gear.dm b/code/datums/supply_packs/gear.dm
@@ -21,7 +21,7 @@
 		/obj/item/ammo_box/magazine/misc/flares,
 		/obj/item/ammo_box/magazine/misc/flares,
 	)
-	cost = 40
+	cost = 20
 	containertype = /obj/structure/closet/crate/ammo
 	containername = "flare pack crate"
 	group = "Gear"
@@ -33,7 +33,7 @@
 		/obj/item/device/motiondetector,
 		/obj/item/device/motiondetector,
 					)
-	cost = 40
+	cost = 30
 	containertype = /obj/structure/closet/crate/supply
 	containername = "Motion Detector crate"
 	group = "Gear"
@@ -46,7 +46,7 @@
 		/obj/item/storage/box/m94/signal,
 		/obj/item/storage/box/m94/signal,
 	)
-	cost = 60
+	cost = 30
 	containertype = /obj/structure/closet/crate/ammo
 	containername = "signal flare pack crate"
 	group = "Gear"
@@ -59,7 +59,7 @@
 		/obj/item/stack/fulton,
 		/obj/item/stack/fulton,
 	)
-	cost = 20
+	cost = 10
 	containertype = /obj/structure/closet/crate/ammo
 	containername = "fulton recovery device crate"
 	group = "Gear"
@@ -88,7 +88,7 @@
 		/obj/item/parachute,
 		/obj/item/parachute,
 	)
-	cost = 40
+	cost = 20
 	containertype = /obj/structure/closet/crate/supply
 	containername = "parachute crate"
 	group = "Gear"