Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool

code/datums/supplypacks/atmospherics.dm

@@ -4,45 +4,45 @@
 */
 
 
-/datum/supply_packs/atmos
+/datum/supply_pack/atmos
 	group = "Atmospherics"
 
-/datum/supply_packs/atmos/inflatable
+/datum/supply_pack/atmos/inflatable
 	name = "Inflatable barriers"
 	contains = list(/obj/item/weapon/storage/briefcase/inflatable = 3)
 	cost = 20
 	containertype = /obj/structure/closet/crate/engineering
 	containername = "Inflatable Barrier Crate"
 
-/datum/supply_packs/atmos/canister_empty
+/datum/supply_pack/atmos/canister_empty
 	name = "Empty gas canister"
 	cost = 7
 	containername = "Empty gas canister crate"
 	containertype = /obj/structure/largecrate
 	contains = list(/obj/machinery/portable_atmospherics/canister)
 
-/datum/supply_packs/atmos/canister_air
+/datum/supply_pack/atmos/canister_air
 	name = "Air canister"
 	cost = 10
 	containername = "Air canister crate"
 	containertype = /obj/structure/largecrate
 	contains = list(/obj/machinery/portable_atmospherics/canister/air)
 
-/datum/supply_packs/atmos/canister_oxygen
+/datum/supply_pack/atmos/canister_oxygen
 	name = "Oxygen canister"
 	cost = 15
 	containername = "Oxygen canister crate"
 	containertype = /obj/structure/largecrate
 	contains = list(/obj/machinery/portable_atmospherics/canister/oxygen)
 
-/datum/supply_packs/atmos/canister_nitrogen
+/datum/supply_pack/atmos/canister_nitrogen
 	name = "Nitrogen canister"
 	cost = 10
 	containername = "Nitrogen canister crate"
 	containertype = /obj/structure/largecrate
 	contains = list(/obj/machinery/portable_atmospherics/canister/nitrogen)
 
-/datum/supply_packs/atmos/canister_phoron
+/datum/supply_pack/atmos/canister_phoron
 	name = "Phoron gas canister"
 	cost = 60
 	containername = "Phoron gas canister crate"
@@ -50,7 +50,7 @@
 	access = access_atmospherics
 	contains = list(/obj/machinery/portable_atmospherics/canister/phoron)
 
-/datum/supply_packs/atmos/canister_sleeping_agent
+/datum/supply_pack/atmos/canister_sleeping_agent
 	name = "N2O gas canister"
 	cost = 15
 	containername = "N2O gas canister crate"
@@ -58,7 +58,7 @@
 	access = access_atmospherics
 	contains = list(/obj/machinery/portable_atmospherics/canister/sleeping_agent)
 
-/datum/supply_packs/atmos/canister_carbon_dioxide
+/datum/supply_pack/atmos/canister_carbon_dioxide
 	name = "Carbon dioxide gas canister"
 	cost = 15
 	containername = "CO2 canister crate"
@@ -66,7 +66,7 @@
 	access = access_atmospherics
 	contains = list(/obj/machinery/portable_atmospherics/canister/carbon_dioxide)
 
-/datum/supply_packs/atmos/air_dispenser
+/datum/supply_pack/atmos/air_dispenser
 	contains = list(/obj/machinery/pipedispenser/orderable)
 	name = "Pipe Dispenser"
 	cost = 25
@@ -74,7 +74,7 @@
 	containername = "Pipe Dispenser Crate"
 	access = access_atmospherics
 
-/datum/supply_packs/atmos/disposals_dispenser
+/datum/supply_pack/atmos/disposals_dispenser
 	contains = list(/obj/machinery/pipedispenser/disposal/orderable)
 	name = "Disposals Pipe Dispenser"
 	cost = 25
@@ -82,7 +82,7 @@
 	containername = "Disposal Dispenser Crate"
 	access = access_atmospherics
 
-/datum/supply_packs/atmos/internals
+/datum/supply_pack/atmos/internals
 	name = "Internals crate"
 	contains = list(
 			/obj/item/clothing/mask/gas = 3,
@@ -92,7 +92,7 @@
 	containertype = /obj/structure/closet/crate/internals
 	containername = "Internals crate"
 
-/datum/supply_packs/atmos/evacuation
+/datum/supply_pack/atmos/evacuation
 	name = "Emergency equipment"
 	contains = list(
 			/obj/item/weapon/storage/toolbox/emergency = 2,

code/datums/supplypacks/contraband.dm

@@ -4,7 +4,7 @@
 */
 
 
-/datum/supply_packs/randomised/contraband
+/datum/supply_pack/randomised/contraband
 	num_contained = 5
 	contains = list(
 			/obj/item/seeds/bloodtomatoseed,
@@ -20,7 +20,7 @@
 	contraband = 1
 	group = "Supplies"
 
-/datum/supply_packs/security/specialops
+/datum/supply_pack/security/specialops
 	name = "Special Ops supplies"
 	contains = list(
 			/obj/item/weapon/storage/box/emps,
@@ -32,7 +32,7 @@
 	containername = "Special Ops crate"
 	contraband = 1
 
-/datum/supply_packs/supply/moghes
+/datum/supply_pack/supply/moghes
 	name = "Moghes imports"
 	contains = list(
 			/obj/item/weapon/reagent_containers/food/drinks/bottle/redeemersbrew = 2,
@@ -43,7 +43,7 @@
 	containername = "Moghes imports crate"
 	contraband = 1
 
-/datum/supply_packs/munitions/bolt_rifles_militia
+/datum/supply_pack/munitions/bolt_rifles_militia
  	name = "Weapon - Surplus militia rifles"
  	contains = list(
  			/obj/item/weapon/gun/projectile/shotgun/pump/rifle = 3,
@@ -54,7 +54,7 @@
  	containertype = /obj/structure/closet/crate/secure/weapon
  	containername = "Ballistic weapons crate"
 
-/datum/supply_packs/randomised/misc/telecrate //you get something awesome, a couple of decent things, and a few weak/filler things
+/datum/supply_pack/randomised/misc/telecrate //you get something awesome, a couple of decent things, and a few weak/filler things
 	name = "ERR_NULL_ENTRY" //null crate! also dream maker is hell,
 	num_contained = 1
 	contains = list(

code/datums/supplypacks/costumes.dm

@@ -4,13 +4,13 @@
 */
 
 
-/datum/supply_packs/costumes
+/datum/supply_pack/costumes
 	group = "Costumes"
 
-/datum/supply_packs/randomised/costumes
+/datum/supply_pack/randomised/costumes
 	group = "Costumes"
 
-/datum/supply_packs/costumes/wizard
+/datum/supply_pack/costumes/wizard
 	name = "Wizard costume"
 	contains = list(
 			/obj/item/weapon/staff,
@@ -22,7 +22,7 @@
 	containertype = /obj/structure/closet/crate
 	containername = "Wizard costume crate"
 
-/datum/supply_packs/randomised/costumes/hats
+/datum/supply_pack/randomised/costumes/hats
 	num_contained = 4
 	contains = list(
 			/obj/item/clothing/head/collectable/chef,
@@ -51,7 +51,7 @@
 	containertype = /obj/structure/closet/crate
 	containername = "Collectable hats crate! Brought to you by Bass.inc!"
 
-/datum/supply_packs/randomised/costumes/costume
+/datum/supply_pack/randomised/costumes/costume
 	num_contained = 3
 	contains = list(
 			/obj/item/clothing/suit/pirate,
@@ -87,7 +87,7 @@
 	containertype = /obj/structure/closet/crate
 	containername = "Actor Costumes"
 
-/datum/supply_packs/costumes/formal_wear
+/datum/supply_pack/costumes/formal_wear
 	contains = list(
 			/obj/item/clothing/head/bowler,
 			/obj/item/clothing/head/that,
@@ -109,7 +109,7 @@
 	containertype = /obj/structure/closet
 	containername = "Formalwear for the best occasions."
 
-datum/supply_packs/costumes/witch
+datum/supply_pack/costumes/witch
 	name = "Witch costume"
 	containername = "Witch costume"
 	containertype = /obj/structure/closet
@@ -121,7 +121,7 @@ datum/supply_packs/costumes/witch
 			/obj/item/weapon/staff/broom
 			)
 
-/datum/supply_packs/randomised/costumes/costume_hats
+/datum/supply_pack/randomised/costumes/costume_hats
 	name = "Costume hats"
 	containername = "Actor hats crate"
 	containertype = /obj/structure/closet/crate
@@ -146,7 +146,7 @@ datum/supply_packs/costumes/witch
 			/obj/item/clothing/head/ushanka
 			)
 
-/datum/supply_packs/randomised/costumes/dresses
+/datum/supply_pack/randomised/costumes/dresses
 	name = "Womens formal dress locker"
 	containername = "Pretty dress locker"
 	containertype = /obj/structure/closet

code/datums/supplypacks/engineering.dm

@@ -4,66 +4,66 @@
 */
 
 
-/datum/supply_packs/eng
+/datum/supply_pack/eng
 	group = "Engineering"
 
-/datum/supply_packs/eng/lightbulbs
+/datum/supply_pack/eng/lightbulbs
 	name = "Replacement lights"
 	contains = list(/obj/item/weapon/storage/box/lights/mixed = 3)
 	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "Replacement lights"
 
-/datum/supply_packs/eng/smescoil
+/datum/supply_pack/eng/smescoil
 	name = "Superconducting Magnetic Coil"
 	contains = list(/obj/item/weapon/smes_coil)
 	cost = 75
 	containertype = /obj/structure/closet/crate/engineering
 	containername = "Superconducting Magnetic Coil crate"
 
-/datum/supply_packs/eng/shield_capacitor
+/datum/supply_pack/eng/shield_capacitor
 	name = "Shield Capacitor"
 	contains = list(/obj/machinery/shield_capacitor)
 	cost = 20
 	containertype = /obj/structure/closet/crate/engineering
 	containername = "shield capacitor crate"
 
-/datum/supply_packs/eng/shield_capacitor/advanced
+/datum/supply_pack/eng/shield_capacitor/advanced
 	name = "Advanced Shield Capacitor"
 	contains = list(/obj/machinery/shield_capacitor/advanced)
 	cost = 30
 	containertype = /obj/structure/closet/crate/engineering
 	containername = "advanced shield capacitor crate"
 
-/datum/supply_packs/eng/bubble_shield
+/datum/supply_pack/eng/bubble_shield
 	name = "Bubble Shield Generator"
 	contains = list(/obj/machinery/shield_gen)
 	cost = 40
 	containertype = /obj/structure/closet/crate/engineering
 	containername = "shield bubble generator crate"
 
-/datum/supply_packs/eng/bubble_shield/advanced
+/datum/supply_pack/eng/bubble_shield/advanced
 	name = "Advanced Bubble Shield Generator"
 	contains = list(/obj/machinery/shield_gen/advanced)
 	cost = 60
 	containertype = /obj/structure/closet/crate/engineering
 	containername = "advanced bubble shield generator crate"
 
-/datum/supply_packs/eng/hull_shield
+/datum/supply_pack/eng/hull_shield
 	name = "Hull Shield Generator"
 	contains = list(/obj/machinery/shield_gen/external)
 	cost = 80
 	containertype = /obj/structure/closet/crate/engineering
 	containername = "shield hull generator crate"
 
-/datum/supply_packs/eng/hull_shield/advanced
+/datum/supply_pack/eng/hull_shield/advanced
 	name = "Advanced Hull Shield Generator"
 	contains = list(/obj/machinery/shield_gen/external/advanced)
 	cost = 120
 	containertype = /obj/structure/closet/crate/engineering
 	containername = "advanced hull shield generator crate"
 
-/datum/supply_packs/eng/electrical
+/datum/supply_pack/eng/electrical
 	name = "Electrical maintenance crate"
 	contains = list(
 			/obj/item/weapon/storage/toolbox/electrical = 2,
@@ -75,7 +75,7 @@
 	containertype = /obj/structure/closet/crate/engineering/electrical
 	containername = "Electrical maintenance crate"
 
-/datum/supply_packs/eng/e_welders
+/datum/supply_pack/eng/e_welders
 	name = "Electric welder crate"
 	contains = list(
 			/obj/item/weapon/weldingtool/electric = 3
@@ -84,7 +84,7 @@
 	containertype = /obj/structure/closet/crate/engineering/electrical
 	containername = "Electric welder crate"
 
-/datum/supply_packs/eng/mechanical
+/datum/supply_pack/eng/mechanical
 	name = "Mechanical maintenance crate"
 	contains = list(
 			/obj/item/weapon/storage/belt/utility/full = 3,
@@ -96,14 +96,14 @@
 	containertype = /obj/structure/closet/crate/engineering
 	containername = "Mechanical maintenance crate"
 
-/datum/supply_packs/eng/fueltank
+/datum/supply_pack/eng/fueltank
 	name = "Fuel tank crate"
 	contains = list(/obj/structure/reagent_dispensers/fueltank)
 	cost = 10
 	containertype = /obj/structure/largecrate
 	containername = "fuel tank crate"
 
-/datum/supply_packs/eng/solar
+/datum/supply_pack/eng/solar
 	name = "Solar Pack crate"
 	contains  = list(
 			/obj/item/solar_assembly = 21,
@@ -115,7 +115,7 @@
 	containertype = /obj/structure/closet/crate/engineering
 	containername = "Solar pack crate"
 
-/datum/supply_packs/eng/engine
+/datum/supply_pack/eng/engine
 	name = "Emitter crate"
 	contains = list(/obj/machinery/power/emitter = 2)
 	cost = 10
@@ -123,27 +123,27 @@
 	containername = "Emitter crate"
 	access = access_ce
 
-/datum/supply_packs/eng/engine/field_gen
+/datum/supply_pack/eng/engine/field_gen
 	name = "Field Generator crate"
 	contains = list(/obj/machinery/field_generator = 2)
 	containertype = /obj/structure/closet/crate/secure/engineering
 	containername = "Field Generator crate"
 	access = access_ce
 
-/datum/supply_packs/eng/engine/sing_gen
+/datum/supply_pack/eng/engine/sing_gen
 	name = "Singularity Generator crate"
 	contains = list(/obj/machinery/the_singularitygen)
 	containertype = /obj/structure/closet/crate/secure/engineering
 	containername = "Singularity Generator crate"
 	access = access_ce
 
-/datum/supply_packs/eng/engine/collector
+/datum/supply_pack/eng/engine/collector
 	name = "Collector crate"
 	contains = list(/obj/machinery/power/rad_collector = 3)
 	containertype = /obj/structure/closet/crate/secure/engineering
 	containername = "Collector crate"
 
-/datum/supply_packs/eng/engine/PA
+/datum/supply_pack/eng/engine/PA
 	name = "Particle Accelerator crate"
 	cost = 40
 	contains = list(
@@ -159,7 +159,7 @@
 	containername = "Particle Accelerator crate"
 	access = access_ce
 
-/datum/supply_packs/eng/shield_gen
+/datum/supply_pack/eng/shield_gen
 	contains = list(/obj/item/weapon/circuitboard/shield_gen)
 	name = "Bubble shield generator circuitry"
 	cost = 30
@@ -167,7 +167,7 @@
 	containername = "bubble shield generator circuitry crate"
 	access = access_ce
 
-/datum/supply_packs/eng/shield_gen_ex
+/datum/supply_pack/eng/shield_gen_ex
 	contains = list(/obj/item/weapon/circuitboard/shield_gen_ex)
 	name = "Hull shield generator circuitry"
 	cost = 30
@@ -175,7 +175,7 @@
 	containername = "hull shield generator circuitry crate"
 	access = access_ce
 
-/datum/supply_packs/eng/shield_cap
+/datum/supply_pack/eng/shield_cap
 	contains = list(/obj/item/weapon/circuitboard/shield_cap)
 	name = "Bubble shield capacitor circuitry"
 	cost = 30
@@ -183,7 +183,7 @@
 	containername = "shield capacitor circuitry crate"
 	access = access_ce
 
-/datum/supply_packs/eng/smbig
+/datum/supply_pack/eng/smbig
 	name = "Supermatter Core"
 	contains = list(/obj/machinery/power/supermatter)
 	cost = 150
@@ -191,7 +191,7 @@
 	containername = "Supermatter crate (CAUTION)"
 	access = access_ce
 
-/datum/supply_packs/eng/teg
+/datum/supply_pack/eng/teg
 	contains = list(/obj/machinery/power/generator)
 	name = "Mark I Thermoelectric Generator"
 	cost = 40
@@ -199,7 +199,7 @@
 	containername = "Mk1 TEG crate"
 	access = access_engine
 
-/datum/supply_packs/eng/circulator
+/datum/supply_pack/eng/circulator
 	contains = list(/obj/machinery/atmospherics/binary/circulator)
 	name = "Binary atmospheric circulator"
 	cost = 20
@@ -207,7 +207,7 @@
 	containername = "Atmospheric circulator crate"
 	access = access_engine
 
-/datum/supply_packs/eng/radsuit
+/datum/supply_pack/eng/radsuit
 	contains = list(
 			/obj/item/clothing/suit/radiation = 3,
 			/obj/item/clothing/head/radiation = 3
@@ -217,7 +217,7 @@
 	containertype = /obj/structure/closet/radiation
 	containername = "Radiation suit locker"
 
-/datum/supply_packs/eng/pacman_parts
+/datum/supply_pack/eng/pacman_parts
 	name = "P.A.C.M.A.N. portable generator parts"
 	cost = 25
 	containername = "P.A.C.M.A.N. Portable Generator Construction Kit"
@@ -230,7 +230,7 @@
 			/obj/item/weapon/circuitboard/pacman
 			)
 
-/datum/supply_packs/eng/super_pacman_parts
+/datum/supply_pack/eng/super_pacman_parts
 	name = "Super P.A.C.M.A.N. portable generator parts"
 	cost = 35
 	containername = "Super P.A.C.M.A.N. portable generator construction kit"
@@ -243,7 +243,7 @@
 			/obj/item/weapon/circuitboard/pacman/super
 			)
 
-/datum/supply_packs/eng/fusion_core
+/datum/supply_pack/eng/fusion_core
 	name = "R-UST Mk. 8 Tokamak fusion core crate"
 	cost = 50
 	containername = "R-UST Mk. 8 Tokamak Fusion Core crate"
@@ -255,7 +255,7 @@
 			/obj/item/weapon/circuitboard/fusion_core
 			)
 
-/datum/supply_packs/eng/fusion_fuel_injector
+/datum/supply_pack/eng/fusion_fuel_injector
 	name = "R-UST Mk. 8 fuel injector crate"
 	cost = 30
 	containername = "R-UST Mk. 8 fuel injector crate"
@@ -267,7 +267,7 @@
 			/obj/item/weapon/circuitboard/fusion_injector
 			)
 
-/datum/supply_packs/eng/gyrotron
+/datum/supply_pack/eng/gyrotron
 	name = "Gyrotron crate"
 	cost = 15
 	containername = "Gyrotron Crate"
@@ -278,14 +278,14 @@
 			/obj/item/weapon/circuitboard/gyrotron
 			)
 
-/datum/supply_packs/eng/fusion_fuel_compressor
+/datum/supply_pack/eng/fusion_fuel_compressor
 	name = "Fusion Fuel Compressor circuitry crate"
 	cost = 10
 	containername = "Fusion Fuel Compressor circuitry crate"
 	containertype = /obj/structure/closet/crate/engineering
 	contains = list(/obj/item/weapon/circuitboard/fusion_fuel_compressor)
 
-/datum/supply_packs/eng/tritium
+/datum/supply_pack/eng/tritium
 	name = "Tritium crate"
 	cost = 75
 	containername = "Tritium crate"

code/datums/supplypacks/hospitality.dm

@@ -4,10 +4,10 @@
 */
 
 
-/datum/supply_packs/hospitality
+/datum/supply_pack/hospitality
 	group = "Hospitality"
 
-/datum/supply_packs/hospitality/party
+/datum/supply_pack/hospitality/party
 	name = "Party equipment"
 	contains = list(
 			/obj/item/weapon/storage/box/mixedglasses = 2,
@@ -26,7 +26,7 @@
 	containertype = /obj/structure/closet/crate
 	containername = "Party equipment"
 
-/datum/supply_packs/hospitality/barsupplies
+/datum/supply_pack/hospitality/barsupplies
 	name = "Bar supplies"
 	contains = list(
 			/obj/item/weapon/storage/box/glasses/cocktail,
@@ -46,10 +46,10 @@
 	containertype = /obj/structure/closet/crate
 	containername = "crate of bar supplies"
 
-/datum/supply_packs/randomised/hospitality/
+/datum/supply_pack/randomised/hospitality/
 	group = "Hospitality"
 
-/datum/supply_packs/randomised/hospitality/pizza
+/datum/supply_pack/randomised/hospitality/pizza
 	num_contained = 5
 	contains = list(
 			/obj/item/pizzabox/margherita,
@@ -62,7 +62,7 @@
 	containertype = /obj/structure/closet/crate/freezer
 	containername = "Pizza crate"
 
-/datum/supply_packs/hospitality/gifts
+/datum/supply_pack/hospitality/gifts
 	name = "Gift crate"
 	contains = list(
 		/obj/item/toy/bouquet = 3,

code/datums/supplypacks/hydroponics.dm

@@ -4,45 +4,45 @@
 */
 
 
-/datum/supply_packs/hydro
+/datum/supply_pack/hydro
 	group = "Hydroponics"
 
-/datum/supply_packs/hydro/monkey
+/datum/supply_pack/hydro/monkey
 	name = "Monkey crate"
 	contains = list (/obj/item/weapon/storage/box/monkeycubes)
 	cost = 20
 	containertype = /obj/structure/closet/crate/freezer
 	containername = "Monkey crate"
 
-/datum/supply_packs/hydro/farwa
+/datum/supply_pack/hydro/farwa
 	name = "Farwa crate"
 	contains = list (/obj/item/weapon/storage/box/monkeycubes/farwacubes)
 	cost = 20
 	containertype = /obj/structure/closet/crate/freezer
 	containername = "Farwa crate"
 
-/datum/supply_packs/hydro/neara
+/datum/supply_pack/hydro/neara
 	name = "Neaera crate"
 	contains = list (/obj/item/weapon/storage/box/monkeycubes/neaeracubes)
 	cost = 20
 	containertype = /obj/structure/closet/crate/freezer
 	containername = "Neaera crate"
 
-/datum/supply_packs/hydro/stok
+/datum/supply_pack/hydro/stok
 	name = "Stok crate"
 	contains = list (/obj/item/weapon/storage/box/monkeycubes/stokcubes)
 	cost = 20
 	containertype = /obj/structure/closet/crate/freezer
 	containername = "Stok crate"
 
-/datum/supply_packs/hydro/lisa
+/datum/supply_pack/hydro/lisa
 	name = "Corgi Crate"
 	contains = list()
 	cost = 50
 	containertype = /obj/structure/largecrate/animal/corgi
 	containername = "Corgi Crate"
 
-/datum/supply_packs/hydro/hydroponics
+/datum/supply_pack/hydro/hydroponics
 	name = "Hydroponics Supply Crate"
 	contains = list(
 			/obj/item/weapon/reagent_containers/spray/plantbgone = 4,
@@ -60,28 +60,28 @@
 	containername = "Hydroponics crate"
 	access = access_hydroponics
 
-/datum/supply_packs/hydro/cow
+/datum/supply_pack/hydro/cow
 	name = "Cow crate"
 	cost = 25
 	containertype = /obj/structure/largecrate/animal/cow
 	containername = "Cow crate"
 	access = access_hydroponics
 
-/datum/supply_packs/hydro/goat
+/datum/supply_pack/hydro/goat
 	name = "Goat crate"
 	cost = 25
 	containertype = /obj/structure/largecrate/animal/goat
 	containername = "Goat crate"
 	access = access_hydroponics
 
-/datum/supply_packs/hydro/chicken
+/datum/supply_pack/hydro/chicken
 	name = "Chicken crate"
 	cost = 25
 	containertype = /obj/structure/largecrate/animal/chick
 	containername = "Chicken crate"
 	access = access_hydroponics
 
-/datum/supply_packs/hydro/seeds
+/datum/supply_pack/hydro/seeds
 	name = "Seeds crate"
 	contains = list(
 			/obj/item/seeds/chiliseed,
@@ -107,7 +107,7 @@
 	containername = "Seeds crate"
 	access = access_hydroponics
 
-/datum/supply_packs/hydro/weedcontrol
+/datum/supply_pack/hydro/weedcontrol
 	name = "Weed control crate"
 	contains = list(
 			/obj/item/weapon/material/knife/machete/hatchet = 2,
@@ -121,14 +121,14 @@
 	containername = "Weed control crate"
 	access = access_hydroponics
 
-/datum/supply_packs/hydro/watertank
+/datum/supply_pack/hydro/watertank
 	name = "Water tank crate"
 	contains = list(/obj/structure/reagent_dispensers/watertank)
 	cost = 10
 	containertype = /obj/structure/largecrate
 	containername = "water tank crate"
 
-/datum/supply_packs/hydro/bee_keeper
+/datum/supply_pack/hydro/bee_keeper
 	name = "Beekeeping crate"
 	contains = list(
 			/obj/item/beehive_assembly,
@@ -141,7 +141,7 @@
 	containername = "Beekeeping crate"
 	access = access_hydroponics
 
-/datum/supply_packs/hydro/tray
+/datum/supply_pack/hydro/tray
 	name = "Empty hydroponics trays"
 	cost = 50
 	containertype = /obj/structure/closet/crate/hydroponics

code/datums/supplypacks/materials.dm

@@ -4,45 +4,45 @@
 */
 
 
-/datum/supply_packs/materials
+/datum/supply_pack/materials
 	group = "Materials"
 
-/datum/supply_packs/materials/metal50
+/datum/supply_pack/materials/metal50
 	name = "50 metal sheets"
 	contains = list(/obj/fiftyspawner/steel)
 	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "Metal sheets crate"
 
-/datum/supply_packs/materials/glass50
+/datum/supply_pack/materials/glass50
 	name = "50 glass sheets"
 	contains = list(/obj/fiftyspawner/glass)
 	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "Glass sheets crate"
 
-/datum/supply_packs/materials/wood50
+/datum/supply_pack/materials/wood50
 	name = "50 wooden planks"
 	contains = list(/obj/fiftyspawner/wood)
 	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "Wooden planks crate"
 
-/datum/supply_packs/materials/plastic50
+/datum/supply_pack/materials/plastic50
 	name = "50 plastic sheets"
 	contains = list(/obj/fiftyspawner/plastic)
 	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "Plastic sheets crate"
 
-/datum/supply_packs/materials/cardboard_sheets
+/datum/supply_pack/materials/cardboard_sheets
 	contains = list(/obj/fiftyspawner/cardboard)
 	name = "50 cardboard sheets"
 	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "Cardboard sheets crate"
 
-/datum/supply_packs/materials/carpet
+/datum/supply_pack/materials/carpet
 	name = "Imported carpet"
 	containertype = /obj/structure/closet/crate
 	containername = "Imported carpet crate"
@@ -53,7 +53,7 @@
 					)
 
 
-/datum/supply_packs/misc/linoleum
+/datum/supply_pack/misc/linoleum
 	name = "Linoleum"
 	containertype = /obj/structure/closet/crate
 	containername = "Linoleum crate"

code/datums/supplypacks/medical.dm

@@ -4,10 +4,10 @@
 */
 
 
-/datum/supply_packs/med
+/datum/supply_pack/med
 	group = "Medical"
 
-/datum/supply_packs/med/medical
+/datum/supply_pack/med/medical
 	name = "Medical crate"
 	contains = list(
 			/obj/item/weapon/storage/firstaid/regular,
@@ -25,28 +25,28 @@
 	containertype = /obj/structure/closet/crate/medical
 	containername = "Medical crate"
 
-/datum/supply_packs/med/bloodpack
+/datum/supply_pack/med/bloodpack
 	name = "BloodPack crate"
 	contains = list(/obj/item/weapon/storage/box/bloodpacks = 3)
 	cost = 10
 	containertype = /obj/structure/closet/crate/medical
 	containername = "BloodPack crate"
 
-/datum/supply_packs/med/bodybag
+/datum/supply_pack/med/bodybag
 	name = "Body bag crate"
 	contains = list(/obj/item/weapon/storage/box/bodybags = 3)
 	cost = 10
 	containertype = /obj/structure/closet/crate/medical
 	containername = "Body bag crate"
 
-/datum/supply_packs/med/cryobag
+/datum/supply_pack/med/cryobag
 	name = "Stasis bag crate"
 	contains = list(/obj/item/bodybag/cryobag = 3)
 	cost = 40
 	containertype = /obj/structure/closet/crate/medical
 	containername = "Stasis bag crate"
 
-/datum/supply_packs/med/surgery
+/datum/supply_pack/med/surgery
 	name = "Surgery crate"
 	contains = list(
 			/obj/item/weapon/surgical/cautery,
@@ -66,7 +66,7 @@
 	containername = "Surgery crate"
 	access = access_medical
 
-/datum/supply_packs/med/deathalarm
+/datum/supply_pack/med/deathalarm
 	name = "Death Alarm crate"
 	contains = list(
 			/obj/item/weapon/storage/box/cdeathalarm_kit,
@@ -77,7 +77,7 @@
 	containername = "Death Alarm crate"
 	access = access_medical
 
-/datum/supply_packs/med/clotting
+/datum/supply_pack/med/clotting
 	name = "Clotting Medicine crate"
 	contains = list(
 			/obj/item/weapon/storage/firstaid/clotting
@@ -87,7 +87,7 @@
 	containername = "Clotting Medicine crate"
 	access = access_medical
 
-/datum/supply_packs/med/sterile
+/datum/supply_pack/med/sterile
 	name = "Sterile equipment crate"
 	contains = list(
 			/obj/item/clothing/under/rank/medical/scrubs/green = 2,
@@ -100,7 +100,7 @@
 	containertype = "/obj/structure/closet/crate"
 	containername = "Sterile equipment crate"
 
-/datum/supply_packs/med/extragear
+/datum/supply_pack/med/extragear
 	name = "Medical surplus equipment"
 	contains = list(
 			/obj/item/weapon/storage/belt/medical = 3,
@@ -113,7 +113,7 @@
 	containername = "Medical surplus equipment"
 	access = access_medical
 
-/datum/supply_packs/med/cmogear
+/datum/supply_pack/med/cmogear
 	name = "Chief medical officer equipment"
 	contains = list(
 			/obj/item/weapon/storage/belt/medical,
@@ -137,7 +137,7 @@
 	containername = "Chief medical officer equipment"
 	access = access_cmo
 
-/datum/supply_packs/med/doctorgear
+/datum/supply_pack/med/doctorgear
 	name = "Medical Doctor equipment"
 	contains = list(
 			/obj/item/weapon/storage/belt/medical,
@@ -160,7 +160,7 @@
 	containername = "Medical Doctor equipment"
 	access = access_medical_equip
 
-/datum/supply_packs/med/chemistgear
+/datum/supply_pack/med/chemistgear
 	name = "Chemist equipment"
 	contains = list(
 			/obj/item/weapon/storage/box/beakers,
@@ -183,7 +183,7 @@
 	containername = "Chemist equipment"
 	access = access_chemistry
 
-/datum/supply_packs/med/paramedicgear
+/datum/supply_pack/med/paramedicgear
 	name = "Paramedic equipment"
 	contains = list(
 			/obj/item/weapon/storage/belt/medical/emt,
@@ -211,7 +211,7 @@
 	containername = "Paramedic equipment"
 	access = access_medical_equip
 
-/datum/supply_packs/med/psychiatristgear
+/datum/supply_pack/med/psychiatristgear
 	name = "Psychiatrist equipment"
 	contains = list(
 			/obj/item/clothing/under/rank/psych,
@@ -230,7 +230,7 @@
 	containername = "Psychiatrist equipment"
 	access = access_psychiatrist
 
-/datum/supply_packs/med/medicalscrubs
+/datum/supply_pack/med/medicalscrubs
 	name = "Medical scrubs"
 	contains = list(
 			/obj/item/clothing/shoes/white = 3,,
@@ -251,7 +251,7 @@
 	containername = "Medical scrubs crate"
 	access = access_medical_equip
 
-/datum/supply_packs/med/autopsy
+/datum/supply_pack/med/autopsy
 	name = "Autopsy equipment"
 	contains = list(
 			/obj/item/weapon/folder/white,
@@ -268,7 +268,7 @@
 	containername = "Autopsy equipment crate"
 	access = access_morgue
 
-/datum/supply_packs/med/medicaluniforms
+/datum/supply_pack/med/medicaluniforms
 	name = "Medical uniforms"
 	contains = list(
 			/obj/item/clothing/shoes/white = 3,
@@ -295,7 +295,7 @@
 	containername = "Medical uniform crate"
 	access = access_medical_equip
 
-/datum/supply_packs/med/medicalbiosuits
+/datum/supply_pack/med/medicalbiosuits
 	name = "Medical biohazard gear"
 	contains = list(
 			/obj/item/clothing/head/bio_hood = 3,
@@ -313,7 +313,7 @@
 	containername = "Medical biohazard equipment"
 	access = access_medical_equip
 
-/datum/supply_packs/med/portablefreezers
+/datum/supply_pack/med/portablefreezers
 	name = "Portable freezers crate"
 	contains = list(/obj/item/weapon/storage/box/freezer = 7)
 	cost = 25
@@ -321,7 +321,7 @@
 	containername = "Portable freezers"
 	access = access_medical_equip
 
-/datum/supply_packs/med/virus
+/datum/supply_pack/med/virus
 	name = "Virus sample crate"
 	contains = list(/obj/item/weapon/virusdish/random = 4)
 	cost = 25
@@ -329,7 +329,7 @@
 	containername = "Virus sample crate"
 	access = access_cmo
 
-/datum/supply_packs/med/defib
+/datum/supply_pack/med/defib
 	name = "Defibrillator crate"
 	contains = list(/obj/item/device/defib_kit = 2)
 	cost = 30

code/datums/supplypacks/misc.dm

@@ -4,14 +4,14 @@
 */
 
 
-/datum/supply_packs/misc
+/datum/supply_pack/misc
 	group = "Miscellaneous"
 
-/datum/supply_packs/randomised/misc
+/datum/supply_pack/randomised/misc
 	group = "Miscellaneous"
 
 
-/datum/supply_packs/randomised/misc/card_packs
+/datum/supply_pack/randomised/misc/card_packs
 	num_contained = 5
 	contains = list(
 			/obj/item/weapon/pack/cardemon,
@@ -23,14 +23,14 @@
 	containertype = /obj/structure/closet/crate
 	containername = "cards crate"
 
-/datum/supply_packs/misc/eftpos
+/datum/supply_pack/misc/eftpos
 	contains = list(/obj/item/device/eftpos)
 	name = "EFTPOS scanner"
 	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "EFTPOS crate"
 
-/datum/supply_packs/misc/chaplaingear
+/datum/supply_pack/misc/chaplaingear
 	name = "Chaplain equipment"
 	contains = list(
 			/obj/item/clothing/under/rank/chaplain,
@@ -48,14 +48,14 @@
 	containertype = "/obj/structure/closet/crate"
 	containername = "Chaplain equipment crate"
 
-/datum/supply_packs/misc/hoverpod
+/datum/supply_pack/misc/hoverpod
 	name = "Hoverpod Shipment"
 	contains = list()
 	cost = 80
 	containertype = /obj/structure/largecrate/hoverpod
 	containername = "Hoverpod Crate"
 
-/datum/supply_packs/randomised/misc/webbing
+/datum/supply_pack/randomised/misc/webbing
 	name = "Webbing crate"
 	num_contained = 4
 	contains = list(
@@ -71,7 +71,7 @@
 	containertype = "/obj/structure/closet/crate"
 	containername = "Webbing crate"
 
-/datum/supply_packs/misc/holoplant
+/datum/supply_pack/misc/holoplant
 	name = "Holoplant Pot"
 	contains = list(/obj/machinery/holoplant/shipped)
 	cost = 15

code/datums/supplypacks/munitions.dm

@@ -3,13 +3,13 @@
 *	related to weapons live.
 */
 
-/datum/supply_packs/munitions
+/datum/supply_pack/munitions
 	group = "Munitions"
 
-/datum/supply_packs/randomised/munitions
+/datum/supply_pack/randomised/munitions
 	group = "Munitions"
 
-/datum/supply_packs/munitions/weapons
+/datum/supply_pack/munitions/weapons
 	name = "Weapons - Security basic equipment"
 	contains = list(
 			/obj/item/device/flash = 2,
@@ -24,7 +24,7 @@
 	containername = "Security equipment crate"
 	access = access_security
 
-/datum/supply_packs/munitions/egunpistol
+/datum/supply_pack/munitions/egunpistol
 	name = "Weapons - Energy sidearms"
 	contains = list(/obj/item/weapon/gun/energy/gun = 2)
 	cost = 40
@@ -32,7 +32,7 @@
 	containername = "Energy sidearms crate"
 	access = access_security
 
-/datum/supply_packs/munitions/flareguns
+/datum/supply_pack/munitions/flareguns
 	name = "Weapons - Flare guns"
 	contains = list(
 			/obj/item/weapon/gun/projectile/sec/flash,
@@ -45,7 +45,7 @@
 	containername = "Flare gun crate"
 	access = access_security
 
-/datum/supply_packs/munitions/eweapons
+/datum/supply_pack/munitions/eweapons
 	name = "Weapons - Experimental weapons crate"
 	contains = list(
 			/obj/item/weapon/gun/energy/xray = 2,
@@ -55,7 +55,7 @@
 	containername = "Experimental weapons crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/energyweapons
+/datum/supply_pack/munitions/energyweapons
 	name = "Weapons - Laser rifle crate"
 	contains = list(/obj/item/weapon/gun/energy/laser = 3)
 	cost = 50
@@ -63,7 +63,7 @@
 	containername = "Energy weapons crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/shotgun
+/datum/supply_pack/munitions/shotgun
 	name = "Weapons - Shotgun crate"
 	contains = list(
 			/obj/item/weapon/storage/box/shotgunammo,
@@ -75,7 +75,7 @@
 	containername = "Shotgun crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/erifle
+/datum/supply_pack/munitions/erifle
 	name = "Weapons - Energy marksman"
 	contains = list(/obj/item/weapon/gun/energy/sniperrifle = 2)
 	cost = 100
@@ -83,7 +83,7 @@
 	containername = "Energy marksman crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/burstlaser
+/datum/supply_pack/munitions/burstlaser
 	name = "Weapons - Burst laser"
 	contains = list(/obj/item/weapon/gun/energy/gun/burst = 2)
 	cost = 50
@@ -91,7 +91,7 @@
 	containername = "Burst laser crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/ionweapons
+/datum/supply_pack/munitions/ionweapons
 	name = "Weapons - Electromagnetic Rifles"
 	contains = list(
 			/obj/item/weapon/gun/energy/ionrifle = 2,
@@ -102,7 +102,7 @@
 	containername = "Electromagnetic weapons crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/ionpistols
+/datum/supply_pack/munitions/ionpistols
 	name = "Weapons - Electromagnetic pistols"
 	contains = list(
 			/obj/item/weapon/gun/energy/ionrifle/pistol = 2,
@@ -113,7 +113,7 @@
 	containername = "Electromagnetic weapons crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/bsmg
+/datum/supply_pack/munitions/bsmg
 	name = "Weapons - Ballistic SMGs"
 	contains = list(/obj/item/weapon/gun/projectile/automatic/wt550 = 2)
 	cost = 50
@@ -121,7 +121,7 @@
 	containername = "Ballistic weapon crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/brifle
+/datum/supply_pack/munitions/brifle
 	name = "Weapons - Ballistic Rifles"
 	contains = list(/obj/item/weapon/gun/projectile/automatic/z8 = 2)
 	cost = 80
@@ -129,7 +129,7 @@
 	containername = "Ballistic weapon crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/bolt_rifles_competitive
+/datum/supply_pack/munitions/bolt_rifles_competitive
  	name = "Weapons - Competitive shooting rifles"
  	contains = list(
  			/obj/item/device/assembly/timer,
@@ -144,7 +144,7 @@
  	containername = "Ballistic weapons crate"
  	access = access_security
 
-/datum/supply_packs/munitions/shotgunammo
+/datum/supply_pack/munitions/shotgunammo
 	name = "Ammunition - Shotgun shells"
 	contains = list(
 			/obj/item/weapon/storage/box/shotgunammo = 2,
@@ -155,7 +155,7 @@
 	containername = "Ballistic ammunition crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/beanbagammo
+/datum/supply_pack/munitions/beanbagammo
 	name = "Ammunition - Beanbag shells"
 	contains = list(/obj/item/weapon/storage/box/beanbags = 3)
 	cost = 25
@@ -163,7 +163,7 @@
 	containername = "Ballistic ammunition crate"
 	access = null
 
-/datum/supply_packs/munitions/bsmgammo
+/datum/supply_pack/munitions/bsmgammo
 	name = "Ammunition - 9mm top mounted lethal"
 	contains = list(/obj/item/ammo_magazine/m9mmt = 6)
 	cost = 25
@@ -171,7 +171,7 @@
 	containername = "Ballistic ammunition crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/bsmgammorubber
+/datum/supply_pack/munitions/bsmgammorubber
 	name = "Ammunition - 9mm top mounted rubber"
 	contains = list(/obj/item/ammo_magazine/m9mmt/rubber = 6)
 	cost = 25
@@ -179,7 +179,7 @@
 	containername = "Ballistic ammunition crate"
 	access = access_security
 
-/datum/supply_packs/munitions/brifleammo
+/datum/supply_pack/munitions/brifleammo
 	name = "Ammunition - 7.62mm lethal"
 	contains = list(/obj/item/ammo_magazine/m762 = 6)
 	cost = 25
@@ -187,7 +187,7 @@
 	containername = "Ballistic ammunition crate"
 	access = access_armory
 
-/datum/supply_packs/munitions/pcellammo
+/datum/supply_pack/munitions/pcellammo
 	name = "Ammunition - Power cell"
 	contains = list(/obj/item/weapon/cell/device/weapon = 3)
 	cost = 50

code/datums/supplypacks/recreation.dm

@@ -4,14 +4,14 @@
 */
 
 
-/datum/supply_packs/recreation
+/datum/supply_pack/recreation
 	group = "Recreation"
 
-/datum/supply_packs/randomised/recreation
+/datum/supply_pack/randomised/recreation
 	group = "Recreation"
 	access = access_security
 
-/datum/supply_packs/recreation/foam_weapons
+/datum/supply_pack/recreation/foam_weapons
 	name = "Foam Weapon Crate"
 	contains = list(
 			/obj/item/weapon/material/sword/foam = 2,
@@ -23,7 +23,7 @@
 	containertype = /obj/structure/closet/crate
 	containername = "foam weapon crate"
 
-/datum/supply_packs/recreation/lasertag
+/datum/supply_pack/recreation/lasertag
 	name = "Lasertag equipment"
 	contains = list(
 			/obj/item/weapon/gun/energy/lasertag/red,
@@ -35,7 +35,7 @@
 	containername = "Lasertag Closet"
 	cost = 10
 
-/datum/supply_packs/recreation/artscrafts
+/datum/supply_pack/recreation/artscrafts
 	name = "Arts and Crafts supplies"
 	contains = list(
 			/obj/item/weapon/storage/fancy/crayons,
@@ -58,7 +58,7 @@
 	containertype = "/obj/structure/closet/crate"
 	containername = "Arts and Crafts crate"
 
-/datum/supply_packs/recreation/painters
+/datum/supply_pack/recreation/painters
 	name = "Station Painting Supplies"
 	cost = 10
 	containername = "station painting supplies crate"

code/datums/supplypacks/robotics.dm

@@ -4,14 +4,14 @@
 */
 
 
-/datum/supply_packs/robotics
+/datum/supply_pack/robotics
 	group = "Robotics"
 
-/datum/supply_packs/randomised/robotics
+/datum/supply_pack/randomised/robotics
 	group = "Robotics"
 	access = access_robotics
 
-/datum/supply_packs/robotics/robotics_assembly
+/datum/supply_pack/robotics/robotics_assembly
 	name = "Robotics assembly crate"
 	contains = list(
 			/obj/item/device/assembly/prox_sensor = 3,
@@ -24,7 +24,7 @@
 	containername = "Robotics assembly"
 	access = access_robotics
 
-/*/datum/supply_packs/robotics/robolimbs_basic
+/*/datum/supply_pack/robotics/robolimbs_basic
 	name = "Basic robolimb blueprints"
 	contains = list(
 			/obj/item/weapon/disk/limb/morpheus,
@@ -35,7 +35,7 @@
 	containername = "Robolimb blueprints (basic)"
 	access = access_robotics
 
-/datum/supply_packs/robotics/robolimbs_adv
+/datum/supply_pack/robotics/robolimbs_adv
 	name = "All robolimb blueprints"
 	contains = list(
 	/obj/item/weapon/disk/limb/bishop,
@@ -52,7 +52,7 @@
 	access = access_robotics
 */
 
-/datum/supply_packs/robotics/robolimbs/morpheus
+/datum/supply_pack/robotics/robolimbs/morpheus
 	name = "Morpheus robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/morpheus)
 	cost = 20
@@ -60,7 +60,7 @@
 	containername = "Robolimb blueprints (Morpheus)"
 	access = access_robotics
 
-/datum/supply_packs/robotics/robolimbs/cybersolutions
+/datum/supply_pack/robotics/robolimbs/cybersolutions
 	name = "Cyber Solutions robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/cybersolutions)
 	cost = 20
@@ -68,7 +68,7 @@
 	containername = "Robolimb blueprints (Cyber Solutions)"
 	access = access_robotics
 
-/datum/supply_packs/robotics/robolimbs/xion
+/datum/supply_pack/robotics/robolimbs/xion
 	name = "Xion robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/xion)
 	cost = 20
@@ -76,7 +76,7 @@
 	containername = "Robolimb blueprints (Xion)"
 	access = access_robotics
 
-/datum/supply_packs/robotics/robolimbs/grayson
+/datum/supply_pack/robotics/robolimbs/grayson
 	name = "Grayson robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/grayson)
 	cost = 30
@@ -84,7 +84,7 @@
 	containername = "Robolimb blueprints (Grayson)"
 	access = access_robotics
 
-/datum/supply_packs/robotics/robolimbs/hephaestus
+/datum/supply_pack/robotics/robolimbs/hephaestus
 	name = "Hephaestus robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/hephaestus)
 	cost = 35
@@ -92,7 +92,7 @@
 	containername = "Robolimb blueprints (Hephaestus)"
 	access = access_robotics
 
-/datum/supply_packs/robotics/robolimbs/wardtakahashi
+/datum/supply_pack/robotics/robolimbs/wardtakahashi
 	name = "Ward-Takahashi robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/wardtakahashi)
 	cost = 35
@@ -100,7 +100,7 @@
 	containername = "Robolimb blueprints (Ward-Takahashi)"
 	access = access_robotics
 
-/datum/supply_packs/robotics/robolimbs/zenghu
+/datum/supply_pack/robotics/robolimbs/zenghu
 	name = "Zeng Hu robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/zenghu)
 	cost = 35
@@ -108,7 +108,7 @@
 	containername = "Robolimb blueprints (Zeng Hu)"
 	access = access_robotics
 
-/datum/supply_packs/robotics/robolimbs/bishop
+/datum/supply_pack/robotics/robolimbs/bishop
 	name = "Bishop robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/bishop)
 	cost = 70
@@ -116,7 +116,7 @@
 	containername = "Robolimb blueprints (Bishop)"
 	access = access_robotics
 
-/datum/supply_packs/robotics/mecha_ripley
+/datum/supply_pack/robotics/mecha_ripley
 	name = "Circuit Crate (\"Ripley\" APLU)"
 	contains = list(
 			/obj/item/weapon/book/manual/ripley_build_and_repair,
@@ -128,7 +128,7 @@
 	containername = "APLU \"Ripley\" Circuit Crate"
 	access = access_robotics
 
-/datum/supply_packs/robotics/mecha_odysseus
+/datum/supply_pack/robotics/mecha_odysseus
 	name = "Circuit Crate (\"Odysseus\")"
 	contains = list(
 			/obj/item/weapon/circuitboard/mecha/odysseus/peripherals,
@@ -139,7 +139,7 @@
 	containername = "\"Odysseus\" Circuit Crate"
 	access = access_robotics
 
-/datum/supply_packs/randomised/robotics/exosuit_mod
+/datum/supply_pack/randomised/robotics/exosuit_mod
 	num_contained = 1
 	contains = list(
 			/obj/item/device/kit/paint/ripley,
@@ -152,7 +152,7 @@
 	containertype = /obj/structure/closet/crate/science
 	containername = "heavy crate"
 
-/datum/supply_packs/randomised/robotics/exosuit_mod/durand
+/datum/supply_pack/randomised/robotics/exosuit_mod/durand
 	contains = list(
 			/obj/item/device/kit/paint/durand,
 			/obj/item/device/kit/paint/durand/seraph,
@@ -160,7 +160,7 @@
 			)
 	name = "Random Durand exosuit modkit"
 
-/datum/supply_packs/randomised/robotics/exosuit_mod/gygax
+/datum/supply_pack/randomised/robotics/exosuit_mod/gygax
 	contains = list(
 			/obj/item/device/kit/paint/gygax,
 			/obj/item/device/kit/paint/gygax/darkgygax,
@@ -168,7 +168,7 @@
 			)
 	name = "Random Gygax exosuit modkit"
 
-/datum/supply_packs/robotics/jumper_cables
+/datum/supply_pack/robotics/jumper_cables
 	name = "Jumper kit crate"
 	contains = list(
 			/obj/item/device/defib_kit/jumper_kit = 2

code/datums/supplypacks/science.dm

@@ -2,17 +2,17 @@
 *	Here is where any supply packs
 *	related to security tasks live
 */
-/datum/supply_packs/sci
+/datum/supply_pack/sci
 	group = "Science"
 
-/datum/supply_packs/sci/coolanttank
+/datum/supply_pack/sci/coolanttank
 	name = "Coolant tank crate"
 	contains = list(/obj/structure/reagent_dispensers/coolanttank)
 	cost = 15
 	containertype = /obj/structure/largecrate
 	containername = "coolant tank crate"
 
-/datum/supply_packs/sci/phoron
+/datum/supply_pack/sci/phoron
 	name = "Phoron research crate"
 	contains = list(
 			/obj/item/weapon/tank/phoron = 3,
@@ -28,7 +28,7 @@
 	containername = "Phoron assembly crate"
 	access = access_tox_storage
 
-/datum/supply_packs/sci/exoticseeds
+/datum/supply_pack/sci/exoticseeds
 	name = "Exotic seeds crate"
 	contains = list(
 			/obj/item/seeds/replicapod = 2,
@@ -43,14 +43,14 @@
 	containername = "Exotic Seeds crate"
 	access = access_hydroponics
 
-/datum/supply_packs/sci/integrated_circuit_printer
+/datum/supply_pack/sci/integrated_circuit_printer
 	name = "Integrated circuit printer"
 	contains = list(/obj/item/device/integrated_circuit_printer = 2)
 	cost = 15
 	containertype = /obj/structure/closet/crate
 	containername = "Integrated circuit crate"
 
-/datum/supply_packs/sci/integrated_circuit_printer_upgrade
+/datum/supply_pack/sci/integrated_circuit_printer_upgrade
 	name = "Integrated circuit printer upgrade - advanced designs"
 	contains = list(/obj/item/weapon/disk/integrated_circuit/upgrade/advanced)
 	cost = 30

code/datums/supplypacks/security.dm

@@ -4,15 +4,15 @@
 */
 
 
-/datum/supply_packs/security
+/datum/supply_pack/security
 	group = "Security"
 	access = access_security
 
-/datum/supply_packs/randomised/security
+/datum/supply_pack/randomised/security
 	group = "Security"
 	access = access_security
 
-/datum/supply_packs/randomised/security/armor
+/datum/supply_pack/randomised/security/armor
 	name = "Armor - Security armor"
 	num_contained = 5
 	contains = list(
@@ -32,7 +32,7 @@
 	containertype = /obj/structure/closet/crate/secure/gear
 	containername = "Armor crate"
 
-/datum/supply_packs/security/riot_gear
+/datum/supply_pack/security/riot_gear
 	name = "Gear - Riot"
 	contains = list(
 			/obj/item/weapon/melee/baton = 3,
@@ -47,7 +47,7 @@
 	containername = "Riot gear crate"
 	access = access_armory
 
-/datum/supply_packs/security/riot_armor
+/datum/supply_pack/security/riot_armor
 	name = "Armor - Riot"
 	contains = list(
 			/obj/item/clothing/head/helmet/riot,
@@ -60,7 +60,7 @@
 	containername = "Riot armor crate"
 	access = access_armory
 
-/datum/supply_packs/security/ablative_armor
+/datum/supply_pack/security/ablative_armor
 	name = "Armor - Ablative"
 	contains = list(
 			/obj/item/clothing/head/helmet/laserproof,
@@ -73,7 +73,7 @@
 	containername = "Ablative armor crate"
 	access = access_armory
 
-/datum/supply_packs/security/bullet_resistant_armor
+/datum/supply_pack/security/bullet_resistant_armor
 	name = "Armor - Ballistic"
 	contains = list(
 			/obj/item/clothing/head/helmet/bulletproof,
@@ -86,7 +86,7 @@
 	containername = "Ballistic armor crate"
 	access = access_armory
 
-/datum/supply_packs/security/combat_armor
+/datum/supply_pack/security/combat_armor
 	name = "Armor - Combat"
 	contains = list(
 			/obj/item/clothing/head/helmet/combat,
@@ -99,7 +99,7 @@
 	containername = "Combat armor crate"
 	access = access_armory
 
-/datum/supply_packs/security/tactical
+/datum/supply_pack/security/tactical
 	name = "Armor - Tactical"
 	containertype = /obj/structure/closet/crate/secure/gear
 	containername = "Tactical armor crate"
@@ -124,7 +124,7 @@
 			/obj/item/clothing/gloves/black
 			)
 
-/datum/supply_packs/security/securitybarriers
+/datum/supply_pack/security/securitybarriers
 	name = "Misc - Security Barriers"
 	contains = list(/obj/machinery/deployable/barrier = 4)
 	cost = 20
@@ -132,7 +132,7 @@
 	containername = "Security barrier crate"
 	access = null
 
-/datum/supply_packs/security/securityshieldgen
+/datum/supply_pack/security/securityshieldgen
 	name = "Misc - Wall shield generators"
 	contains = list(/obj/machinery/shieldwallgen = 4)
 	cost = 20
@@ -140,7 +140,7 @@
 	containername = "Wall shield generators crate"
 	access = access_teleporter
 
-/datum/supply_packs/randomised/security/holster
+/datum/supply_pack/randomised/security/holster
 	name = "Gear - Holsters"
 	num_contained = 4
 	contains = list(
@@ -153,7 +153,7 @@
 	containertype = /obj/structure/closet/crate
 	containername = "Holster crate"
 
-/datum/supply_packs/security/extragear
+/datum/supply_pack/security/extragear
 	name = "Gear - Security surplus equipment"
 	contains = list(
 			/obj/item/weapon/storage/belt/security = 3,
@@ -165,7 +165,7 @@
 	containertype = /obj/structure/closet/crate
 	containername = "Security surplus equipment"
 
-/datum/supply_packs/security/detectivegear
+/datum/supply_pack/security/detectivegear
 	name = "Forensic - Investigation equipment"
 	contains = list(
 			/obj/item/weapon/storage/box/evidence = 2,
@@ -192,7 +192,7 @@
 	containername = "Forensic equipment"
 	access = access_forensics_lockers
 
-/datum/supply_packs/security/detectiveclothes
+/datum/supply_pack/security/detectiveclothes
 	name = "Forensic - Investigation apparel"
 	contains = list(
 			/obj/item/clothing/under/det/black = 2,
@@ -214,7 +214,7 @@
 	containername = "Investigation clothing"
 	access = access_forensics_lockers
 
-/datum/supply_packs/security/officergear
+/datum/supply_pack/security/officergear
 	name = "Gear - Officer equipment"
 	contains = list(
 			/obj/item/clothing/suit/storage/vest/officer,
@@ -244,7 +244,7 @@
 	containername = "Officer equipment"
 	access = access_brig
 
-/datum/supply_packs/security/wardengear
+/datum/supply_pack/security/wardengear
 	name = "Gear - Warden equipment"
 	contains = list(
 			/obj/item/clothing/suit/storage/vest/warden,
@@ -272,7 +272,7 @@
 	containername = "Warden equipment"
 	access = access_armory
 
-/datum/supply_packs/security/headofsecgear
+/datum/supply_pack/security/headofsecgear
 	name = "Gear - Head of security equipment"
 	contains = list(
 			/obj/item/clothing/head/helmet/HoS,
@@ -298,7 +298,7 @@
 	containername = "Head of security equipment"
 	access = access_hos
 
-/datum/supply_packs/security/securityclothing
+/datum/supply_pack/security/securityclothing
 	name = "Misc - Security uniform red"
 	contains = list(
 			/obj/item/weapon/storage/backpack/satchel/sec = 2,
@@ -316,7 +316,7 @@
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Security uniform crate"
 
-/datum/supply_packs/security/navybluesecurityclothing
+/datum/supply_pack/security/navybluesecurityclothing
 	name = "Misc - Security uniform navy blue"
 	contains = list(
 			/obj/item/weapon/storage/backpack/satchel/sec = 2,
@@ -337,7 +337,7 @@
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Navy blue security uniform crate"
 
-/datum/supply_packs/security/corporatesecurityclothing
+/datum/supply_pack/security/corporatesecurityclothing
 	name = "Misc - Security uniform corporate"
 	contains = list(
 			/obj/item/weapon/storage/backpack/satchel/sec = 2,
@@ -357,7 +357,7 @@
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Corporate security uniform crate"
 
-/datum/supply_packs/security/biosuit
+/datum/supply_pack/security/biosuit
 	name = "Gear - Security biohazard gear"
 	contains = list(
 			/obj/item/clothing/head/bio_hood/security = 3,

code/datums/supplypacks/supply.dm

@@ -3,10 +3,10 @@
 *	related to civilian tasks live
 */
 
-/datum/supply_packs/supply
+/datum/supply_pack/supply
 	group = "Supplies"
 
-/datum/supply_packs/supply/food
+/datum/supply_pack/supply/food
 	name = "Kitchen supply crate"
 	contains = list(
 			/obj/item/weapon/reagent_containers/food/condiment/flour = 6,
@@ -20,14 +20,14 @@
 	containertype = /obj/structure/closet/crate/freezer
 	containername = "Food crate"
 
-/datum/supply_packs/supply/toner
+/datum/supply_pack/supply/toner
 	name = "Toner cartridges"
 	contains = list(/obj/item/device/toner = 6)
 	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "Toner cartridges"
 
-/datum/supply_packs/supply/janitor
+/datum/supply_pack/supply/janitor
 	name = "Janitorial supplies"
 	contains = list(
 			/obj/item/weapon/reagent_containers/glass/bucket,
@@ -50,7 +50,7 @@
 	containertype = /obj/structure/closet/crate
 	containername = "Janitorial supplies"
 
-/datum/supply_packs/supply/shipping
+/datum/supply_pack/supply/shipping
 	name = "Shipping supplies"
 	contains = list(
 				/obj/fiftyspawner/cardboard,
@@ -64,7 +64,7 @@
 	containertype = "/obj/structure/closet/crate"
 	containername = "Shipping supplies crate"
 
-/datum/supply_packs/supply/bureaucracy
+/datum/supply_pack/supply/bureaucracy
 	contains = list(
 			/obj/item/weapon/clipboard = 2,
 			/obj/item/weapon/pen/red,
@@ -84,14 +84,14 @@
 	containertype = /obj/structure/closet/crate
 	containername = "Office supplies crate"
 
-/datum/supply_packs/supply/spare_pda
+/datum/supply_pack/supply/spare_pda
 	name = "Spare PDAs"
 	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "Spare PDA crate"
 	contains = list(/obj/item/device/pda = 3)
 
-/datum/supply_packs/supply/minergear
+/datum/supply_pack/supply/minergear
 	name = "Shaft miner equipment"
 	contains = list(
 			/obj/item/weapon/storage/backpack/industrial,
@@ -115,21 +115,21 @@
 	containername = "Shaft miner equipment"
 	access = access_mining
 
-/datum/supply_packs/supply/mule
+/datum/supply_pack/supply/mule
 	name = "Mulebot Crate"
 	contains = list()
 	cost = 20
 	containertype = /obj/structure/largecrate/animal/mulebot
 	containername = "Mulebot Crate"
 
-/datum/supply_packs/supply/cargotrain
+/datum/supply_pack/supply/cargotrain
 	name = "Cargo Train Tug"
 	contains = list(/obj/vehicle/train/cargo/engine)
 	cost = 35
 	containertype = /obj/structure/largecrate
 	containername = "Cargo Train Tug Crate"
 
-/datum/supply_packs/supply/cargotrailer
+/datum/supply_pack/supply/cargotrailer
 	name = "Cargo Train Trolley"
 	contains = list(/obj/vehicle/train/cargo/trolley)
 	cost = 15

code/datums/supplypacks/supplypacks.dm

@@ -4,6 +4,7 @@
 //ANOTER NOTE: Contraband is obtainable through modified supplycomp circuitboards.
 //BIG NOTE: Don't add living things to crates, that's bad, it will break the shuttle.
 //NEW NOTE: Do NOT set the price of any crates below 7 points. Doing so allows infinite points.
+//NOTE NOTE: Hidden var is now deprecated, whoever removed support for it should've removed the var altogether
 
 //var/list/all_supply_groups = list("Operations","Security","Hospitality","Engineering","Atmospherics","Medical","Reagents","Reagent Cartridges","Science","Hydroponics", "Supply", "Miscellaneous")
 var/list/all_supply_groups = list("Atmospherics",
@@ -24,30 +25,35 @@ var/list/all_supply_groups = list("Atmospherics",
 								  "Supplies",
 								  "Voidsuits")
 
-/datum/supply_packs
+/datum/supply_pack
 	var/name = null
-	var/list/contains = list()
-	var/manifest = ""
+	var/list/contains = list() // Typepaths, used to actually spawn the contents
+	var/list/manifest = list() // Object names, used to compile manifests
 	var/cost = null
 	var/containertype = null
 	var/containername = null
 	var/access = null
-	var/hidden = 0
 	var/contraband = 0
+	var/num_contained = 0		//number of items picked to be contained in a /randomised crate
 	var/group = "Miscellaneous"
 
-/datum/supply_packs/New()
-	manifest += "<ul>"
+/datum/supply_pack/New()
 	for(var/path in contains)
 		if(!path || !ispath(path, /atom))
 			continue
 		var/atom/O = path
-		manifest += "<li>[initial(O.name)]</li>"
-	manifest += "</ul>"
+		manifest += "\proper[initial(O.name)]"
 
-/datum/supply_packs/randomised
-	var/num_contained		//number of items picked to be contained in a randomised crate
+/datum/supply_pack/proc/get_html_manifest()
+	var/dat = ""
+	if(num_contained)
+		dat +="Contains any [num_contained] of:"
+	dat += "<ul>"
+	for(var/O in manifest)
+		dat += "<li>[O]</li>"
+	dat += "</ul>"
+	return dat
 
-/datum/supply_packs/randomised/New()
-	manifest += "Contains any [num_contained] of:"
-	..()
+// Keeping this subtype here for posterity, so it's more apparent that this is the subtype to use if making new randomised packs
+/datum/supply_pack/randomised
+	num_contained = 1

code/datums/supplypacks/voidsuits.dm

@@ -4,10 +4,10 @@
 */
 
 
-/datum/supply_packs/voidsuits
+/datum/supply_pack/voidsuits
 	group = "Voidsuits"
 
-/datum/supply_packs/voidsuits/atmos
+/datum/supply_pack/voidsuits/atmos
 	name = "Atmospheric voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/atmos = 2,
@@ -21,7 +21,7 @@
 	containername = "Atmospheric voidsuit crate"
 	access = access_atmospherics
 
-/datum/supply_packs/voidsuits/atmos/alt
+/datum/supply_pack/voidsuits/atmos/alt
 	name = "Heavy Duty Atmospheric voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/atmos/alt = 2,
@@ -35,7 +35,7 @@
 	containername = "Heavy Duty Atmospheric voidsuit crate"
 	access = access_atmospherics
 
-/datum/supply_packs/voidsuits/engineering
+/datum/supply_pack/voidsuits/engineering
 	name = "Engineering voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/engineering = 2,
@@ -49,7 +49,7 @@
 	containername = "Engineering voidsuit crate"
 	access = access_engine_equip
 
-/datum/supply_packs/voidsuits/engineering/construction
+/datum/supply_pack/voidsuits/engineering/construction
 	name = "Engineering Construction voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/engineering/construction = 2,
@@ -63,7 +63,7 @@
 	containername = "Engineering Construction voidsuit crate"
 	access = access_engine_equip
 
-/datum/supply_packs/voidsuits/engineering/hazmat
+/datum/supply_pack/voidsuits/engineering/hazmat
 	name = "Engineering Hazmat voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/engineering/hazmat = 2,
@@ -77,7 +77,7 @@
 	containername = "Engineering Hazmat voidsuit crate"
 	access = access_engine_equip
 
-/datum/supply_packs/voidsuits/engineering/alt
+/datum/supply_pack/voidsuits/engineering/alt
 	name = "Reinforced Engineering voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/engineering/alt = 2,
@@ -91,7 +91,7 @@
 	containername = "Reinforced Engineering voidsuit crate"
 	access = access_engine_equip
 
-/datum/supply_packs/voidsuits/medical
+/datum/supply_pack/voidsuits/medical
 	name = "Medical voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/medical = 2,
@@ -105,7 +105,7 @@
 	containername = "Medical voidsuit crate"
 	access = access_medical_equip
 
-/datum/supply_packs/voidsuits/medical/emt
+/datum/supply_pack/voidsuits/medical/emt
 	name = "Medical EMT voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/medical/emt = 2,
@@ -119,7 +119,7 @@
 	containername = "Medical EMT voidsuit crate"
 	access = access_medical_equip
 
-/datum/supply_packs/voidsuits/medical/bio
+/datum/supply_pack/voidsuits/medical/bio
 	name = "Medical Biohazard voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/medical/bio = 2,
@@ -133,7 +133,7 @@
 	containername = "Medical Biohazard voidsuit crate"
 	access = access_medical_equip
 
-/datum/supply_packs/voidsuits/medical/alt
+/datum/supply_pack/voidsuits/medical/alt
 	name = "Vey-Med Medical voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/medical/alt = 2,
@@ -147,7 +147,7 @@
 	containername = "Vey-Med Medical voidsuit crate"
 	access = access_medical_equip
 
-/datum/supply_packs/voidsuits/security
+/datum/supply_pack/voidsuits/security
 	name = "Security voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/security = 2,
@@ -160,7 +160,7 @@
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Security voidsuit crate"
 
-/datum/supply_packs/voidsuits/security/crowd
+/datum/supply_pack/voidsuits/security/crowd
 	name = "Security Crowd Control voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/security/riot = 2,
@@ -174,7 +174,7 @@
 	containername = "Security Crowd Control voidsuit crate"
 	access = access_armory
 
-/datum/supply_packs/voidsuits/security/alt
+/datum/supply_pack/voidsuits/security/alt
 	name = "Security EVA Riot voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/security/alt = 2,
@@ -188,7 +188,7 @@
 	containername = "Security EVA Riot voidsuit crate"
 	access = access_armory
 
-/datum/supply_packs/voidsuits/supply
+/datum/supply_pack/voidsuits/supply
 	name = "Mining voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/mining = 2,
@@ -201,7 +201,7 @@
 	containername = "Mining voidsuit crate"
 	access = access_mining
 
-/datum/supply_packs/voidsuits/supply/alt
+/datum/supply_pack/voidsuits/supply/alt
 	name = "Frontier Mining voidsuits"
 	contains = list(
 			/obj/item/clothing/suit/space/void/mining/alt = 2,