diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
index 88da3cd7f72..474ef8eea83 100644
--- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -2840,13 +2840,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/charlie/hall)
-"mm" = (
-/obj/machinery/power/supermatter_crystal/shard,
-/obj/structure/closet/crate/engineering{
-	name = "supermatter shard crate"
-	},
-/turf/open/floor/iron/white/textured,
-/area/ruin/space/ancientstation/delta/proto)
 "mo" = (
 /turf/open/floor/iron/white/corner{
 	dir = 1
@@ -5152,6 +5145,14 @@
 /obj/machinery/light/directional/south,
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/beta/hall)
+"By" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/monitor,
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/charlie/engie)
 "Bz" = (
 /turf/open/floor/plating/airless,
 /area/ruin/space/ancientstation/beta/hall)
@@ -5963,6 +5964,11 @@
 /obj/machinery/duct,
 /turf/template_noop,
 /area/space/nearstation)
+"HS" = (
+/obj/machinery/power/supermatter_crystal/shard,
+/obj/structure/closet/crate/radiation,
+/turf/open/floor/iron/white/textured,
+/area/ruin/space/ancientstation/delta/proto)
 "HT" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -6504,14 +6510,6 @@
 /obj/structure/window/reinforced/spawner/directional/south,
 /turf/open/floor/engine/o2,
 /area/ruin/space/ancientstation/beta/atmos)
-"Ll" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/computer/monitor,
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/ruin/space/ancientstation/charlie/engie)
 "Lm" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -11606,7 +11604,7 @@ mS
 jE
 aa
 Ma
-Ll
+By
 eK
 fc
 Wn
@@ -14789,7 +14787,7 @@ bD
 Yr
 cD
 uj
-mm
+HS
 Oh
 uj
 Mx
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 1f8322ad5dc..34f09ad25e7 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -37,12 +37,18 @@
 	if(isnull(crate_paint_jobs))
 		crate_paint_jobs = list(
 		"Internals" = list("icon_state" = "o2crate"),
-		"Medical" = list("icon_state" = "medicalcrate"),
+		"Medical" = list("icon_state" = "medical"),
+		"Medical Plus" = list("icon_state" = "medicalcrate"),
 		"Radiation" = list("icon_state" = "radiation"),
 		"Hydrophonics" = list("icon_state" = "hydrocrate"),
 		"Science" = list("icon_state" = "scicrate"),
+		"Robotics" = list("icon_state" = "robo"),
 		"Solar" = list("icon_state" = "engi_e_crate"),
-		"Engineering" = list("icon_state" = "engi_crate")
+		"Engineering" = list("icon_state" = "engi_crate"),
+		"Atmospherics" = list("icon_state" = "atmos"),
+		"Cargo" = list("icon_state" = "cargo"),
+		"Mining" = list("icon_state" = "mining"),
+		"Command" = list("icon_state" = "centcom")
 	)
 	if(paint_jobs)
 		paint_jobs = crate_paint_jobs
@@ -203,6 +209,10 @@
 	icon_state = "medicalcrate"
 	base_icon_state = "medicalcrate"
 
+/obj/structure/closet/crate/medical/department
+	icon_state = "medical"
+	base_icon_state = "medical"
+
 /obj/structure/closet/crate/freezer
 	desc = "A freezer."
 	name = "freezer"
@@ -259,6 +269,11 @@
 	new /obj/item/bodypart/leg/right/robot/surplus(src)
 	new /obj/item/bodypart/leg/right/robot/surplus(src)
 
+/obj/structure/closet/crate/freezer/food
+	name = "food icebox"
+	icon_state = "food"
+	base_icon_state = "food"
+
 /obj/structure/closet/crate/radiation
 	desc = "A crate with a radiation sign on it."
 	name = "radiation crate"
@@ -271,6 +286,21 @@
 	icon_state = "hydrocrate"
 	base_icon_state = "hydrocrate"
 
+/obj/structure/closet/crate/centcom
+	name = "centcom crate"
+	icon_state = "centcom"
+	base_icon_state = "centcom"
+
+/obj/structure/closet/crate/cargo
+	name = "cargo crate"
+	icon_state = "cargo"
+	base_icon_state = "cargo"
+
+/obj/structure/closet/crate/cargo/mining
+	name = "mining crate"
+	icon_state = "mining"
+	base_icon_state = "mining"
+
 /obj/structure/closet/crate/engineering
 	name = "engineering crate"
 	icon_state = "engi_crate"
@@ -280,6 +310,11 @@
 	icon_state = "engi_e_crate"
 	base_icon_state = "engi_e_crate"
 
+/obj/structure/closet/crate/engineering/atmos
+	name = "atmospherics crate"
+	icon_state = "atmos"
+	base_icon_state = "atmos"
+
 /obj/structure/closet/crate/rcd
 	desc = "A crate for the storage of an RCD."
 	name = "\improper RCD crate"
@@ -298,10 +333,15 @@
 	icon_state = "scicrate"
 	base_icon_state = "scicrate"
 
+/obj/structure/closet/crate/science/robo
+	name = "robotics crate"
+	icon_state = "robo"
+	base_icon_state = "robo"
+
 /obj/structure/closet/crate/mod
 	name = "MOD crate"
-	icon_state = "scicrate"
-	base_icon_state = "scicrate"
+	icon_state = "robo"
+	base_icon_state = "robo"
 
 /obj/structure/closet/crate/mod/PopulateContents()
 	..()
@@ -325,6 +365,8 @@
 
 /obj/structure/closet/crate/goldcrate
 	name = "gold crate"
+	icon_state = "gold"
+	base_icon_state = "gold"
 
 /obj/structure/closet/crate/goldcrate/PopulateContents()
 	..()
@@ -338,6 +380,8 @@
 
 /obj/structure/closet/crate/silvercrate
 	name = "silver crate"
+	icon_state = "silver"
+	base_icon_state = "silver"
 
 /obj/structure/closet/crate/silvercrate/PopulateContents()
 	..()
diff --git a/code/game/objects/structures/crates_lockers/crates/secure.dm b/code/game/objects/structures/crates_lockers/crates/secure.dm
index 595481b707c..81f7b97a3c1 100644
--- a/code/game/objects/structures/crates_lockers/crates/secure.dm
+++ b/code/game/objects/structures/crates_lockers/crates/secure.dm
@@ -63,8 +63,8 @@
 	base_icon_state = "hydrosecurecrate"
 
 /obj/structure/closet/crate/secure/freezer //for consistency with other "freezer" closets/crates
-	desc = "An insulated crate with a lock on it, used to secure perishables."
-	name = "secure kitchen crate"
+	desc = "An icebox with a lock on it, used to secure perishables."
+	name = "secure kitchen icebox"
 	icon_state = "kitchen_secure_crate"
 	base_icon_state = "kitchen_secure_crate"
 	paint_jobs = null
@@ -79,18 +79,49 @@
 	. = ..()
 	new /obj/effect/spawner/random/food_or_drink/pizzaparty(src)
 
+/obj/structure/closet/crate/secure/centcom
+	name = "secure centcom crate"
+	icon_state = "centcom_secure"
+	base_icon_state = "centcom_secure"
+
+/obj/structure/closet/crate/secure/cargo
+	name = "secure cargo crate"
+	icon_state = "cargo_secure"
+	base_icon_state = "cargo_secure"
+
+/obj/structure/closet/crate/secure/cargo/mining
+	name = "secure mining crate"
+	icon_state = "mining_secure"
+	base_icon_state = "mining_secure"
+
+/obj/structure/closet/crate/secure/radiation
+	name = "secure radioation crate"
+	icon_state = "radiation_secure"
+	base_icon_state = "radiation_secure"
+
 /obj/structure/closet/crate/secure/engineering
 	desc = "A crate with a lock on it, painted in the scheme of the station's engineers."
 	name = "secure engineering crate"
 	icon_state = "engi_secure_crate"
 	base_icon_state = "engi_secure_crate"
 
+/obj/structure/closet/crate/secure/engineering/atmos
+	name = "secure atmospherics crate"
+	desc = "A crate with a lock on it, painted in the scheme of the station's atmospherics engineers."
+	icon_state = "atmos_secure"
+	base_icon_state = "atmos_secure"
+
 /obj/structure/closet/crate/secure/science
 	name = "secure science crate"
 	desc = "A crate with a lock on it, painted in the scheme of the station's scientists."
 	icon_state = "scisecurecrate"
 	base_icon_state = "scisecurecrate"
 
+/obj/structure/closet/crate/secure/science/robo
+	name = "robotics science crate"
+	icon_state = "robo_secure"
+	base_icon_state = "robo_secure"
+
 /obj/structure/closet/crate/secure/owned
 	name = "private crate"
 	desc = "A crate cover designed to only open for who purchased its contents."
diff --git a/code/game/objects/structures/crates_lockers/crates/syndicrate.dm b/code/game/objects/structures/crates_lockers/crates/syndicrate.dm
index ff7cf8df03b..8403f822135 100644
--- a/code/game/objects/structures/crates_lockers/crates/syndicrate.dm
+++ b/code/game/objects/structures/crates_lockers/crates/syndicrate.dm
@@ -1,4 +1,4 @@
-/obj/structure/closet/crate/syndicrate
+/obj/structure/closet/crate/secure/syndicrate
 	name = "surplus syndicrate"
 	desc = "A conspicuous crate with the Syndicate logo on it. You don't know how to open it."
 	icon_state = "syndicrate"
@@ -20,7 +20,7 @@
 	laser = 50
 	energy = 100
 
-/obj/structure/closet/crate/syndicrate/before_open(mob/living/user, force)
+/obj/structure/closet/crate/secure/syndicrate/before_open(mob/living/user, force)
 	. = ..()
 	if(!.)
 		return FALSE
@@ -31,7 +31,7 @@
 
 	return TRUE
 
-/obj/structure/closet/crate/syndicrate/take_damage(damage_amount, damage_type = BRUTE, damage_flag = "", sound_effect = TRUE, attack_dir, armour_penetration = 0)
+/obj/structure/closet/crate/secure/syndicrate/take_damage(damage_amount, damage_type = BRUTE, damage_flag = "", sound_effect = TRUE, attack_dir, armour_penetration = 0)
 	if(created_items)
 		return ..()
 	if(damage_amount < DAMAGE_PRECISION)
@@ -43,7 +43,7 @@
 	qdel(src)
 
 ///ensures that the syndicrate can only be unlocked by opening it with a syndicrate_key
-/obj/structure/closet/crate/syndicrate/attackby(obj/item/item, mob/user, params)
+/obj/structure/closet/crate/secure/syndicrate/attackby(obj/item/item, mob/user, params)
 	if(!istype(item, /obj/item/syndicrate_key) || created_items)
 		return ..()
 	created_items = TRUE
@@ -53,17 +53,22 @@
 	qdel(item)
 	to_chat(user, span_notice("You twist the key into both locks at once, opening the crate."))
 	playsound(src, 'sound/machines/boltsup.ogg', 50, vary = FALSE)
-	update_appearance(updates = UPDATE_OVERLAYS)
 	togglelock(user)
 
-/obj/structure/closet/crate/syndicrate/attackby_secondary(obj/item/weapon, mob/user, params)
-	return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+/obj/structure/closet/crate/secure/syndicrate/togglelock(mob/living/user, silent)
+	if(broken || !created_items)
+		return
+	if(iscarbon(user))
+		add_fingerprint(user)
+	locked = !locked
+	user.visible_message(
+		span_notice("[user] [locked ? "locks" : "unlocks"] [src]."),
+		span_notice("You [locked ? "locked" : "unlocked"] [src]."),
+	)
+	update_appearance()
 
-///syndicrate has a unique overlay for being unlocked
-/obj/structure/closet/crate/syndicrate/closet_update_overlays(list/new_overlays)
-	. = new_overlays
-	if(created_items)
-		. += "syndicrate_unlocked"
+/obj/structure/closet/crate/secure/syndicrate/attackby_secondary(obj/item/weapon, mob/user, params)
+	return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
 
 /obj/item/syndicrate_key
 	name = "syndicrate key"
@@ -79,7 +84,7 @@
 /obj/item/syndicrate_key/add_item_context(obj/item/source, list/context, atom/target, mob/living/user)
 	. = ..()
 
-	var/obj/structure/closet/crate/syndicrate/target_structure = target
+	var/obj/structure/closet/crate/secure/syndicrate/target_structure = target
 	if(!istype(target_structure))
 		return NONE
 	if(target_structure.created_items)
diff --git a/code/modules/antagonists/fugitive/hunters/hunter_gear.dm b/code/modules/antagonists/fugitive/hunters/hunter_gear.dm
index 364a5165f1b..7ba0401829a 100644
--- a/code/modules/antagonists/fugitive/hunters/hunter_gear.dm
+++ b/code/modules/antagonists/fugitive/hunters/hunter_gear.dm
@@ -51,6 +51,8 @@
 
 /obj/structure/closet/crate/eva
 	name = "EVA crate"
+	icon_state = "o2crate"
+	base_icon_state = "o2crate"
 
 /obj/structure/closet/crate/eva/PopulateContents()
 	..()
diff --git a/code/modules/bitrunning/objects/loot_crate.dm b/code/modules/bitrunning/objects/loot_crate.dm
index 5af8c0d9477..e97e63a7e80 100644
--- a/code/modules/bitrunning/objects/loot_crate.dm
+++ b/code/modules/bitrunning/objects/loot_crate.dm
@@ -11,6 +11,8 @@
 /obj/structure/closet/crate/secure/bitrunning // Base class. Do not spawn this.
 	name = "base class cache"
 	desc = "Talk to a coder."
+	icon_state = "bitrunning"
+	base_icon_state = "bitrunning"
 
 /// The virtual domain - side of the bitrunning crate. Deliver to the send location.
 /obj/structure/closet/crate/secure/bitrunning/encrypted
diff --git a/code/modules/cargo/packs/emergency.dm b/code/modules/cargo/packs/emergency.dm
index fca1a201ac1..9969ea7d817 100644
--- a/code/modules/cargo/packs/emergency.dm
+++ b/code/modules/cargo/packs/emergency.dm
@@ -62,7 +62,7 @@
 	access = ACCESS_ATMOSPHERICS
 	contains = list(/obj/item/watertank/atmos)
 	crate_name = "firefighting backpack crate"
-	crate_type = /obj/structure/closet/crate/secure
+	crate_type = /obj/structure/closet/crate/secure/engineering/atmos
 
 /datum/supply_pack/emergency/internals
 	name = "Internals Crate"
diff --git a/code/modules/cargo/packs/engineering.dm b/code/modules/cargo/packs/engineering.dm
index f5d865de95c..ae03ffb0190 100644
--- a/code/modules/cargo/packs/engineering.dm
+++ b/code/modules/cargo/packs/engineering.dm
@@ -31,6 +31,7 @@
 					/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp,
 				)
 	crate_name= "\improper APLU MK-I kit"
+	crate_type = /obj/structure/closet/crate/science/robo
 
 /datum/supply_pack/engineering/conveyor
 	name = "Conveyor Assembly Crate"
@@ -125,6 +126,7 @@
 	access_view = ACCESS_ATMOSPHERICS
 	contains = list(/obj/machinery/portable_atmospherics/pump = 2)
 	crate_name = "portable air pump crate"
+	crate_type = /obj/structure/closet/crate/secure/engineering/atmos
 
 /datum/supply_pack/engineering/portascrubber
 	name = "Portable Scrubber Crate"
@@ -133,6 +135,7 @@
 	access_view = ACCESS_ATMOSPHERICS
 	contains = list(/obj/machinery/portable_atmospherics/scrubber = 2)
 	crate_name = "portable scrubber crate"
+	crate_type = /obj/structure/closet/crate/secure/engineering/atmos
 
 /datum/supply_pack/engineering/hugescrubber
 	name = "Huge Portable Scrubber Crate"
@@ -149,7 +152,7 @@
 	cost = CARGO_CRATE_VALUE * 2
 	contains = list(/obj/machinery/space_heater)
 	crate_name = "space heater crate"
-	crate_type = /obj/structure/closet/crate/large
+	crate_type = /obj/structure/closet/crate/secure/engineering/atmos
 
 /datum/supply_pack/engineering/bsa
 	name = "Bluespace Artillery Parts"
@@ -266,7 +269,7 @@
 	access = ACCESS_CE
 	contains = list(/obj/machinery/power/supermatter_crystal/shard)
 	crate_name = "supermatter shard crate"
-	crate_type = /obj/structure/closet/crate/secure/engineering
+	crate_type = /obj/structure/closet/crate/secure/radiation
 	dangerous = TRUE
 
 /datum/supply_pack/engine/tesla_coils
@@ -291,7 +294,7 @@
 					/obj/item/hfr_box/core,
 				)
 	crate_name = "HFR crate"
-	crate_type = /obj/structure/closet/crate/secure/engineering
+	crate_type = /obj/structure/closet/crate/secure/engineering/atmos
 	dangerous = TRUE
 
 /datum/supply_pack/engineering/rad_protection_modules
diff --git a/code/modules/cargo/packs/general.dm b/code/modules/cargo/packs/general.dm
index cd6df472d4b..1b4937f5ab4 100644
--- a/code/modules/cargo/packs/general.dm
+++ b/code/modules/cargo/packs/general.dm
@@ -72,7 +72,7 @@
 	access = ACCESS_COMMAND
 	cost = CARGO_CRATE_VALUE * 4
 	contains = list(/obj/item/encryptionkey/headset_com = 3)
-	crate_type = /obj/structure/closet/crate/secure
+	crate_type = /obj/structure/closet/crate/secure/centcom
 	crate_name = "command encryption key crate"
 
 /datum/supply_pack/misc/exploration_drone
diff --git a/code/modules/cargo/packs/imports.dm b/code/modules/cargo/packs/imports.dm
index 2c90d8603d0..22a2cd4dddc 100644
--- a/code/modules/cargo/packs/imports.dm
+++ b/code/modules/cargo/packs/imports.dm
@@ -316,4 +316,4 @@
 		/obj/item/stock_parts/card_reader = 1
 	)
 	crate_name = "materials market crate"
-	crate_type = /obj/structure/closet/crate
+	crate_type = /obj/structure/closet/crate/cargo
diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm
index 3cfb824b4e6..90315f5c772 100644
--- a/code/modules/cargo/packs/medical.dm
+++ b/code/modules/cargo/packs/medical.dm
@@ -1,7 +1,7 @@
 /datum/supply_pack/medical
 	group = "Medical"
 	access_view = ACCESS_MEDICAL
-	crate_type = /obj/structure/closet/crate/medical
+	crate_type = /obj/structure/closet/crate/medical/department
 
 /datum/supply_pack/medical/bloodpacks
 	name = "Blood Pack Variety Crate"
@@ -29,6 +29,7 @@
 					/obj/item/reagent_containers/hypospray/medipen/ekit = 3,
 					/obj/item/reagent_containers/hypospray/medipen/blood_loss = 3)
 	crate_name = "medipen crate"
+	crate_type = /obj/structure/closet/crate/medical
 
 /datum/supply_pack/medical/coroner_crate
 	name = "Autopsy Kit"
@@ -70,6 +71,7 @@
 	cost = CARGO_CRATE_VALUE * 5
 	contains = list(/obj/item/defibrillator/loaded = 2)
 	crate_name = "defibrillator crate"
+	crate_type = /obj/structure/closet/crate/medical
 
 /datum/supply_pack/medical/iv_drip
 	name = "IV Drip Crate"
@@ -77,6 +79,7 @@
 	cost = CARGO_CRATE_VALUE * 2
 	contains = list(/obj/machinery/iv_drip)
 	crate_name = "iv drip crate"
+	crate_type = /obj/structure/closet/crate/medical
 
 /datum/supply_pack/medical/supplies
 	name = "Medical Supplies Crate"
@@ -108,6 +111,7 @@
 					/obj/item/vending_refill/drugs,
 				)
 	crate_name = "medical supplies crate"
+	crate_type = /obj/structure/closet/crate/medical
 
 /datum/supply_pack/medical/supplies/fill(obj/structure/closet/crate/C)
 	for(var/i in 1 to 10)
@@ -120,6 +124,7 @@
 	cost = CARGO_CRATE_VALUE * 2
 	contains = list(/obj/item/storage/pill_bottle/sansufentanyl = 2)
 	crate_name = "experimental medicine crate"
+	crate_type = /obj/structure/closet/crate/medical
 
 /datum/supply_pack/medical/surgery
 	name = "Surgical Supplies Crate"
@@ -143,6 +148,7 @@
 	cost = CARGO_CRATE_VALUE * 6
 	access = ACCESS_MEDICAL
 	contains = list(/obj/machinery/iv_drip/saline)
+	crate_type = /obj/structure/closet/crate/large
 
 /datum/supply_pack/medical/virus
 	name = "Virus Crate"
diff --git a/code/modules/cargo/packs/organic.dm b/code/modules/cargo/packs/organic.dm
index eb26d5ec907..e5a1327b453 100644
--- a/code/modules/cargo/packs/organic.dm
+++ b/code/modules/cargo/packs/organic.dm
@@ -151,7 +151,7 @@
 	access = ACCESS_HYDROPONICS
 	contains = list(/obj/item/watertank)
 	crate_name = "hydroponics backpack crate"
-	crate_type = /obj/structure/closet/crate/secure
+	crate_type = /obj/structure/closet/crate/secure/hydroponics
 
 /datum/supply_pack/organic/pizza
 	name = "Pizza Crate"
diff --git a/code/modules/cargo/packs/science.dm b/code/modules/cargo/packs/science.dm
index 19a7710ffed..f0de463c449 100644
--- a/code/modules/cargo/packs/science.dm
+++ b/code/modules/cargo/packs/science.dm
@@ -113,7 +113,7 @@
 					/obj/item/clothing/head/utility/hardhat/red = 2,
 					/obj/item/storage/medkit = 2)
 	crate_name = "robotics assembly crate"
-	crate_type = /obj/structure/closet/crate/secure/science
+	crate_type = /obj/structure/closet/crate/secure/science/robo
 
 /datum/supply_pack/science/rped
 	name = "RPED crate"
@@ -176,4 +176,4 @@
 	access_view = ACCESS_ROBOTICS
 	contains = list(/obj/item/mod/core/standard = 3)
 	crate_name = "\improper MOD core crate"
-	crate_type = /obj/structure/closet/crate/secure/science
+	crate_type = /obj/structure/closet/crate/secure/science/robo
diff --git a/code/modules/cargo/packs/service.dm b/code/modules/cargo/packs/service.dm
index 45660dcc73e..47eee06e3c6 100644
--- a/code/modules/cargo/packs/service.dm
+++ b/code/modules/cargo/packs/service.dm
@@ -160,7 +160,7 @@
 	access_view = ACCESS_MINING_STATION
 	contains = list(/obj/item/storage/backpack/duffelbag/mining_conscript)
 	crate_name = "shaft miner starter kit"
-	crate_type = /obj/structure/closet/crate/secure
+	crate_type = /obj/structure/closet/crate/secure/cargo/mining
 
 /datum/supply_pack/service/survivalknives
 	name = "Survival Knives Crate"
@@ -169,6 +169,7 @@
 	cost = CARGO_CRATE_VALUE * 3
 	contains = list(/obj/item/knife/combat/survival = 3)
 	crate_name = "survival knife crate"
+	crate_type = /obj/structure/closet/crate/cargo/mining
 
 /datum/supply_pack/service/wedding
 	name = "Wedding Crate"
@@ -224,6 +225,7 @@
 					/obj/item/storage/box/donkpockets/donkpockethonk,
 				)
 	crate_name = "donk pocket crate"
+	crate_type = /obj/structure/closet/crate/freezer/food
 
 /datum/supply_pack/service/randomized/donkpockets/fill(obj/structure/closet/crate/C)
 	for(var/i in 1 to 3)
@@ -240,6 +242,7 @@
 					/obj/item/food/ready_donk/donkhiladas,
 				)
 	crate_name = "\improper Ready-Donk crate"
+	crate_type = /obj/structure/closet/crate/freezer/food
 
 /datum/supply_pack/service/randomized/ready_donk/fill(obj/structure/closet/crate/C)
 	for(var/i in 1 to 3)
diff --git a/code/modules/uplink/uplink_items/bundle.dm b/code/modules/uplink/uplink_items/bundle.dm
index a930784fe14..f236aa4da25 100644
--- a/code/modules/uplink/uplink_items/bundle.dm
+++ b/code/modules/uplink/uplink_items/bundle.dm
@@ -146,13 +146,13 @@
 			Rumored to contain a valuable assortment of items based on your current reputation, but you never know. Contents are sorted to always be worth 80 TC. \
 			The Syndicate will only provide one surplus item per agent."
 	cost = 20
-	item = /obj/structure/closet/crate/syndicrate
+	item = /obj/structure/closet/crate/secure/syndicrate
 	stock_key = UPLINK_SHARED_STOCK_SURPLUS
 	crate_tc_value = 80
-	crate_type = /obj/structure/closet/crate/syndicrate
+	crate_type = /obj/structure/closet/crate/secure/syndicrate
 
 /// edited version of fill crate for super surplus to ensure it can only be unlocked with the syndicrate key
-/datum/uplink_item/bundles_tc/surplus/united/fill_crate(obj/structure/closet/crate/syndicrate/surplus_crate, list/possible_items)
+/datum/uplink_item/bundles_tc/surplus/united/fill_crate(obj/structure/closet/crate/secure/syndicrate/surplus_crate, list/possible_items)
 	if(!istype(surplus_crate))
 		return
 	var/tc_budget = crate_tc_value
diff --git a/icons/obj/storage/crates.dmi b/icons/obj/storage/crates.dmi
index 7f78d049302..1a8f697781b 100644
Binary files a/icons/obj/storage/crates.dmi and b/icons/obj/storage/crates.dmi differ
diff --git a/icons/obj/storage/wrapping.dmi b/icons/obj/storage/wrapping.dmi
index acd91a3d700..944a6b84752 100644
Binary files a/icons/obj/storage/wrapping.dmi and b/icons/obj/storage/wrapping.dmi differ