Merge branch 'master' into shep-dev-aurora-cooking

2025-12-10 18:22:39 +00:00 · 2020-07-22 23:25:41 -04:00
parent 886ab72289 c024b515de
commit 21f64e40fd
368 changed files with 28028 additions and 1953 deletions
--- a/code/datums/repositories/cameras.dm
+++ b/code/datums/repositories/cameras.dm
@@ -1,49 +0,0 @@
-var/global/datum/repository/cameras/camera_repository = new()
-
-/proc/invalidateCameraCache()
-	camera_repository.networks.Cut()
-	camera_repository.invalidated = 1
-	camera_repository.camera_cache_id = (++camera_repository.camera_cache_id % 999999)
-
-/datum/repository/cameras
-	var/list/networks
-	var/invalidated = 1
-	var/camera_cache_id = 1
-
-/datum/repository/cameras/New()
-	networks = list()
-	..()
-
-/datum/repository/cameras/proc/cameras_in_network(var/network, var/list/zlevels)
-	setup_cache()
-	var/list/network_list = networks[network]
-	if(LAZYLEN(zlevels))
-		var/list/filtered_cameras = list()
-		for(var/list/C in network_list)
-			//Camera is marked as always-visible
-			if(C["omni"])
-				filtered_cameras[++filtered_cameras.len] = C
-				continue
-			//Camera might be in an adjacent zlevel
-			var/camz = C["z"]
-			if(!camz) //It's inside something (helmet, communicator, etc) or nullspace or who knows
-				camz = get_z(locate(C["camera"]) in cameranet.cameras)
-			if(camz in zlevels)
-				filtered_cameras[++filtered_cameras.len] = C //Can't add lists to lists with +=
-		return filtered_cameras
-	else
-		return network_list
-
-/datum/repository/cameras/proc/setup_cache()
-	if(!invalidated)
-		return
-	invalidated = 0
-
-	cameranet.process_sort()
-	for(var/obj/machinery/camera/C in cameranet.cameras)
-		var/cam = C.nano_structure()
-		for(var/network in C.network)
-			if(!networks[network])
-				networks[network] = list()
-			var/list/netlist = networks[network]
-			netlist[++netlist.len] = cam
--- a/code/datums/repositories/crew.dm
+++ b/code/datums/repositories/crew.dm
@@ -51,6 +51,7 @@ var/global/datum/repository/crew/crew_repository = new()
 					crewmemberData["area"] = sanitize(A.get_name())
 					crewmemberData["x"] = pos.x
 					crewmemberData["y"] = pos.y
+					crewmemberData["realZ"] = pos.z
 					crewmemberData["z"] = using_map.get_zlevel_name(pos.z)

 				crewmembers[++crewmembers.len] = crewmemberData
--- a/code/datums/supplypacks/atmospherics.dm
+++ b/code/datums/supplypacks/atmospherics.dm
@@ -11,42 +11,42 @@
 	name = "Inflatable barriers"
 	contains = list(/obj/item/weapon/storage/briefcase/inflatable = 3)
 	cost = 20
-	containertype = /obj/structure/closet/crate/engineering
+	containertype = /obj/structure/closet/crate/aether
 	containername = "Inflatable Barrier Crate"

 /datum/supply_pack/atmos/canister_empty
 	name = "Empty gas canister"
 	cost = 7
 	containername = "Empty gas canister crate"
-	containertype = /obj/structure/largecrate
+	containertype = /obj/structure/closet/crate/large/aether
 	contains = list(/obj/machinery/portable_atmospherics/canister)

 /datum/supply_pack/atmos/canister_air
 	name = "Air canister"
 	cost = 10
 	containername = "Air canister crate"
-	containertype = /obj/structure/largecrate
+	containertype = /obj/structure/closet/crate/large/aether
 	contains = list(/obj/machinery/portable_atmospherics/canister/air)

 /datum/supply_pack/atmos/canister_oxygen
 	name = "Oxygen canister"
 	cost = 15
 	containername = "Oxygen canister crate"
-	containertype = /obj/structure/largecrate
+	containertype = /obj/structure/closet/crate/large/aether
 	contains = list(/obj/machinery/portable_atmospherics/canister/oxygen)

 /datum/supply_pack/atmos/canister_nitrogen
 	name = "Nitrogen canister"
 	cost = 10
 	containername = "Nitrogen canister crate"
-	containertype = /obj/structure/largecrate
+	containertype = /obj/structure/closet/crate/large/aether
 	contains = list(/obj/machinery/portable_atmospherics/canister/nitrogen)

 /datum/supply_pack/atmos/canister_phoron
 	name = "Phoron gas canister"
 	cost = 60
 	containername = "Phoron gas canister crate"
-	containertype = /obj/structure/closet/crate/secure/large
+	containertype = /obj/structure/closet/crate/secure/large/aether
 	access = access_atmospherics
 	contains = list(/obj/machinery/portable_atmospherics/canister/phoron)

@@ -54,7 +54,7 @@
 	name = "N2O gas canister"
 	cost = 15
 	containername = "N2O gas canister crate"
-	containertype = /obj/structure/closet/crate/secure/large
+	containertype = /obj/structure/closet/crate/secure/large/aether
 	access = access_atmospherics
 	contains = list(/obj/machinery/portable_atmospherics/canister/sleeping_agent)

@@ -62,7 +62,7 @@
 	name = "Carbon dioxide gas canister"
 	cost = 15
 	containername = "CO2 canister crate"
-	containertype = /obj/structure/closet/crate/secure/large
+	containertype = /obj/structure/closet/crate/secure/large/aether
 	access = access_atmospherics
 	contains = list(/obj/machinery/portable_atmospherics/canister/carbon_dioxide)

@@ -70,7 +70,7 @@
 	contains = list(/obj/machinery/pipedispenser/orderable)
 	name = "Pipe Dispenser"
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure/large
+	containertype = /obj/structure/closet/crate/secure/large/aether
 	containername = "Pipe Dispenser Crate"
 	access = access_atmospherics

@@ -78,7 +78,7 @@
 	contains = list(/obj/machinery/pipedispenser/disposal/orderable)
 	name = "Disposals Pipe Dispenser"
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure/large
+	containertype = /obj/structure/closet/crate/secure/large/aether
 	containername = "Disposal Dispenser Crate"
 	access = access_atmospherics

@@ -89,7 +89,7 @@
 			/obj/item/weapon/tank/air = 3
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/internals
+	containertype = /obj/structure/closet/crate/aether
 	containername = "Internals crate"

 /datum/supply_pack/atmos/evacuation
@@ -104,5 +104,5 @@
 			/obj/item/clothing/mask/gas = 4
 			)
 	cost = 35
-	containertype = /obj/structure/closet/crate/internals
+	containertype = /obj/structure/closet/crate/aether
 	containername = "Emergency crate"
--- a/code/datums/supplypacks/contraband.dm
+++ b/code/datums/supplypacks/contraband.dm
@@ -28,7 +28,7 @@
 			/obj/item/weapon/grenade/chem_grenade/incendiary
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/weapon
 	containername = "Special Ops crate"
 	contraband = 1

@@ -39,7 +39,7 @@
 			/obj/item/weapon/reagent_containers/food/snacks/unajerky = 4
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/unathi
 	containername = "Moghes imports crate"
 	contraband = 1

@@ -51,7 +51,7 @@
 			)
 	cost = 50
 	contraband = 1
- 	containertype = /obj/structure/closet/crate/secure/weapon
+ 	containertype = /obj/structure/closet/crate/hedberg
 	containername = "Ballistic weapons crate"

 /datum/supply_pack/randomised/misc/telecrate //you get something awesome, a couple of decent things, and a few weak/filler things
@@ -103,5 +103,5 @@
 			)
 	cost = 250 //more than a hat crate!,
 	contraband = 1
-	containertype = /obj/structure/largecrate
+	containertype = /obj/structure/closet/crate/large
 	containername = "Suspicious crate"
--- a/code/datums/supplypacks/costumes.dm
+++ b/code/datums/supplypacks/costumes.dm
@@ -1,6 +1,6 @@
 /*
 *	Here is where any supply packs
-*	related to weapons live.
+*	related to costumes live.
 */


@@ -19,7 +19,7 @@
 			/obj/item/clothing/head/wizard/fake
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/nanothreads
 	containername = "Wizard costume crate"

 /datum/supply_pack/randomised/costumes/hats
@@ -48,8 +48,8 @@
 			)
 	name = "Collectable hat crate!"
 	cost = 200
-	containertype = /obj/structure/closet/crate
-	containername = "Collectable hats crate! Brought to you by Bass.inc!"
+	containertype = /obj/structure/closet/crate/nanothreads
+	containername = "Collectable hats crate"

 /datum/supply_pack/randomised/costumes/costume
 	num_contained = 3
@@ -84,7 +84,7 @@
 			)
 	name = "Costumes crate"
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/nanothreads
 	containername = "Actor Costumes"

 /datum/supply_pack/costumes/formal_wear
@@ -104,15 +104,15 @@
 			/obj/item/clothing/shoes/leather,
 			/obj/item/clothing/accessory/wcoat
 			)
-	name = "Formalwear closet"
+	name = "Formalwear (Suits)"
 	cost = 30
-	containertype = /obj/structure/closet
-	containername = "Formalwear for the best occasions."
+	containertype = /obj/structure/closet/crate/gilthari
+	containername = "Formal suit crate"

 datum/supply_pack/costumes/witch
 	name = "Witch costume"
 	containername = "Witch costume"
-	containertype = /obj/structure/closet
+	containertype = /obj/structure/closet/crate/nanothreads
 	cost = 20
 	contains = list(
 			/obj/item/clothing/suit/wizrobe/marisa/fake,
@@ -124,7 +124,7 @@ datum/supply_pack/costumes/witch
 /datum/supply_pack/randomised/costumes/costume_hats
 	name = "Costume hats"
 	containername = "Actor hats crate"
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/nanothreads
 	cost = 10
 	num_contained = 3
 	contains = list(
@@ -147,9 +147,9 @@ datum/supply_pack/costumes/witch
 			)

 /datum/supply_pack/randomised/costumes/dresses
-	name = "Womens formal dress locker"
-	containername = "Pretty dress locker"
-	containertype = /obj/structure/closet
+	name = "Formalwear (Dresses)"
+	containername = "Formal dress crate"
+	containertype = /obj/structure/closet/crate/gilthari
 	cost = 15
 	num_contained = 3
 	contains = list(
--- a/code/datums/supplypacks/engineering.dm
+++ b/code/datums/supplypacks/engineering.dm
@@ -11,30 +11,72 @@
 	name = "Replacement lights"
 	contains = list(/obj/item/weapon/storage/box/lights/mixed = 3)
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/galaksi
 	containername = "Replacement lights"

 /datum/supply_pack/eng/smescoil
 	name = "Superconducting Magnetic Coil"
 	contains = list(/obj/item/weapon/smes_coil)
 	cost = 75
-	containertype = /obj/structure/closet/crate/engineering
+	containertype = /obj/structure/closet/crate/focalpoint
 	containername = "Superconducting Magnetic Coil crate"

 /datum/supply_pack/eng/smescoil/super_capacity
 	name = "Superconducting Capacitance Coil"
 	contains = list(/obj/item/weapon/smes_coil/super_capacity)
 	cost = 90
-	containertype = /obj/structure/closet/crate/engineering
+	containertype = /obj/structure/closet/crate/focalpoint
 	containername = "Superconducting Capacitance Coil crate"

 /datum/supply_pack/eng/smescoil/super_io
 	name = "Superconducting Transmission Coil"
 	contains = list(/obj/item/weapon/smes_coil/super_io)
 	cost = 90
-	containertype = /obj/structure/closet/crate/engineering
+	containertype = /obj/structure/closet/crate/focalpoint
 	containername = "Superconducting Transmission Coil crate"

+/datum/supply_pack/eng/shield_capacitor
+	name = "Shield Capacitor"
+	contains = list(/obj/machinery/shield_capacitor)
+	cost = 20
+	containertype = /obj/structure/closet/crate/focalpoint
+	containername = "shield capacitor crate"
+
+/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/focalpoint
+	containername = "advanced shield capacitor crate"
+
+/datum/supply_pack/eng/bubble_shield
+	name = "Bubble Shield Generator"
+	contains = list(/obj/machinery/shield_gen)
+	cost = 40
+	containertype =/obj/structure/closet/crate/focalpoint
+	containername = "shield bubble generator crate"
+
+/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/focalpoint
+	containername = "advanced bubble shield generator crate"
+
+/datum/supply_pack/eng/hull_shield
+	name = "Hull Shield Generator"
+	contains = list(/obj/machinery/shield_gen/external)
+	cost = 80
+	containertype = /obj/structure/closet/crate/focalpoint
+	containername = "shield hull generator crate"
+
+/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/focalpoint
+	containername = "advanced hull shield generator crate"
+
 /datum/supply_pack/eng/electrical
 	name = "Electrical maintenance crate"
 	contains = list(
@@ -44,7 +86,7 @@
 			/obj/item/weapon/cell/high = 2
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/engineering/electrical
+	containertype = /obj/structure/closet/crate/ward
 	containername = "Electrical maintenance crate"

 /datum/supply_pack/eng/e_welders
@@ -53,7 +95,7 @@
 			/obj/item/weapon/weldingtool/electric = 3
 			)
 	cost = 15
-	containertype = /obj/structure/closet/crate/engineering/electrical
+	containertype = /obj/structure/closet/crate/ward
 	containername = "Electric welder crate"

 /datum/supply_pack/eng/mechanical
@@ -65,14 +107,14 @@
 			/obj/item/clothing/head/hardhat
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/engineering
+	containertype = /obj/structure/closet/crate/xion
 	containername = "Mechanical maintenance crate"

 /datum/supply_pack/eng/fueltank
 	name = "Fuel tank crate"
 	contains = list(/obj/structure/reagent_dispensers/fueltank)
 	cost = 10
-	containertype = /obj/structure/largecrate
+	containertype = /obj/structure/closet/crate/large/nanotrasen
 	containername = "fuel tank crate"

 /datum/supply_pack/eng/solar
@@ -84,35 +126,35 @@
 			/obj/item/weapon/paper/solar
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/engineering
+	containertype = /obj/structure/closet/crate/einstein
 	containername = "Solar pack crate"

 /datum/supply_pack/eng/engine
 	name = "Emitter crate"
 	contains = list(/obj/machinery/power/emitter = 2)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure/engineering
+	containertype = /obj/structure/closet/crate/secure/einstein
 	containername = "Emitter crate"
 	access = access_ce

 /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
+	containertype = /obj/structure/closet/crate/secure/xion
 	containername = "Field Generator crate"
 	access = access_ce

 /datum/supply_pack/eng/engine/sing_gen
 	name = "Singularity Generator crate"
 	contains = list(/obj/machinery/the_singularitygen)
-	containertype = /obj/structure/closet/crate/secure/engineering
+	containertype = /obj/structure/closet/crate/secure/einstein
 	containername = "Singularity Generator crate"
 	access = access_ce

 /datum/supply_pack/eng/engine/collector
 	name = "Collector crate"
 	contains = list(/obj/machinery/power/rad_collector = 3)
-	containertype = /obj/structure/closet/crate/secure/engineering
+	containertype = /obj/structure/closet/crate/secure/einstein
 	containername = "Collector crate"

 /datum/supply_pack/eng/engine/PA
@@ -127,23 +169,33 @@
 			/obj/structure/particle_accelerator/power_box,
 			/obj/structure/particle_accelerator/end_cap
 			)
-	containertype = /obj/structure/closet/crate/secure/engineering
+	containertype = /obj/structure/closet/crate/secure/einstein
 	containername = "Particle Accelerator crate"
 	access = access_ce

-/datum/supply_pack/eng/shield_generator
-	name = "Shield Generator Construction Kit"
-	contains = list(
-		/obj/item/weapon/circuitboard/shield_generator,
-		/obj/item/weapon/stock_parts/capacitor,
-		/obj/item/weapon/stock_parts/micro_laser,
-		/obj/item/weapon/smes_coil,
-		/obj/item/weapon/stock_parts/console_screen,
-		/obj/item/weapon/stock_parts/subspace/amplifier
-		)
-	cost = 80
-	containertype = /obj/structure/closet/crate/engineering
-	containername = "shield generator construction kit crate"
+/datum/supply_pack/eng/shield_gen
+	contains = list(/obj/item/weapon/circuitboard/shield_gen)
+	name = "Bubble shield generator circuitry"
+	cost = 30
+	containertype = /obj/structure/closet/crate/secure/focalpoint
+	containername = "bubble shield generator circuitry crate"
+	access = access_ce
+
+/datum/supply_pack/eng/shield_gen_ex
+	contains = list(/obj/item/weapon/circuitboard/shield_gen_ex)
+	name = "Hull shield generator circuitry"
+	cost = 30
+	containertype = /obj/structure/closet/crate/secure/focalpoint
+	containername = "hull shield generator circuitry crate"
+	access = access_ce
+
+/datum/supply_pack/eng/shield_cap
+	contains = list(/obj/item/weapon/circuitboard/shield_cap)
+	name = "Bubble shield capacitor circuitry"
+	cost = 30
+	containertype = /obj/structure/closet/crate/secure/focalpoint
+	containername = "shield capacitor circuitry crate"
+	access = access_ce

 /datum/supply_pack/eng/smbig
 	name = "Supermatter Core"
@@ -157,7 +209,7 @@
 	contains = list(/obj/machinery/power/generator)
 	name = "Mark I Thermoelectric Generator"
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure/large
+	containertype = /obj/structure/closet/crate/secure/large/einstein
 	containername = "Mk1 TEG crate"
 	access = access_engine

@@ -165,7 +217,7 @@
 	contains = list(/obj/machinery/atmospherics/binary/circulator)
 	name = "Binary atmospheric circulator"
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure/large
+	containertype = /obj/structure/closet/crate/secure/large/einstein
 	containername = "Atmospheric circulator crate"
 	access = access_engine

@@ -183,7 +235,7 @@
 	name = "P.A.C.M.A.N. portable generator parts"
 	cost = 25
 	containername = "P.A.C.M.A.N. Portable Generator Construction Kit"
-	containertype = /obj/structure/closet/crate/secure/engineering
+	containertype = /obj/structure/closet/crate/secure/focalpoint
 	access = access_tech_storage
 	contains = list(
 			/obj/item/weapon/stock_parts/micro_laser,
@@ -196,7 +248,7 @@
 	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"
-	containertype = /obj/structure/closet/crate/secure/engineering
+	containertype = /obj/structure/closet/crate/secure/focalpoint
 	access = access_tech_storage
 	contains = list(
 			/obj/item/weapon/stock_parts/micro_laser,
@@ -209,7 +261,7 @@
 	name = "R-UST Mk. 8 Tokamak fusion core crate"
 	cost = 50
 	containername = "R-UST Mk. 8 Tokamak Fusion Core crate"
-	containertype = /obj/structure/closet/crate/secure/engineering
+	containertype = /obj/structure/closet/crate/secure/einstein
 	access = access_engine
 	contains = list(
 			/obj/item/weapon/book/manual/rust_engine,
@@ -221,7 +273,7 @@
 	name = "R-UST Mk. 8 fuel injector crate"
 	cost = 30
 	containername = "R-UST Mk. 8 fuel injector crate"
-	containertype = /obj/structure/closet/crate/secure/engineering
+	containertype = /obj/structure/closet/crate/secure/einstein
 	access = access_engine
 	contains = list(
 			/obj/machinery/fusion_fuel_injector,
@@ -233,7 +285,7 @@
 	name = "Gyrotron crate"
 	cost = 15
 	containername = "Gyrotron Crate"
-	containertype = /obj/structure/closet/crate/secure/engineering
+	containertype = /obj/structure/closet/crate/secure/einstein
 	access = access_engine
 	contains = list(
 			/obj/machinery/power/emitter/gyrotron,
@@ -244,12 +296,12 @@
 	name = "Fusion Fuel Compressor circuitry crate"
 	cost = 10
 	containername = "Fusion Fuel Compressor circuitry crate"
-	containertype = /obj/structure/closet/crate/engineering
+	containertype = /obj/structure/closet/crate/einstein
 	contains = list(/obj/item/weapon/circuitboard/fusion_fuel_compressor)

 /datum/supply_pack/eng/tritium
 	name = "Tritium crate"
 	cost = 75
 	containername = "Tritium crate"
-	containertype = /obj/structure/closet/crate/engineering
+	containertype = /obj/structure/closet/crate/einstein
 	contains = list(/obj/fiftyspawner/tritium)
--- a/code/datums/supplypacks/engineering_vr.dm
+++ b/code/datums/supplypacks/engineering_vr.dm
@@ -1,3 +1,17 @@
+/datum/supply_pack/eng/modern_shield
+	name = "Modern Shield Construction Kit"
+	contains = list(
+		/obj/item/weapon/circuitboard/shield_generator,
+		/obj/item/weapon/stock_parts/capacitor,
+		/obj/item/weapon/stock_parts/micro_laser,
+		/obj/item/weapon/smes_coil,
+		/obj/item/weapon/stock_parts/console_screen,
+		/obj/item/weapon/stock_parts/subspace/amplifier
+		)
+	cost = 80
+	containertype = /obj/structure/closet/crate/focalpoint
+	containername = "shield generator construction kit crate"
+
 /datum/supply_pack/eng/thermoregulator
 	contains = list(/obj/machinery/power/thermoregulator)
 	name = "Thermal Regulator"
--- a/code/datums/supplypacks/hospitality.dm
+++ b/code/datums/supplypacks/hospitality.dm
@@ -23,7 +23,7 @@
 			/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 4,
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/gilthari
 	containername = "Party equipment"

 /datum/supply_pack/hospitality/barsupplies
@@ -43,7 +43,7 @@
 			/obj/item/weapon/storage/box/glass_extras/sticks
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/gilthari
 	containername = "crate of bar supplies"
 	
 /datum/supply_pack/hospitality/cookingoil
@@ -67,7 +67,7 @@
 			)
 	name = "Surprise pack of five pizzas"
 	cost = 15
-	containertype = /obj/structure/closet/crate/freezer
+	containertype = /obj/structure/closet/crate/freezer/centauri
 	containername = "Pizza crate"

 /datum/supply_pack/hospitality/gifts
@@ -81,5 +81,5 @@
 		/obj/item/weapon/paper/card/flower
 		)
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/allico
 	containername = "crate of gifts"
--- a/code/datums/supplypacks/hydroponics.dm
+++ b/code/datums/supplypacks/hydroponics.dm
@@ -11,7 +11,7 @@
 	name = "Monkey crate"
 	contains = list (/obj/item/weapon/storage/box/monkeycubes)
 	cost = 20
-	containertype = /obj/structure/closet/crate/freezer
+	containertype = /obj/structure/closet/crate/freezer/nanotrasen
 	containername = "Monkey crate"

 /datum/supply_pack/hydro/farwa
@@ -110,7 +110,7 @@
 			/obj/item/seeds/sugarcaneseed
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/hydroponics
+	containertype = /obj/structure/closet/crate/carp
 	containername = "Seeds crate"
 	access = access_hydroponics

@@ -124,7 +124,7 @@
 			/obj/item/weapon/material/twohanded/fireaxe/scythe
 			)
 	cost = 45
-	containertype = /obj/structure/closet/crate/hydroponics
+	containertype = /obj/structure/closet/crate/grayson
 	containername = "Weed control crate"
 	access = access_hydroponics

@@ -132,7 +132,7 @@
 	name = "Water tank crate"
 	contains = list(/obj/structure/reagent_dispensers/watertank)
 	cost = 10
-	containertype = /obj/structure/largecrate
+	containertype = /obj/structure/closet/crate/large/aether
 	containername = "water tank crate"

 /datum/supply_pack/hydro/bee_keeper
@@ -144,14 +144,14 @@
 			/obj/item/bee_pack
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/hydroponics
+	containertype = /obj/structure/closet/crate/carp
 	containername = "Beekeeping crate"
 	access = access_hydroponics

 /datum/supply_pack/hydro/tray
 	name = "Empty hydroponics trays"
 	cost = 50
-	containertype = /obj/structure/closet/crate/hydroponics
+	containertype = /obj/structure/closet/crate/aether
 	containername = "Hydroponics tray crate"
 	contains = list(/obj/machinery/portable_atmospherics/hydroponics{anchored = 0} = 3)
 	access = access_hydroponics
--- a/code/datums/supplypacks/materials.dm
+++ b/code/datums/supplypacks/materials.dm
@@ -11,40 +11,40 @@
 	name = "50 metal sheets"
 	contains = list(/obj/fiftyspawner/steel)
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/grayson
 	containername = "Metal sheets crate"

 /datum/supply_pack/materials/glass50
 	name = "50 glass sheets"
 	contains = list(/obj/fiftyspawner/glass)
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/grayson
 	containername = "Glass sheets crate"

 /datum/supply_pack/materials/wood50
 	name = "50 wooden planks"
 	contains = list(/obj/fiftyspawner/wood)
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/grayson
 	containername = "Wooden planks crate"

 /datum/supply_pack/materials/plastic50
 	name = "50 plastic sheets"
 	contains = list(/obj/fiftyspawner/plastic)
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/grayson
 	containername = "Plastic sheets crate"

 /datum/supply_pack/materials/cardboard_sheets
 	contains = list(/obj/fiftyspawner/cardboard)
 	name = "50 cardboard sheets"
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/grayson
 	containername = "Cardboard sheets crate"

 /datum/supply_pack/materials/carpet
 	name = "Imported carpet"
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/grayson
 	containername = "Imported carpet crate"
 	cost = 15
 	contains = list(
@@ -55,7 +55,7 @@

 /datum/supply_pack/misc/linoleum
 	name = "Linoleum"
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/grayson
 	containername = "Linoleum crate"
 	cost = 15
 	contains = list(/obj/fiftyspawner/linoleum)
--- a/code/datums/supplypacks/medical.dm
+++ b/code/datums/supplypacks/medical.dm
@@ -22,28 +22,28 @@
 			/obj/item/weapon/storage/box/autoinjectors
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/medical
+	containertype = /obj/structure/closet/crate/zenghu
 	containername = "Medical crate"

 /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
+	containertype = /obj/structure/closet/crate/nanocare
 	containername = "BloodPack crate"

 /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
+	containertype = /obj/structure/closet/crate/nanocare
 	containername = "Body bag crate"

 /datum/supply_pack/med/cryobag
 	name = "Stasis bag crate"
 	contains = list(/obj/item/bodybag/cryobag = 3)
 	cost = 40
-	containertype = /obj/structure/closet/crate/medical
+	containertype = /obj/structure/closet/crate/nanocare
 	containername = "Stasis bag crate"

 /datum/supply_pack/med/surgery
@@ -62,7 +62,7 @@
 			/obj/item/weapon/surgical/circular_saw
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/veymed
 	containername = "Surgery crate"
 	access = access_medical

@@ -73,7 +73,7 @@
 			/obj/item/weapon/storage/box/cdeathalarm_kit
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/ward
 	containername = "Death Alarm crate"
 	access = access_medical

@@ -83,7 +83,7 @@
 			/obj/item/weapon/storage/firstaid/clotting
 			)
 	cost = 100
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/zenghu
 	containername = "Clotting Medicine crate"
 	access = access_medical

@@ -97,7 +97,7 @@
 			/obj/item/weapon/storage/belt/medical = 3
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/veymed
 	containername = "Sterile equipment crate"

 /datum/supply_pack/med/extragear
@@ -109,7 +109,7 @@
 			/obj/item/clothing/suit/storage/hooded/wintercoat/medical = 3
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/nanocare
 	containername = "Medical surplus equipment"
 	access = access_medical

@@ -133,7 +133,7 @@
 			/obj/item/weapon/reagent_containers/syringe
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/nanocare
 	containername = "Chief medical officer equipment"
 	access = access_cmo

@@ -156,7 +156,7 @@
 			/obj/item/weapon/reagent_containers/syringe
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/nanocare
 	containername = "Medical Doctor equipment"
 	access = access_medical_equip

@@ -179,7 +179,7 @@
 			/obj/item/weapon/reagent_containers/syringe
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/nanocare
 	containername = "Chemist equipment"
 	access = access_chemistry

@@ -207,7 +207,7 @@
 			/obj/item/clothing/accessory/storage/white_vest
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/nanocare
 	containername = "Paramedic equipment"
 	access = access_medical_equip

@@ -226,7 +226,7 @@
 			/obj/item/weapon/cartridge/medical
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/nanocare
 	containername = "Psychiatrist equipment"
 	access = access_psychiatrist

@@ -247,7 +247,7 @@
 			/obj/item/weapon/storage/box/gloves
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/nanocare
 	containername = "Medical scrubs crate"
 	access = access_medical_equip

@@ -264,7 +264,7 @@
 			/obj/item/weapon/pen
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/veymed
 	containername = "Autopsy equipment crate"
 	access = access_morgue

@@ -291,7 +291,7 @@
 			/obj/item/weapon/storage/box/gloves
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/nanocare
 	containername = "Medical uniform crate"
 	access = access_medical_equip

@@ -309,7 +309,7 @@
 			/obj/item/weapon/storage/box/gloves
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/nanocare
 	containername = "Medical biohazard equipment"
 	access = access_medical_equip

@@ -317,7 +317,7 @@
 	name = "Portable freezers crate"
 	contains = list(/obj/item/weapon/storage/box/freezer = 7)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/veymed
 	containername = "Portable freezers"
 	access = access_medical_equip

@@ -325,7 +325,7 @@
 	name = "Virus sample crate"
 	contains = list(/obj/item/weapon/virusdish/random = 4)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/zenghu
 	containername = "Virus sample crate"
 	access = access_cmo

@@ -333,40 +333,40 @@
 	name = "Defibrillator crate"
 	contains = list(/obj/item/device/defib_kit = 2)
 	cost = 30
-	containertype = /obj/structure/closet/crate/medical
+	containertype = /obj/structure/closet/crate/veymed
 	containername = "Defibrillator crate"

 /datum/supply_pack/med/distillery
 	name = "Chemical distiller crate"
 	contains = list(/obj/machinery/portable_atmospherics/powered/reagent_distillery = 1)
 	cost = 50
-	containertype = /obj/structure/largecrate
+	containertype = /obj/structure/closet/crate/large/nanotrasen
 	containername = "Chemical distiller crate"

 /datum/supply_pack/med/advdistillery
 	name = "Industrial Chemical distiller crate"
 	contains = list(/obj/machinery/portable_atmospherics/powered/reagent_distillery/industrial = 1)
 	cost = 150
-	containertype = /obj/structure/largecrate
+	containertype = /obj/structure/closet/crate/large/xion
 	containername = "Industrial Chemical distiller crate"

 /datum/supply_pack/med/oxypump
 	name = "Oxygen pump crate"
 	contains = list(/obj/machinery/oxygen_pump/mobile = 1)
 	cost = 125
-	containertype = /obj/structure/largecrate
+	containertype = /obj/structure/closet/crate/large/xion
 	containername = "Oxygen pump crate"

 /datum/supply_pack/med/anestheticpump
 	name = "Anesthetic pump crate"
 	contains = list(/obj/machinery/oxygen_pump/mobile/anesthetic = 1)
 	cost = 130
-	containertype = /obj/structure/largecrate
+	containertype = /obj/structure/closet/crate/large/nanotrasen
 	containername = "Anesthetic pump crate"

 /datum/supply_pack/med/stablepump
 	name = "Portable stabilizer crate"
 	contains = list(/obj/machinery/oxygen_pump/mobile/stabilizer = 1)
 	cost = 175
-	containertype = /obj/structure/largecrate
+	containertype = /obj/structure/closet/crate/large/nanotrasen
 	containername = "Portable stabilizer crate"
--- a/code/datums/supplypacks/misc.dm
+++ b/code/datums/supplypacks/misc.dm
@@ -20,7 +20,7 @@
 			)
 	name = "Trading Card Crate"
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/oculum
 	containername = "cards crate"

 /datum/supply_pack/randomised/misc/dnd
@@ -36,7 +36,7 @@
 			)
 	name = "Miniatures Crate"
 	cost = 200
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/oculum
 	containername = "Miniature Crate"

 /datum/supply_pack/randomised/misc/plushies
@@ -88,14 +88,14 @@
 			//VOREStation Add End
 	name = "Plushies Crate"
 	cost = 15
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/allico
 	containername = "Plushies Crate"

 /datum/supply_pack/misc/eftpos
 	contains = list(/obj/item/device/eftpos)
 	name = "EFTPOS scanner"
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/nanotrasen
 	containername = "EFTPOS crate"

 /datum/supply_pack/misc/chaplaingear
@@ -113,7 +113,7 @@
 			/obj/item/weapon/storage/fancy/candle_box = 3
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/gilthari
 	containername = "Chaplain equipment crate"

 /datum/supply_pack/misc/hoverpod
@@ -136,14 +136,14 @@
 			/obj/item/clothing/accessory/storage/webbing
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/nanothreads
 	containername = "Webbing crate"

 /datum/supply_pack/misc/holoplant
 	name = "Holoplant Pot"
 	contains = list(/obj/machinery/holoplant/shipped)
 	cost = 15
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/thinktronic
 	containername = "Holoplant crate"

 /datum/supply_pack/misc/glucose_hypos
@@ -152,7 +152,7 @@
 			/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/zenghu
 	containername = "Glucose Hypo Crate"

 /datum/supply_pack/misc/mre_rations
@@ -169,7 +169,7 @@
 					/obj/item/weapon/storage/mre/menu9,
 					/obj/item/weapon/storage/mre/menu10)
 	cost = 50
-	containertype = /obj/structure/closet/crate/freezer
+	containertype = /obj/structure/closet/crate/centauri
 	containername = "ready to eat rations"

 /datum/supply_pack/misc/paste_rations
@@ -178,7 +178,7 @@
 			/obj/item/weapon/storage/mre/menu11 = 2
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate/freezer
+	containertype = /obj/structure/closet/crate/freezer/centauri
 	containername = "emergency rations"

 /datum/supply_pack/misc/medical_rations
@@ -187,5 +187,5 @@
 			/obj/item/weapon/storage/mre/menu13 = 2
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/freezer
+	containertype = /obj/structure/closet/crate/zenghu
 	containername = "emergency rations"
--- a/code/datums/supplypacks/recreation.dm
+++ b/code/datums/supplypacks/recreation.dm
@@ -20,7 +20,7 @@
 			/obj/item/weapon/material/twohanded/fireaxe/foam = 2
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/allico
 	containername = "foam weapon crate"

 /datum/supply_pack/recreation/lasertag
@@ -31,8 +31,8 @@
 			/obj/item/weapon/gun/energy/lasertag/blue,
 			/obj/item/clothing/suit/bluetag
 			)
-	containertype = /obj/structure/closet
-	containername = "Lasertag Closet"
+	containertype = /obj/structure/closet/crate/ward
+	containername = "Lasertag Supplies"
 	cost = 10

 /datum/supply_pack/recreation/artscrafts
@@ -55,14 +55,14 @@
 			/obj/item/weapon/wrapping_paper = 3
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/allico
 	containername = "Arts and Crafts crate"

 /datum/supply_pack/recreation/painters
 	name = "Station Painting Supplies"
 	cost = 10
 	containername = "station painting supplies crate"
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/grayson
 	contains = list(
 			/obj/item/device/pipe_painter = 2,
 			/obj/item/device/floor_painter = 2,
@@ -82,7 +82,7 @@
 	name = "Deluxe Fishing Bait"
 	cost = 40
 	containername = "deluxe bait crate"
-	containertype = /obj/structure/closet/crate/freezer
+	containertype = /obj/structure/closet/crate/carp
 	num_contained = 8
 	contains = list(
 			/obj/item/weapon/storage/box/wormcan,
@@ -93,7 +93,7 @@
 	name = "Laser Tag Turrets"
 	cost = 40
 	containername = "laser tag turret crate"
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/ward
 	contains = list(
 			/obj/machinery/porta_turret/lasertag/blue,
 			/obj/machinery/porta_turret/lasertag/red
--- a/code/datums/supplypacks/robotics.dm
+++ b/code/datums/supplypacks/robotics.dm
@@ -20,7 +20,7 @@
 			/obj/item/weapon/cell/high = 2
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure/science
+	containertype = /obj/structure/closet/crate/secure/nanotrasen
 	containername = "Robotics assembly"
 	access = access_robotics

@@ -56,7 +56,7 @@
 	name = "Morpheus robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/morpheus)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure/science
+	containertype = /obj/structure/closet/crate/secure/morpheus
 	containername = "Robolimb blueprints (Morpheus)"
 	access = access_robotics

@@ -64,7 +64,7 @@
 	name = "Cyber Solutions robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/cybersolutions)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure/science
+	containertype = /obj/structure/closet/crate/secure/cybersolutions
 	containername = "Robolimb blueprints (Cyber Solutions)"
 	access = access_robotics

@@ -72,7 +72,7 @@
 	name = "Xion robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/xion)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure/science
+	containertype = /obj/structure/closet/crate/secure/xion
 	containername = "Robolimb blueprints (Xion)"
 	access = access_robotics

@@ -80,7 +80,7 @@
 	name = "Grayson robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/grayson)
 	cost = 30
-	containertype = /obj/structure/closet/crate/secure/science
+	containertype = /obj/structure/closet/crate/secure/grayson
 	containername = "Robolimb blueprints (Grayson)"
 	access = access_robotics

@@ -88,7 +88,7 @@
 	name = "Hephaestus robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/hephaestus)
 	cost = 35
-	containertype = /obj/structure/closet/crate/secure/science
+	containertype = /obj/structure/closet/crate/secure/heph
 	containername = "Robolimb blueprints (Hephaestus)"
 	access = access_robotics

@@ -96,7 +96,7 @@
 	name = "Ward-Takahashi robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/wardtakahashi)
 	cost = 35
-	containertype = /obj/structure/closet/crate/secure/science
+	containertype = /obj/structure/closet/crate/secure/ward
 	containername = "Robolimb blueprints (Ward-Takahashi)"
 	access = access_robotics

@@ -104,7 +104,7 @@
 	name = "Zeng Hu robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/zenghu)
 	cost = 35
-	containertype = /obj/structure/closet/crate/secure/science
+	containertype = /obj/structure/closet/crate/secure/zenghu
 	containername = "Robolimb blueprints (Zeng Hu)"
 	access = access_robotics

@@ -112,7 +112,7 @@
 	name = "Bishop robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/bishop)
 	cost = 70
-	containertype = /obj/structure/closet/crate/secure/science
+	containertype = /obj/structure/closet/crate/secure/bishop
 	containername = "Robolimb blueprints (Bishop)"
 	access = access_robotics

@@ -133,7 +133,7 @@
 			/obj/item/weapon/circuitboard/mecha/ripley/peripherals
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure/science
+	containertype = /obj/structure/closet/crate/secure/xion
 	containername = "APLU \"Ripley\" Circuit Crate"
 	access = access_robotics

@@ -144,7 +144,7 @@
 			/obj/item/weapon/circuitboard/mecha/odysseus/main
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure/science
+	containertype = /obj/structure/closet/crate/secure/veymed
 	containername = "\"Odysseus\" Circuit Crate"
 	access = access_robotics

@@ -158,7 +158,7 @@
 			)
 	name = "Random APLU modkit"
 	cost = 200
-	containertype = /obj/structure/closet/crate/science
+	containertype = /obj/structure/closet/crate/xion
 	containername = "heavy crate"

 /datum/supply_pack/randomised/robotics/exosuit_mod/durand
@@ -168,6 +168,7 @@
 			/obj/item/device/kit/paint/durand/phazon
 			)
 	name = "Random Durand exosuit modkit"
+	containertype = /obj/structure/closet/crate/heph

 /datum/supply_pack/randomised/robotics/exosuit_mod/gygax
 	contains = list(
@@ -176,6 +177,7 @@
 			/obj/item/device/kit/paint/gygax/recitence
 			)
 	name = "Random Gygax exosuit modkit"
+	containertype = /obj/structure/closet/crate/heph

 /datum/supply_pack/robotics/jumper_cables
 	name = "Jumper kit crate"
@@ -183,7 +185,7 @@
 			/obj/item/device/defib_kit/jumper_kit = 2
 			)
 	cost = 30
-	containertype = /obj/structure/closet/crate/secure/science
+	containertype = /obj/structure/closet/crate/secure/einstein
 	containername = "Jumper kit crate"
 	access = access_robotics

--- a/code/datums/supplypacks/science.dm
+++ b/code/datums/supplypacks/science.dm
@@ -9,7 +9,7 @@
 	name = "Coolant tank crate"
 	contains = list(/obj/structure/reagent_dispensers/coolanttank)
 	cost = 15
-	containertype = /obj/structure/largecrate
+	containertype = /obj/structure/closet/crate/large/aether
 	containername = "coolant tank crate"

 /datum/supply_pack/sci/phoron
@@ -39,7 +39,7 @@
 			/obj/item/seeds/kudzuseed
 			)
 	cost = 15
-	containertype = /obj/structure/closet/crate/hydroponics
+	containertype = /obj/structure/closet/crate/carp
 	containername = "Exotic Seeds crate"
 	access = access_hydroponics

@@ -47,14 +47,14 @@
 	name = "Integrated circuit printer"
 	contains = list(/obj/item/device/integrated_circuit_printer = 2)
 	cost = 15
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/ward
 	containername = "Integrated circuit crate"

 /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
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/ward
 	containername = "Integrated circuit crate"

 /datum/supply_pack/sci/xenoarch
@@ -75,6 +75,6 @@
 				/obj/item/weapon/storage/bag/fossils,
 				/obj/item/weapon/hand_labeler)
 	cost = 100
-	containertype = /obj/structure/closet/crate/secure/science
+	containertype = /obj/structure/closet/crate/secure/xion
 	containername = "Xenoarchaeology Tech crate"
 	access = access_research
--- a/code/datums/supplypacks/security.dm
+++ b/code/datums/supplypacks/security.dm
@@ -53,11 +53,11 @@
 			/obj/item/clothing/accessory/storage/pouches/blue,
 			)
 	cost = 30
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/heph
 	containername = "Plate Carrier crate"

 /datum/supply_pack/security/carriersgreen
-	name = "Armor - Blue modular armor"
+	name = "Armor - Green modular armor"
 	contains = list(
 			/obj/item/clothing/suit/armor/pcarrier/green,
 			/obj/item/clothing/accessory/armor/armguards/green,
@@ -65,7 +65,7 @@
 			/obj/item/clothing/accessory/storage/pouches/green,
 			)
 	cost = 30
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/heph
 	containername = "Plate Carrier crate"

 /datum/supply_pack/security/carriersnavy
@@ -77,7 +77,7 @@
 			/obj/item/clothing/accessory/storage/pouches/navy,
 			)
 	cost = 30
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/heph
 	containername = "Plate Carrier crate"

 /datum/supply_pack/security/carrierstan
@@ -89,7 +89,7 @@
 			/obj/item/clothing/accessory/storage/pouches/tan,
 			)
 	cost = 30
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/heph
 	containername = "Plate Carrier crate"

 /datum/supply_pack/security/armorplate
@@ -98,7 +98,7 @@
 			/obj/item/clothing/accessory/armor/armorplate,
 			)
 	cost = 5
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/lawson
 	containername = "Armor plate crate"

 /datum/supply_pack/security/armorplatestab
@@ -107,7 +107,7 @@
 			/obj/item/clothing/accessory/armor/armorplate/stab,
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/lawson
 	containername = "Armor plate crate"

 /datum/supply_pack/security/armorplatemedium
@@ -116,7 +116,7 @@
 			/obj/item/clothing/accessory/armor/armorplate/medium,
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/lawson
 	containername = "Armor plate crate"

 /datum/supply_pack/security/armorplatetac
@@ -125,7 +125,7 @@
 			/obj/item/clothing/accessory/armor/armorplate/tactical,
 			)
 	cost = 15
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/heph
 	containername = "Armor plate crate"

 /datum/supply_pack/randomised/security/carriers
@@ -140,7 +140,7 @@
 			/obj/item/clothing/suit/armor/pcarrier/press
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/scg
 	containername = "Plate Carrier crate"

 /datum/supply_pack/security/carriertags
@@ -158,7 +158,7 @@
 			/obj/item/clothing/accessory/armor/tag/abneg
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/scg
 	containername = "Plate Carrier crate"

 /datum/supply_pack/security/helmcovers
@@ -174,7 +174,7 @@
 			/obj/item/clothing/accessory/armor/helmcover/tan
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/scg
 	containername = "Helmet Covers crate"

 /datum/supply_pack/randomised/security/armorplates
@@ -193,7 +193,7 @@
 			/obj/item/clothing/accessory/armor/armorplate/bulletproof
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/scg
 	containername = "Armor plate crate"

 /datum/supply_pack/randomised/security/carrierarms
@@ -210,7 +210,7 @@
 			/obj/item/clothing/accessory/armor/armguards/bulletproof
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/scg
 	containername = "Armor plate crate"

 /datum/supply_pack/randomised/security/carrierlegs
@@ -227,7 +227,7 @@
 			/obj/item/clothing/accessory/armor/legguards/bulletproof
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/scg
 	containername = "Armor plate crate"

 /datum/supply_pack/randomised/security/carrierbags
@@ -246,7 +246,7 @@
 			/obj/item/clothing/accessory/storage/pouches/large/tan
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/scg
 	containername = "Armor plate crate"

 /datum/supply_pack/security/riot_gear
@@ -260,7 +260,7 @@
 			/obj/item/weapon/storage/box/handcuffs
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/lawson
 	containername = "Riot gear crate"
 	access = access_armory

@@ -273,7 +273,7 @@
 			/obj/item/clothing/shoes/leg_guard/riot
 			)
 	cost = 30
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/lawson
 	containername = "Riot armor crate"
 	access = access_armory

@@ -287,7 +287,7 @@
 			/obj/item/clothing/accessory/armor/legguards/riot
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/lawson
 	containername = "Riot armor crate"
 	access = access_armory

@@ -300,7 +300,7 @@
 			/obj/item/clothing/shoes/leg_guard/laserproof
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/lawson
 	containername = "Ablative armor crate"
 	access = access_armory

@@ -314,7 +314,7 @@
 			/obj/item/clothing/accessory/armor/legguards/laserproof
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/lawson
 	containername = "Ablative armor crate"
 	access = access_armory

@@ -327,7 +327,7 @@
 			/obj/item/clothing/shoes/leg_guard/bulletproof
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/heph
 	containername = "Ballistic armor crate"
 	access = access_armory
 /* VOREStation Removal - Howabout no ERT armor being orderable?
@@ -342,7 +342,7 @@
 			/obj/item/clothing/accessory/armor/legguards/bulletproof
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/heph
 	containername = "Ballistic armor crate"
 	access = access_armory

@@ -355,13 +355,13 @@
 			/obj/item/clothing/shoes/leg_guard/combat
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/saare
 	containername = "Combat armor crate"
 	access = access_armory

 /datum/supply_pack/security/tactical
 	name = "Armor - Tactical"
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/saare
 	containername = "Tactical armor crate"
 	cost = 40
 	access = access_armory
@@ -387,7 +387,7 @@

 /datum/supply_pack/security/flexitac
 	name = "Armor - Tactical Light"
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/saare
 	containername = "Tactical Light armor crate"
 	cost = 75
 	access = access_armory
@@ -412,15 +412,14 @@
 	name = "Misc - Security Barriers"
 	contains = list(/obj/machinery/deployable/barrier = 4)
 	cost = 20
-	containertype = /obj/structure/largecrate
+	containertype = /obj/structure/closet/crate/large/secure/heph
 	containername = "Security barrier crate"
-	access = null

 /datum/supply_pack/security/securityshieldgen
 	name = "Misc - Wall shield generators"
 	contains = list(/obj/machinery/shieldwallgen = 4)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/heph
 	containername = "Wall shield generators crate"
 	access = access_teleporter

@@ -434,7 +433,7 @@
 			/obj/item/clothing/accessory/holster/hip
 			)
 	cost = 15
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/hedberg
 	containername = "Holster crate"

 /datum/supply_pack/security/extragear
@@ -446,7 +445,7 @@
 			/obj/item/clothing/suit/storage/hooded/wintercoat/security = 3
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/nanothreads
 	containername = "Security surplus equipment"

 /datum/supply_pack/security/detectivegear
@@ -473,7 +472,7 @@
 			/obj/item/weapon/storage/bag/detective
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/nanotrasen
 	containername = "Forensic equipment"
 	access = access_forensics_lockers

@@ -486,7 +485,7 @@
 			/obj/item/device/detective_scanner
 			)
 	cost = 60
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/ward
 	containername = "Forensic equipment"
 	access = access_forensics_lockers

@@ -508,7 +507,7 @@
 			/obj/item/clothing/gloves/black = 2
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/nanotrasen
 	containername = "Investigation clothing"
 	access = access_forensics_lockers

@@ -538,7 +537,7 @@
 			/obj/item/device/flashlight/maglight
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/nanotrasen
 	containername = "Officer equipment"
 	access = access_brig

@@ -567,7 +566,7 @@
 			/obj/item/device/flashlight/maglight
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/nanotrasen
 	containername = "Warden equipment"
 	access = access_armory

@@ -594,7 +593,7 @@
 			/obj/item/device/flashlight/maglight
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/nanotrasen
 	containername = "Head of security equipment"
 	access = access_hos

@@ -613,7 +612,7 @@
 			/obj/item/weapon/storage/box/holobadge
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/nanotrasen
 	containername = "Security uniform crate"

 /datum/supply_pack/security/navybluesecurityclothing
@@ -634,7 +633,7 @@
 			/obj/item/weapon/storage/box/holobadge
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/nanotrasen
 	containername = "Navy blue security uniform crate"

 /datum/supply_pack/security/corporatesecurityclothing
@@ -654,7 +653,7 @@
 			/obj/item/weapon/storage/box/holobadge
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/nanotrasen
 	containername = "Corporate security uniform crate"

 /datum/supply_pack/security/biosuit
@@ -670,7 +669,7 @@
 			/obj/item/weapon/storage/box/gloves
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/nanotrasen
 	containername = "Security biohazard gear"
 	access = access_security

@@ -680,6 +679,6 @@
 			/obj/item/weapon/contraband/poster/nanotrasen = 6
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/nanotrasen
 	containername = "Morale Posters"
 	access = access_maint_tunnels
--- a/code/datums/supplypacks/supply.dm
+++ b/code/datums/supplypacks/supply.dm
@@ -18,14 +18,14 @@
 			/obj/item/weapon/reagent_containers/food/condiment/yeast = 3
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/freezer
+	containertype = /obj/structure/closet/crate/freezer/centauri
 	containername = "Food crate"

 /datum/supply_pack/supply/toner
 	name = "Toner cartridges"
 	contains = list(/obj/item/device/toner = 6)
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/ummarcar
 	containername = "Toner cartridges"

 /datum/supply_pack/supply/janitor
@@ -48,7 +48,7 @@
 			/obj/structure/mopbucket
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/galaksi
 	containername = "Janitorial supplies"

 /datum/supply_pack/supply/shipping
@@ -62,7 +62,7 @@
 				/obj/item/weapon/tool/wirecutters,
 				/obj/item/weapon/tape_roll = 2)
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/ummarcar
 	containername = "Shipping supplies crate"

 /datum/supply_pack/supply/bureaucracy
@@ -82,13 +82,13 @@
 			)
 	name = "Office supplies"
 	cost = 15
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/ummarcar
 	containername = "Office supplies crate"

 /datum/supply_pack/supply/spare_pda
 	name = "Spare PDAs"
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/thinktronic
 	containername = "Spare PDA crate"
 	contains = list(/obj/item/device/pda = 3)

@@ -112,7 +112,7 @@
 			/obj/item/clothing/glasses/meson
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/xion
 	containername = "Shaft miner equipment"
 	access = access_mining
 /* //VOREStation Edit - Pointless on Tether.
@@ -127,12 +127,12 @@
 	name = "Cargo Train Tug"
 	contains = list(/obj/vehicle/train/engine)
 	cost = 35
-	containertype = /obj/structure/largecrate
+	containertype = /obj/structure/closet/crate/large/xion
 	containername = "Cargo Train Tug Crate"

 /datum/supply_pack/supply/cargotrailer
 	name = "Cargo Train Trolley"
 	contains = list(/obj/vehicle/train/trolley)
 	cost = 15
-	containertype = /obj/structure/largecrate
+	containertype = /obj/structure/closet/crate/large/xion
 	containername = "Cargo Train Trolley Crate"
--- a/code/datums/supplypacks/voidsuits.dm
+++ b/code/datums/supplypacks/voidsuits.dm
@@ -17,7 +17,7 @@
 			/obj/item/weapon/tank/oxygen = 2,
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/aether
 	containername = "Atmospheric voidsuit crate"
 	access = access_atmospherics

@@ -31,7 +31,7 @@
 			/obj/item/weapon/tank/oxygen = 2,
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/aether
 	containername = "Heavy Duty Atmospheric voidsuit crate"
 	access = access_atmospherics

@@ -45,7 +45,7 @@
 			/obj/item/weapon/tank/oxygen = 2
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/xion
 	containername = "Engineering voidsuit crate"
 	access = access_engine_equip

@@ -59,7 +59,7 @@
 			/obj/item/weapon/tank/oxygen = 2
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/xion
 	containername = "Engineering Construction voidsuit crate"
 	access = access_engine_equip

@@ -73,7 +73,7 @@
 			/obj/item/weapon/tank/oxygen = 2
 			)
 	cost = 45
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/xion
 	containername = "Engineering Hazmat voidsuit crate"
 	access = access_engine_equip

@@ -87,7 +87,7 @@
 			/obj/item/weapon/tank/oxygen = 2
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/xion
 	containername = "Reinforced Engineering voidsuit crate"
 	access = access_engine_equip

@@ -101,7 +101,7 @@
 			/obj/item/weapon/tank/oxygen = 2
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/veymed
 	containername = "Medical voidsuit crate"
 	access = access_medical_equip

@@ -115,7 +115,7 @@
 			/obj/item/weapon/tank/oxygen = 2
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/veymed
 	containername = "Medical EMT voidsuit crate"
 	access = access_medical_equip

@@ -129,7 +129,7 @@
 			/obj/item/weapon/tank/oxygen = 2
 			)
 	cost = 45
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/nanocare
 	containername = "Medical Biohazard voidsuit crate"
 	access = access_medical_equip

@@ -143,7 +143,7 @@
 			/obj/item/weapon/tank/oxygen = 2
 			)
 	cost = 60
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/veymed
 	containername = "Vey-Med Autoadaptive voidsuit (humanoid) crate"
 	access = access_medical_equip

@@ -168,7 +168,7 @@
 			/obj/item/weapon/tank/oxygen = 2
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/heph
 	containername = "Security voidsuit crate"

 /datum/supply_pack/voidsuits/security/crowd
@@ -181,7 +181,7 @@
 			/obj/item/weapon/tank/oxygen = 2
 			)
 	cost = 60
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/heph
 	containername = "Security Crowd Control voidsuit crate"
 	access = access_armory

@@ -195,7 +195,7 @@
 			/obj/item/weapon/tank/oxygen = 2
 			)
 	cost = 60
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/heph
 	containername = "Security EVA voidsuit crate"
 	access = access_armory

@@ -208,7 +208,7 @@
 			/obj/item/weapon/tank/oxygen = 2
 			)
 	cost = 40
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/xion
 	containername = "Mining voidsuit crate"
 	access = access_mining

@@ -221,7 +221,7 @@
 			/obj/item/weapon/tank/oxygen = 2
 			)
 	cost = 50
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/grayson
 	containername = "Frontier Mining voidsuit crate"
 	access = access_mining

@@ -232,6 +232,6 @@
 		/obj/item/clothing/mask/gas/zaddat = 1
 		)
 	cost = 30
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/nanotrasen
 	containername = "Zaddat Shroud crate"
 	access = null