[MIRROR] Staticpath [MDB ignore] (#12445)

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>

code/game/objects/structures/crates_lockers/__closets.dm

@@ -35,7 +35,7 @@
 
 	var/list/starts_with // List of type = count (or just type for 1)
 
-	var/decl/closet_appearance/closet_appearance = /decl/closet_appearance // The /decl that defines what decals we end up with, that makes our look unique
+	var/datum/decl/closet_appearance/closet_appearance = /datum/decl/closet_appearance // The /datum/decl that defines what decals we end up with, that makes our look unique
 
 	/// Currently animating the door transform
 	var/is_animating_door = FALSE

code/game/objects/structures/crates_lockers/_closets_appearance_definitions_yw.dm

@@ -1,4 +1,4 @@
-/decl/closet_appearance/medical_yw
+/datum/decl/closet_appearance/medical_yw
 	color = COLOR_OFF_WHITE
 	decals = null
 	extra_decals = list(
@@ -6,14 +6,14 @@
 		"stripes_horizontal" = COLOR_BLUE_GRAY
 	)
 
-/decl/closet_appearance/wall/autolok/shuttleemerg
+/datum/decl/closet_appearance/wall/autolok/shuttleemerg
 	color = COLOR_YELLOW_GRAY
 	decals = list(
 		"upper_side_vent",
 		"lower_side_vent"
 	)
 
-/decl/closet_appearance/secure_closet/lumber
+/datum/decl/closet_appearance/secure_closet/lumber
 	can_lock = FALSE
 	color = COLOR_WARM_YELLOW
 	decals = list(
@@ -25,7 +25,7 @@
 		"stripe_vertical_left_full" = COLOR_BEASTY_BROWN
 	)
 
-/decl/closet_appearance/secure_closet/blueshield
+/datum/decl/closet_appearance/secure_closet/blueshield
 	color = COLOR_PALE_BLUE_GRAY
 	decals = list("lower_side_vent")
 	extra_decals = list(
@@ -33,7 +33,7 @@
 		"command" = COLOR_CLOSET_GOLD
 	)
 
-/decl/closet_appearance/secure_closet/security_pilot
+/datum/decl/closet_appearance/secure_closet/security_pilot
 	color = COLOR_NT_RED
 	decals = list(
 		"lower_holes"

code/game/objects/structures/crates_lockers/closets/crittercrate.dm

@@ -1,4 +1,4 @@
 /obj/structure/closet/crate/critter
 	name = "critter crate"
 	desc = "A crate which can sustain life for a while."
-	closet_appearance = /decl/closet_appearance/large_crate/critter
+	closet_appearance = /datum/decl/closet_appearance/large_crate/critter

code/game/objects/structures/crates_lockers/closets/fitness.dm

@@ -1,7 +1,7 @@
 /obj/structure/closet/athletic_mixed
 	name = "athletic wardrobe"
 	desc = "It's a storage unit for athletic wear."
-	closet_appearance = /decl/closet_appearance/wardrobe/mixed
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/mixed
 
 	starts_with = list(
 		/obj/item/clothing/under/shorts/grey,
@@ -30,7 +30,7 @@
 /obj/structure/closet/athletic_swimwear
 	name = "athletic wardrobe"
 	desc = "It's a storage unit for swimwear."
-	closet_appearance = /decl/closet_appearance/wardrobe/mixed
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/mixed
 
 	starts_with = list(
 		/obj/item/clothing/under/shorts/grey,
@@ -52,7 +52,7 @@
 /obj/structure/closet/boxinggloves
 	name = "boxing gloves"
 	desc = "It's a storage unit for gloves for use in the boxing ring."
-	closet_appearance = /decl/closet_appearance/wardrobe/mixed
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/mixed
 
 	starts_with = list(
 		/obj/item/clothing/gloves/boxing/blue,
@@ -63,7 +63,7 @@
 /obj/structure/closet/masks
 	name = "mask closet"
 	desc = "IT'S A STORAGE UNIT FOR FIGHTER MASKS OLE!"
-	closet_appearance = /decl/closet_appearance/wardrobe/mixed
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/mixed
 
 	starts_with = list(
 		/obj/item/clothing/mask/luchador,
@@ -74,7 +74,7 @@
 /obj/structure/closet/lasertag/red
 	name = "red laser tag equipment"
 	desc = "It's a storage unit for laser tag equipment."
-	closet_appearance = /decl/closet_appearance/wardrobe/red
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/red
 
 	starts_with = list(
 		/obj/item/gun/energy/lasertag/red = 5,
@@ -87,7 +87,7 @@
 /obj/structure/closet/lasertag/blue
 	name = "blue laser tag equipment"
 	desc = "It's a storage unit for laser tag equipment."
-	closet_appearance = /decl/closet_appearance/wardrobe/blue
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/blue
 
 	starts_with = list(
 		/obj/item/gun/energy/lasertag/blue = 5,
@@ -99,7 +99,7 @@
 /obj/structure/closet/lasertag/omni
 	name = "unniversal laser tag equipment"
 	desc = "It's a storage unit for laser tag equipment."
-	closet_appearance = /decl/closet_appearance/wardrobe/purple
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/purple
 
 	starts_with = list(
 		/obj/item/gun/energy/lasertag/omni = 5,
@@ -111,7 +111,7 @@
 /obj/structure/closet/lasertag/red/laserdome
 	name = "red team laserdome equipment"
 	desc = "It's a storage unit for laser tag equipment."
-	closet_appearance = /decl/closet_appearance/wardrobe/red
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/red
 
 	starts_with = list(
 		/obj/item/encryptionkey/ent = 3,
@@ -125,7 +125,7 @@
 /obj/structure/closet/lasertag/blue/laserdome
 	name = "blue team laserdome equipment"
 	desc = "It's a storage unit for laser tag equipment."
-	closet_appearance = /decl/closet_appearance/wardrobe/blue
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/blue
 
 	starts_with = list(
 		/obj/item/encryptionkey/ent = 3,

code/game/objects/structures/crates_lockers/closets/gimmick.dm

@@ -2,7 +2,7 @@
 	name = "cabinet"
 	desc = "Old will forever be in fashion."
 	icon = 'icons/obj/closets/bases/cabinet.dmi'
-	closet_appearance = /decl/closet_appearance/cabinet
+	closet_appearance = /datum/decl/closet_appearance/cabinet
 
 	open_sound = 'sound/effects/wooden_closet_open.ogg'
 	close_sound = 'sound/effects/wooden_closet_close.ogg'
@@ -11,7 +11,7 @@
 /obj/structure/closet/acloset
 	name = "strange closet"
 	desc = "It looks alien!"
-	closet_appearance = /decl/closet_appearance/alien
+	closet_appearance = /datum/decl/closet_appearance/alien
 
 	open_sound = 'sound/machines/click.ogg'
 	close_sound = 'sound/machines/click.ogg'
@@ -19,13 +19,13 @@
 /obj/structure/closet/gimmick
 	name = "administrative supply closet"
 	desc = "It's a storage unit for things that have no right being here."
-	closet_appearance = /decl/closet_appearance/tactical
+	closet_appearance = /datum/decl/closet_appearance/tactical
 	anchored = FALSE
 
 /obj/structure/closet/gimmick/russian
 	name = "russian surplus closet"
 	desc = "It's a storage unit for Russian standard-issue surplus."
-	closet_appearance = /decl/closet_appearance/tactical
+	closet_appearance = /datum/decl/closet_appearance/tactical
 
 	starts_with = list(
 		/obj/item/clothing/head/ushanka = 5,
@@ -35,7 +35,7 @@
 /obj/structure/closet/gimmick/tacticool
 	name = "tacticool gear closet"
 	desc = "It's a storage unit for Tacticool gear."
-	closet_appearance = /decl/closet_appearance/tactical
+	closet_appearance = /datum/decl/closet_appearance/tactical
 
 	starts_with = list(
 		/obj/item/clothing/glasses/eyepatch,
@@ -51,7 +51,7 @@
 /obj/structure/closet/thunderdome
 	name = "\improper Thunderdome closet"
 	desc = "Everything you need!"
-	closet_appearance = /decl/closet_appearance/thunderdomered
+	closet_appearance = /datum/decl/closet_appearance/thunderdomered
 	anchored = TRUE
 
 /obj/structure/closet/thunderdome/tdred
@@ -67,7 +67,7 @@
 
 /obj/structure/closet/thunderdome/tdgreen
 	name = "green-team Thunderdome closet"
-	closet_appearance = /decl/closet_appearance/thunderdomegreen
+	closet_appearance = /datum/decl/closet_appearance/thunderdomegreen
 
 	starts_with = list(
 		/obj/item/clothing/suit/armor/tdome/green = 3,

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -19,7 +19,7 @@
 /obj/structure/closet/gmcloset
 	name = "formal closet"
 	desc = "It's a storage unit for formal clothing."
-	closet_appearance = /decl/closet_appearance/wardrobe/suit
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/suit
 
 	starts_with = list(
 		/obj/item/clothing/head/that = 2,
@@ -48,7 +48,7 @@
 /obj/structure/closet/chefcloset
 	name = "chef's closet"
 	desc = "It's a storage unit for foodservice garments."
-	closet_appearance = /decl/closet_appearance/wardrobe/white
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/white
 
 	starts_with = list(
 		/obj/item/clothing/under/sundress,
@@ -68,7 +68,7 @@
 /obj/structure/closet/jcloset
 	name = "custodial closet"
 	desc = "It's a storage unit for janitorial clothes and gear."
-	closet_appearance = /decl/closet_appearance/wardrobe/janitor
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/janitor
 
 	starts_with = list(
 		/obj/item/clothing/under/rank/janitor,
@@ -98,7 +98,7 @@
 /obj/structure/closet/lawcloset
 	name = "legal closet"
 	desc = "It's a storage unit for courtroom apparel and items."
-	closet_appearance = /decl/closet_appearance/wardrobe/suit
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/suit
 
 	starts_with = list(
 		/obj/item/clothing/under/lawyer/female = 2,
@@ -128,7 +128,7 @@
 /obj/structure/closet/jequipcloset
 	name = "custodial equipment closet"
 	desc = "It's a storage unit for janitorial clothes and gear."
-	closet_appearance = /decl/closet_appearance/wardrobe/janitor
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/janitor
 
 	starts_with = list(
 		/obj/item/flashlight = 5,

code/game/objects/structures/crates_lockers/closets/l3closet.dm

@@ -1,10 +1,10 @@
 /obj/structure/closet/l3closet
 	name = "level-3 biohazard suit closet"
 	desc = "It's a storage unit for level-3 biohazard gear."
-	closet_appearance = /decl/closet_appearance/bio
+	closet_appearance = /datum/decl/closet_appearance/bio
 
 /obj/structure/closet/l3closet/general
-	closet_appearance = /decl/closet_appearance/bio
+	closet_appearance = /datum/decl/closet_appearance/bio
 
 	starts_with = list(
 		/obj/item/clothing/suit/bio_suit/general = 2, // CHOMP Block Edit Start
@@ -14,7 +14,7 @@
 
 
 /obj/structure/closet/l3closet/virology
-	closet_appearance = /decl/closet_appearance/bio/virology
+	closet_appearance = /datum/decl/closet_appearance/bio/virology
 
 	starts_with = list(
 		// CHOMPEdit Start
@@ -26,7 +26,7 @@
 
 
 /obj/structure/closet/l3closet/security
-	closet_appearance = /decl/closet_appearance/bio/security
+	closet_appearance = /datum/decl/closet_appearance/bio/security
 
 	starts_with = list(
 		/obj/item/clothing/suit/bio_suit/security = 2, // CHOMP Block Edit Start
@@ -35,7 +35,7 @@
 		/obj/item/tank/oxygen = 2) // CHOMP Block Edit End
 
 /obj/structure/closet/l3closet/janitor
-	closet_appearance = /decl/closet_appearance/bio/janitor
+	closet_appearance = /datum/decl/closet_appearance/bio/janitor
 
 	starts_with = list(
 		/obj/item/clothing/suit/bio_suit/janitor = 2,
@@ -45,7 +45,7 @@
 
 
 /obj/structure/closet/l3closet/scientist
-	closet_appearance = /decl/closet_appearance/bio/science
+	closet_appearance = /datum/decl/closet_appearance/bio/science
 
 	starts_with = list(
 		/obj/item/clothing/suit/bio_suit/scientist = 2, // CHOMP Block Edit Start
@@ -65,7 +65,7 @@
 
 
 /obj/structure/closet/l3closet/medical
-	closet_appearance = /decl/closet_appearance/bio/medical
+	closet_appearance = /datum/decl/closet_appearance/bio/medical
 
 	starts_with = list(
 		/obj/item/clothing/suit/bio_suit/general = 3,

code/game/objects/structures/crates_lockers/closets/malfunction.dm

@@ -1,6 +1,6 @@
 /obj/structure/closet/malf/suits
 	desc = "It's a storage unit for operational gear."
-	closet_appearance = /decl/closet_appearance/tactical
+	closet_appearance = /datum/decl/closet_appearance/tactical
 
 	starts_with = list(
 		/obj/item/tank/jetpack/void,

code/game/objects/structures/crates_lockers/closets/misc_vr.dm

@@ -53,7 +53,7 @@
 /obj/structure/closet/secure_closet/explorer
 	name = "explorer locker" //CHOMP explo keep
 	req_access = list(ACCESS_EXPLORER)
-	closet_appearance = /decl/closet_appearance/secure_closet/expedition/explorer
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/expedition/explorer
 
 	starts_with = list(
 		/obj/item/clothing/under/explorer,
@@ -94,7 +94,7 @@
 /obj/structure/closet/secure_closet/pathfinder
 	name = "pathfinder locker"
 	req_access = list(ACCESS_PATHFINDER) //CHOMP explo keep
-	closet_appearance = /decl/closet_appearance/secure_closet/expedition/pathfinder
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/expedition/pathfinder
 
 	starts_with = list(
 		/obj/item/clothing/under/explorer,
@@ -142,7 +142,7 @@
 	name = "field medic locker"
 	desc = "Supplies for a wilderness first responder."
 	req_access = list(ACCESS_MEDICAL_EQUIP)
-	closet_appearance = /decl/closet_appearance/secure_closet/expedition/sar
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/expedition/sar
 
 	starts_with = list(
 		/obj/item/storage/backpack/dufflebag/emt,
@@ -194,7 +194,7 @@
 /obj/structure/closet/secure_closet/pilot
 	name = "pilot locker"
 	req_access = list(ACCESS_PILOT)
-	closet_appearance = /decl/closet_appearance/secure_closet/expedition/pilot
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/expedition/pilot
 
 	starts_with = list(
 		/obj/item/storage/backpack/parachute,
@@ -254,7 +254,7 @@
 	name = "autolok suit storage"
 	desc = "It's wall-mounted storage unit for an AutoLok suit."
 	icon = 'icons/obj/closets/bases/wall_double.dmi'
-	closet_appearance = /decl/closet_appearance/wall_double/autolok
+	closet_appearance = /datum/decl/closet_appearance/wall_double/autolok
 	open_sound = 'sound/machines/click.ogg'
 	close_sound = 'sound/machines/click.ogg'
 	anchored = TRUE
@@ -275,7 +275,7 @@
 	name = "emergency suit storage"
 	desc = "It's wall-mounted storage unit for an emergency suit."
 	icon = 'icons/obj/closets/bases/wall.dmi'
-	closet_appearance = /decl/closet_appearance/wall/emergency
+	closet_appearance = /datum/decl/closet_appearance/wall/emergency
 	open_sound = 'sound/machines/click.ogg'
 	close_sound = 'sound/machines/click.ogg'
 	anchored = TRUE

code/game/objects/structures/crates_lockers/closets/secure/bar.dm

@@ -1,7 +1,7 @@
 /obj/structure/closet/secure_closet/bar
 	name = "booze closet"
 	req_access = list(ACCESS_BAR)
-	closet_appearance = /decl/closet_appearance/cabinet/secure
+	closet_appearance = /datum/decl/closet_appearance/cabinet/secure
 
 	starts_with = list(
 		/obj/item/reagent_containers/food/drinks/bottle/small/beer = 10)

code/game/objects/structures/crates_lockers/closets/secure/cargo.dm

@@ -1,7 +1,7 @@
 /obj/structure/closet/secure_closet/cargotech
 	name = "cargo technician's locker"
 	req_access = list(ACCESS_CARGO)
-	closet_appearance = /decl/closet_appearance/secure_closet/cargo
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/cargo
 
 	starts_with = list(
 		/obj/item/clothing/under/rank/cargotech,
@@ -30,7 +30,7 @@
 /obj/structure/closet/secure_closet/quartermaster
 	name = "quartermaster's locker"
 	req_access = list(ACCESS_QM)
-	closet_appearance = /decl/closet_appearance/secure_closet/cargo/qm
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/cargo/qm
 
 	starts_with = list(
 		/obj/item/clothing/under/rank/cargo,
@@ -72,7 +72,7 @@
 /obj/structure/closet/secure_closet/miner
 	name = "miner's equipment"
 	req_access = list(ACCESS_MINING)
-	closet_appearance = /decl/closet_appearance/secure_closet/mining
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/mining
 
 	starts_with = list(
 		/obj/item/radio/headset/miner,
@@ -105,7 +105,7 @@
 /obj/structure/closet/lumber
 	name = "Lumberjack's equipment"
 	desc = "It's a storage unit for Lumberjack equpiment, though it seems the lock is broken."
-	closet_appearance = /decl/closet_appearance/secure_closet/lumber
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/lumber
 
 	starts_with = list(
 		/obj/item/radio/headset/miner,

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -1,7 +1,7 @@
 /obj/structure/closet/secure_closet/engineering_chief
 	name = "chief engineer's locker"
 	req_access = list(ACCESS_CE)
-	closet_appearance = /decl/closet_appearance/secure_closet/engineering/ce
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/engineering/ce
 
 	starts_with = list(
 		/obj/item/clothing/accessory/storage/brown_vest,
@@ -54,7 +54,7 @@
 /obj/structure/closet/secure_closet/engineering_electrical
 	name = "electrical supplies"
 	req_access = list(ACCESS_ENGINE_EQUIP)
-	closet_appearance = /decl/closet_appearance/secure_closet/engineering/electrical
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/engineering/electrical
 
 	starts_with = list(
 		/obj/item/clothing/gloves/yellow = 2,
@@ -72,7 +72,7 @@
 /obj/structure/closet/secure_closet/engineering_welding
 	name = "welding supplies"
 	req_access = list(ACCESS_CONSTRUCTION)
-	closet_appearance = /decl/closet_appearance/secure_closet/engineering/welding
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/engineering/welding
 
 	starts_with = list(
 		/obj/item/clothing/head/welding = 3,
@@ -90,7 +90,7 @@
 /obj/structure/closet/secure_closet/engineering_personal
 	name = "engineer's locker"
 	req_access = list(ACCESS_ENGINE_EQUIP)
-	closet_appearance = /decl/closet_appearance/secure_closet/engineering
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/engineering
 
 	starts_with = list(
 		/obj/item/clothing/accessory/storage/brown_vest,
@@ -124,7 +124,7 @@
 /obj/structure/closet/secure_closet/atmos_personal
 	name = "technician's locker"
 	req_access = list(ACCESS_ATMOSPHERICS)
-	closet_appearance = /decl/closet_appearance/secure_closet/engineering/atmos
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/engineering/atmos
 
 	starts_with = list(
 		/obj/item/clothing/accessory/storage/brown_vest,

code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm

@@ -1,7 +1,7 @@
 /obj/structure/closet/secure_closet/hydroponics
 	name = "botanist's locker"
 	req_access = list(ACCESS_HYDROPONICS)
-	closet_appearance = /decl/closet_appearance/secure_closet/hydroponics
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/hydroponics
 
 	starts_with = list(
 		/obj/item/storage/bag/plants,
@@ -33,7 +33,7 @@
 /obj/structure/closet/secure_closet/hydroponics/sci
 	name = "xenoflorist's locker"
 	req_access = list(ACCESS_XENOBIOLOGY)
-	closet_appearance = /decl/closet_appearance/secure_closet/hydroponics/xenoflora
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/hydroponics/xenoflora
 
 /obj/structure/closet/secure_closet/hydroponics/sci/Initialize(mapload)
 	starts_with += /obj/item/clothing/head/bio_hood/scientist

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -2,7 +2,7 @@
 	name = "medicine closet"
 	desc = "Filled with medical junk."
 	req_access = list(ACCESS_MEDICAL)
-	closet_appearance = /decl/closet_appearance/secure_closet/medical/alt
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/medical/alt
 
 	starts_with = list(
 		/obj/item/storage/box/autoinjectors,
@@ -16,7 +16,7 @@
 	name = "anesthetics closet"
 	desc = "Used to knock people out."
 	req_access = list(ACCESS_SURGERY)
-	closet_appearance = /decl/closet_appearance/secure_closet/medical
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/medical
 
 	starts_with = list(
 		/obj/item/tank/anesthetic = 3,
@@ -26,7 +26,7 @@
 /obj/structure/closet/secure_closet/medical3
 	name = "medical doctor's locker"
 	req_access = list(ACCESS_MEDICAL_EQUIP)
-	closet_appearance = /decl/closet_appearance/secure_closet/medical/doctor
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/medical/doctor
 
 	starts_with = list(
 		/obj/item/clothing/under/rank/medical,
@@ -94,7 +94,7 @@
 	name = "paramedic locker"
 	desc = "Supplies for a first responder."
 	req_access = list(ACCESS_MEDICAL_EQUIP)
-	closet_appearance = /decl/closet_appearance/secure_closet/medical/paramedic
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/medical/paramedic
 
 	starts_with = list(
 		/obj/item/storage/backpack/dufflebag/emt,
@@ -128,7 +128,7 @@
 /obj/structure/closet/secure_closet/chief_medical_officer
 	name = "chief medical officer's locker"
 	req_access = list(ACCESS_CMO)
-	closet_appearance = /decl/closet_appearance/secure_closet/cmo
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/cmo
 
 	starts_with = list(
 		/obj/item/clothing/under/rank/chief_medical_officer,
@@ -203,7 +203,7 @@
 	name = "chemical closet"
 	desc = "Store dangerous chemicals in here."
 	req_access = list(ACCESS_CHEMISTRY)
-	closet_appearance = /decl/closet_appearance/secure_closet/medical/chemistry
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/medical/chemistry
 
 	starts_with = list(
 		/obj/item/storage/box/pillbottles = 2,
@@ -220,7 +220,7 @@
 	name = "psychiatric cabinet"
 	desc = "Store psychology tools and medicines in here."
 	req_access = list(ACCESS_PSYCHIATRIST)
-	closet_appearance = /decl/closet_appearance/cabinet/secure
+	closet_appearance = /datum/decl/closet_appearance/cabinet/secure
 
 	open_sound = 'sound/effects/wooden_closet_open.ogg'
 	close_sound = 'sound/effects/wooden_closet_close.ogg'
@@ -251,7 +251,7 @@
 	wall_mounted = 1
 	store_mobs = 0
 	req_access = list(ACCESS_MEDICAL_EQUIP)
-	closet_appearance = /decl/closet_appearance/wall/medical
+	closet_appearance = /datum/decl/closet_appearance/wall/medical
 
 /obj/structure/closet/secure_closet/medical_wall/pills
 	name = "pill cabinet"

code/game/objects/structures/crates_lockers/closets/secure/personal.dm

@@ -20,7 +20,7 @@
 
 /obj/structure/closet/secure_closet/personal/patient
 	name = "patient's closet"
-	closet_appearance = /decl/closet_appearance/secure_closet/patient
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/patient
 
 	starts_with = list(
 		/obj/item/clothing/under/medigown,
@@ -29,7 +29,7 @@
 
 
 /obj/structure/closet/secure_closet/personal/cabinet
-	closet_appearance = /decl/closet_appearance/cabinet/secure
+	closet_appearance = /datum/decl/closet_appearance/cabinet/secure
 
 	open_sound = 'sound/effects/wooden_closet_open.ogg'
 	close_sound = 'sound/effects/wooden_closet_close.ogg'

code/game/objects/structures/crates_lockers/closets/secure/scientist.dm

@@ -1,7 +1,7 @@
 /obj/structure/closet/secure_closet/scientist
 	name = "scientist's locker"
 	req_access = list(ACCESS_TOX_STORAGE)
-	closet_appearance = /decl/closet_appearance/secure_closet/science
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/science
 
 	starts_with = list(
 		/obj/item/clothing/under/rank/scientist,
@@ -24,7 +24,7 @@
 /obj/structure/closet/secure_closet/research_director
 	name = "research director's locker"
 	req_access = list(ACCESS_RD)
-	closet_appearance = /decl/closet_appearance/secure_closet/science/rd
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/science/rd
 
 	starts_with = list(
 		/obj/item/clothing/suit/bio_suit/scientist,
@@ -59,7 +59,7 @@
 /obj/structure/closet/secure_closet/xenoarchaeologist
 	name = "Xenoarchaeologist Locker"
 	req_access = list(ACCESS_TOX_STORAGE)
-	closet_appearance = /decl/closet_appearance/secure_closet/science/xenoarch
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/science/xenoarch
 
 	starts_with = list(
 		/obj/item/clothing/under/rank/scientist,
@@ -76,7 +76,7 @@
 
 /obj/structure/closet/excavation
 	name = "Excavation tools"
-	closet_appearance = /decl/closet_appearance/secure_closet/engineering/tools/xenoarch
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/engineering/tools/xenoarch
 
 	starts_with = list(
 		/obj/item/storage/belt/archaeology,

code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm

@@ -12,7 +12,7 @@
 	health = 200
 	anchored = 1 //CHOMPADD - Making them properly IMMOBILE. Like the Desc says? Yeah...
 
-	closet_appearance = /decl/closet_appearance/secure_closet
+	closet_appearance = /datum/decl/closet_appearance/secure_closet
 
 /obj/structure/closet/secure_closet/can_open()
 	if(locked)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -1,7 +1,7 @@
 /obj/structure/closet/secure_closet/captains
 	name = "site manager's locker"
 	req_access = list(ACCESS_CAPTAIN)
-	closet_appearance = /decl/closet_appearance/secure_closet/command
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/command
 
 	starts_with = list(
 		/obj/item/storage/backpack/dufflebag/captain,
@@ -21,7 +21,7 @@
 /obj/structure/closet/secure_closet/hop
 	name = "head of personnel's locker"
 	req_access = list(ACCESS_HOP)
-	closet_appearance = /decl/closet_appearance/secure_closet/command/hop
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/command/hop
 
 	starts_with = list(
 		/obj/item/clothing/suit/storage/vest,
@@ -41,7 +41,7 @@
 /obj/structure/closet/secure_closet/hop2
 	name = "head of personnel's attire"
 	req_access = list(ACCESS_HOP)
-	closet_appearance = /decl/closet_appearance/secure_closet/command/hop
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/command/hop
 
 	starts_with = list(
 		/obj/item/clothing/under/rank/head_of_personnel,
@@ -81,7 +81,7 @@
 	name = "head of security's locker"
 	req_access = list(ACCESS_HOS)
 	storage_capacity = 2.6 * MOB_MEDIUM
-	closet_appearance = /decl/closet_appearance/secure_closet/security/hos
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/security/hos
 
 	starts_with = list(
 		/obj/item/clothing/head/helmet/HoS,
@@ -137,7 +137,7 @@
 	name = "warden's locker"
 	storage_capacity = 42
 	req_access = list(ACCESS_ARMORY)
-	closet_appearance = /decl/closet_appearance/secure_closet/security/warden
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/security/warden
 
 	starts_with = list(
 		/obj/item/clothing/under/rank/security/aces,
@@ -199,7 +199,7 @@
 /obj/structure/closet/secure_closet/security
 	name = "security officer's locker"
 	req_access = list(ACCESS_BRIG)
-	closet_appearance = /decl/closet_appearance/secure_closet/security
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/security
 
 	starts_with = list(
 		/obj/item/clothing/under/rank/security/aces,
@@ -271,7 +271,7 @@
 /obj/structure/closet/secure_closet/detective
 	name = "detective's cabinet"
 	req_access = list(ACCESS_FORENSICS_LOCKERS)
-	closet_appearance = /decl/closet_appearance/cabinet/secure
+	closet_appearance = /datum/decl/closet_appearance/cabinet/secure
 
 	open_sound = 'sound/effects/wooden_closet_open.ogg'
 	close_sound = 'sound/effects/wooden_closet_close.ogg'
@@ -302,7 +302,7 @@
 /obj/structure/closet/secure_closet/injection
 	name = "lethal injections locker"
 	req_access = list(ACCESS_CAPTAIN)
-	closet_appearance = /decl/closet_appearance/secure_closet/courtroom
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/courtroom
 
 	starts_with = list(
 		/obj/item/reagent_containers/syringe/ld50_syringe/choral = 2)
@@ -312,7 +312,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
 /obj/structure/closet/secure_closet/brig
 	name = "brig locker"
 	req_access = list(ACCESS_BRIG)
-	closet_appearance = /decl/closet_appearance/secure_closet/brig
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/brig
 	anchored = TRUE
 	var/id = null
 
@@ -335,7 +335,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
 /obj/structure/closet/secure_closet/courtroom
 	name = "courtroom locker"
 	req_access = list(ACCESS_LAWYER)
-	closet_appearance = /decl/closet_appearance/secure_closet/courtroom
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/courtroom
 
 	starts_with = list(
 		/obj/item/clothing/shoes/brown,
@@ -349,7 +349,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
 /obj/structure/closet/secure_closet/wall
 	name = "wall locker"
 	req_access = list(ACCESS_SECURITY)
-	closet_appearance = /decl/closet_appearance/wall
+	closet_appearance = /datum/decl/closet_appearance/wall
 	density = TRUE
 
 	//too small to put a man in

code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm

@@ -1,7 +1,7 @@
 /obj/structure/closet/secure_closet/hos
 	name = "head of security's attire"
 	req_access = list(ACCESS_HOS)
-	closet_appearance = /decl/closet_appearance/secure_closet/security/hos
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/security/hos
 	storage_capacity = 2.5 * MOB_MEDIUM
 
 	starts_with = list(
@@ -49,7 +49,7 @@
 /obj/structure/closet/secure_closet/hos2
 	name = "head of security's gear"
 	req_access = list(ACCESS_HOS)
-	closet_appearance = /decl/closet_appearance/secure_closet/security/hos
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/security/hos
 	storage_capacity = 2.5 * MOB_MEDIUM
 
 	starts_with = list(
@@ -82,7 +82,7 @@
 /obj/structure/closet/secure_closet/nanotrasen_security
 	name = "NanoTrasen security officer's locker"
 	req_access = list(ACCESS_BRIG)
-	closet_appearance = /decl/closet_appearance/secure_closet/nanotrasen/security
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/nanotrasen/security
 	storage_capacity = 3.5 * MOB_MEDIUM
 
 	starts_with = list(
@@ -124,7 +124,7 @@
 /obj/structure/closet/secure_closet/nanotrasen_commander
 	name = "NanoTrasen commander's locker"
 	req_access = list(ACCESS_BRIG)
-	closet_appearance = /decl/closet_appearance/secure_closet/nanotrasen/commander
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/nanotrasen/commander
 	storage_capacity = 3.5 * MOB_MEDIUM
 
 	starts_with = list(
@@ -174,7 +174,7 @@
 /obj/structure/closet/secure_closet/nanotrasen_warden
 	name = "NanoTrasen warden's locker"
 	req_access = list(ACCESS_BRIG)
-	closet_appearance = /decl/closet_appearance/secure_closet/nanotrasen/warden
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/nanotrasen/warden
 	storage_capacity = 3.5 * MOB_MEDIUM
 
 	starts_with = list(

code/game/objects/structures/crates_lockers/closets/syndicate.dm

@@ -1,7 +1,7 @@
 /obj/structure/closet/syndicate
 	name = "armory closet"
 	desc = "Why is this here?"
-	closet_appearance = /decl/closet_appearance/tactical/alt
+	closet_appearance = /datum/decl/closet_appearance/tactical/alt
 
 /obj/structure/closet/syndicate/personal
 	desc = "It's a storage unit for operative gear."

code/game/objects/structures/crates_lockers/closets/utility_closets.dm

@@ -15,7 +15,7 @@
 /obj/structure/closet/emcloset
 	name = "emergency closet"
 	desc = "It's a storage unit for emergency breathmasks and O2 tanks."
-	closet_appearance = /decl/closet_appearance/oxygen
+	closet_appearance = /datum/decl/closet_appearance/oxygen
 
 /obj/structure/closet/emcloset/Initialize(mapload)
 	switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10)))
@@ -69,7 +69,7 @@
 /obj/structure/closet/firecloset
 	name = "fire-safety closet"
 	desc = "It's a storage unit for fire-fighting supplies."
-	closet_appearance = /decl/closet_appearance/oxygen/fire
+	closet_appearance = /datum/decl/closet_appearance/oxygen/fire
 
 	starts_with = list(
 		/obj/item/clothing/suit/fire,
@@ -99,7 +99,7 @@
 /obj/structure/closet/firecloset/full/atmos
 	name = "atmos fire-safety closet"
 	desc = "It's a storage unit for atmospheric fire-fighting supplies."
-	closet_appearance = /decl/closet_appearance/oxygen/fire/atmos
+	closet_appearance = /datum/decl/closet_appearance/oxygen/fire/atmos
 
 	starts_with = list(
 		/obj/item/clothing/suit/fire/heavy,
@@ -114,7 +114,7 @@
 /obj/structure/closet/toolcloset
 	name = "tool closet"
 	desc = "It's a storage unit for tools."
-	closet_appearance = /decl/closet_appearance/secure_closet/engineering/tools
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/engineering/tools
 
 /obj/structure/closet/toolcloset/Initialize(mapload)
 	starts_with = list()
@@ -158,7 +158,7 @@
 /obj/structure/closet/radiation
 	name = "radiation suit closet"
 	desc = "It's a storage unit for rad-protective suits."
-	closet_appearance = /decl/closet_appearance/secure_closet/engineering/tools/radiation
+	closet_appearance = /datum/decl/closet_appearance/secure_closet/engineering/tools/radiation
 
 	starts_with = list(
 		/obj/item/clothing/suit/radiation = 2,
@@ -171,7 +171,7 @@
 /obj/structure/closet/bombcloset
 	name = "\improper EOD closet"
 	desc = "It's a storage unit for explosion-protective suits."
-	closet_appearance = /decl/closet_appearance/bomb
+	closet_appearance = /datum/decl/closet_appearance/bomb
 
 	starts_with = list(
 		/obj/item/clothing/suit/bomb_suit,
@@ -189,7 +189,7 @@
 /obj/structure/closet/bombclosetsecurity
 	name = "\improper EOD closet"
 	desc = "It's a storage unit for explosion-protective suits."
-	closet_appearance = /decl/closet_appearance/bomb/security
+	closet_appearance = /datum/decl/closet_appearance/bomb/security
 
 	starts_with = list(
 		/obj/item/clothing/suit/bomb_suit/security,
@@ -204,7 +204,7 @@
 	name = "fire-safety closet"
 	desc = "It's a storage unit for fire-fighting supplies."
 	icon = 'icons/obj/closets/bases/wall.dmi'
-	closet_appearance = /decl/closet_appearance/wall/hydrant
+	closet_appearance = /datum/decl/closet_appearance/wall/hydrant
 	plane = TURF_PLANE
 	layer = ABOVE_TURF_LAYER
 	anchored = TRUE
@@ -227,7 +227,7 @@
 	name = "first-aid closet"
 	desc = "It's wall-mounted storage unit for first aid supplies."
 	icon = 'icons/obj/closets/bases/wall.dmi'
-	closet_appearance = /decl/closet_appearance/wall/medical
+	closet_appearance = /datum/decl/closet_appearance/wall/medical
 	plane = TURF_PLANE
 	layer = ABOVE_TURF_LAYER
 	anchored = TRUE

code/game/objects/structures/crates_lockers/closets/utility_closets_yw.dm

@@ -1,7 +1,7 @@
 /obj/structure/closet/shuttleemerg //wall mounted fire closet
 	name = "emergency repairs closet"
 	desc = "It's a storage unit for emergency repair supplies."
-	closet_appearance = /decl/closet_appearance/wall/autolok/shuttleemerg
+	closet_appearance = /datum/decl/closet_appearance/wall/autolok/shuttleemerg
 	plane = TURF_PLANE
 	layer = ABOVE_TURF_LAYER
 	anchored = 1
@@ -20,4 +20,4 @@
 /obj/structure/closet/medical
 	name = "medical supply closet"
 	desc = "May or may not contain medical junk."
-	closet_appearance = /decl/closet_appearance/medical_yw
+	closet_appearance = /datum/decl/closet_appearance/medical_yw

code/game/objects/structures/crates_lockers/closets/walllocker.dm

@@ -5,7 +5,7 @@
 	desc = "A wall mounted storage locker."
 	name = "wall locker"
 	icon = 'icons/obj/closets/bases/wall.dmi'
-	closet_appearance = /decl/closet_appearance/wall
+	closet_appearance = /datum/decl/closet_appearance/wall
 	density = FALSE
 	anchored = TRUE
 	store_mobs = 0
@@ -21,7 +21,7 @@
 	desc = "A wall mounted locker with emergency supplies."
 	var/list/spawnitems = list(/obj/item/tank/emergency/oxygen,/obj/item/clothing/mask/breath,/obj/item/tool/crowbar/red,/obj/item/flashlight/flare,)
 	var/amount = 2 // spawns each items X times.
-	closet_appearance = /decl/closet_appearance/wall/emergency
+	closet_appearance = /datum/decl/closet_appearance/wall/emergency
 
 /obj/structure/closet/walllocker/emerglocker/toggle(mob/user as mob)
 	src.attack_hand(user)
@@ -63,7 +63,7 @@
 /obj/structure/closet/walllocker/medical
 	name = "first-aid closet"
 	desc = "It's a wall-mounted storage unit for first aid supplies."
-	closet_appearance = /decl/closet_appearance/wall/medical
+	closet_appearance = /datum/decl/closet_appearance/wall/medical
 
 /obj/structure/closet/walllocker/medical/north
 	pixel_y = 32
@@ -84,7 +84,7 @@
 /obj/structure/closet/walllocker/wooden
 	name = "wooden cabinet"
 	desc = "A wall mounted storage cabinet."
-	closet_appearance = /decl/closet_appearance/wall_double/wooden
+	closet_appearance = /datum/decl/closet_appearance/wall_double/wooden
 
 /obj/structure/closet/walllocker/wooden/north
 	pixel_y = 32
@@ -108,7 +108,7 @@
 	desc = "A wall mounted storage cabinet."
 	name = "wall cabinet"
 	icon = 'icons/obj/closets/bases/wall_double.dmi'
-	closet_appearance = /decl/closet_appearance/wall_double
+	closet_appearance = /datum/decl/closet_appearance/wall_double
 	density = FALSE
 	anchored = TRUE
 	store_mobs = 0
@@ -139,7 +139,7 @@
 	desc = "A wall mounted storage cabinet, for the kitchen. Now where's the flour gone..?"
 	name = "kitchen cabinet"
 	icon = 'icons/obj/closets/bases/wall_double.dmi'
-	closet_appearance = /decl/closet_appearance/wall_double/kitchen
+	closet_appearance = /datum/decl/closet_appearance/wall_double/kitchen
 	density = FALSE
 	anchored = TRUE
 
@@ -162,7 +162,7 @@
 /obj/structure/closet/walllocker_double/medical
 	name = "medical cabinet"
 	desc = "A wall mounted medical supply cabinet. Probably full of drugs!"	//not actually full of drugs, sorry!
-	closet_appearance = /decl/closet_appearance/wall_double/medical
+	closet_appearance = /datum/decl/closet_appearance/wall_double/medical
 
 /obj/structure/closet/walllocker_double/medical/north
 	pixel_y = 32
@@ -183,7 +183,7 @@
 /obj/structure/closet/walllocker_double/emergency_engi
 	name = "emergency supplies cabinet"
 	desc = "A wall mounted cabinet. Seemingly has cool stuff for 'emergency use only'."
-	closet_appearance = /decl/closet_appearance/wall_double/emergency_engi
+	closet_appearance = /datum/decl/closet_appearance/wall_double/emergency_engi
 
 	starts_with = list(
 		/obj/item/clothing/mask/breath = 2,
@@ -210,7 +210,7 @@
 /obj/structure/closet/walllocker_double/hydrant
 	name = "fire-safety closet"
 	desc = "It's a storage cabinet packed with fire-fighting supplies."
-	closet_appearance = /decl/closet_appearance/wall_double/fire_safety
+	closet_appearance = /datum/decl/closet_appearance/wall_double/fire_safety
 
 	starts_with = list(
 		/obj/item/clothing/suit/fire,
@@ -240,7 +240,7 @@
 	desc = "A wall mounted storage cabinet. It contains a small amount of emergency supplies for wilderness survival, but they probably won't last very long."
 	name = "emergency survival wall cabinet"
 	icon = 'icons/obj/closets/bases/wall_double.dmi'
-	closet_appearance = /decl/closet_appearance/wall_double/survival
+	closet_appearance = /datum/decl/closet_appearance/wall_double/survival
 	density = FALSE
 	anchored = TRUE
 	store_mobs = 0
@@ -280,7 +280,7 @@
 /obj/structure/closet/walllocker_double/security
 	name = "security cabinet"
 	desc = "A wall mounted cabinet. This one is suspiciously red."
-	closet_appearance = /decl/closet_appearance/wall_double/security
+	closet_appearance = /datum/decl/closet_appearance/wall_double/security
 
 /obj/structure/closet/walllocker_double/security/north
 	pixel_y = 32
@@ -299,7 +299,7 @@
 	dir = EAST
 
 /obj/structure/closet/walllocker_double/misc_civ
-	closet_appearance = /decl/closet_appearance/wall_double/gaming
+	closet_appearance = /datum/decl/closet_appearance/wall_double/gaming
 
 /obj/structure/closet/walllocker_double/misc_civ/north
 	pixel_y = 32
@@ -318,7 +318,7 @@
 	dir = EAST
 
 /obj/structure/closet/walllocker_double/generic_civ
-	closet_appearance = /decl/closet_appearance/wall_double/generic_civ
+	closet_appearance = /datum/decl/closet_appearance/wall_double/generic_civ
 
 /obj/structure/closet/walllocker_double/generic_civ/north
 	pixel_y = 32
@@ -337,7 +337,7 @@
 	dir = EAST
 
 /obj/structure/closet/walllocker_double/casino
-	closet_appearance = /decl/closet_appearance/wall_double/casino
+	closet_appearance = /datum/decl/closet_appearance/wall_double/casino
 
 /obj/structure/closet/walllocker_double/casino/north
 	pixel_y = 32
@@ -357,7 +357,7 @@
 
 /obj/structure/closet/walllocker_double/cargo
 	desc = "A wall mounted cabinet. This one is in cargo colors."
-	closet_appearance = /decl/closet_appearance/wall_double/cargo
+	closet_appearance = /datum/decl/closet_appearance/wall_double/cargo
 
 /obj/structure/closet/walllocker_double/cargo/north
 	pixel_y = 32
@@ -377,7 +377,7 @@
 
 /obj/structure/closet/walllocker_double/science
 	desc = "A wall mounted cabinet. This one is in research colors."
-	closet_appearance = /decl/closet_appearance/wall_double/science
+	closet_appearance = /datum/decl/closet_appearance/wall_double/science
 
 /obj/structure/closet/walllocker_double/science/north
 	pixel_y = 32
@@ -397,7 +397,7 @@
 
 /obj/structure/closet/walllocker_double/command
 	desc = "A wall mounted cabinet. This one is in command colors."
-	closet_appearance = /decl/closet_appearance/wall_double/command
+	closet_appearance = /datum/decl/closet_appearance/wall_double/command
 
 /obj/structure/closet/walllocker_double/command/north
 	pixel_y = 32
@@ -416,23 +416,23 @@
 	dir = EAST
 
 /obj/structure/closet/walllocker_double/command/ce
-	closet_appearance = /decl/closet_appearance/wall_double/ce
+	closet_appearance = /datum/decl/closet_appearance/wall_double/ce
 
 /obj/structure/closet/walllocker_double/command/cmo
-	closet_appearance = /decl/closet_appearance/wall_double/cmo
+	closet_appearance = /datum/decl/closet_appearance/wall_double/cmo
 
 /obj/structure/closet/walllocker_double/command/rd
-	closet_appearance = /decl/closet_appearance/wall_double/rd
+	closet_appearance = /datum/decl/closet_appearance/wall_double/rd
 
 /obj/structure/closet/walllocker_double/command/hos
-	closet_appearance = /decl/closet_appearance/wall_double/hos
+	closet_appearance = /datum/decl/closet_appearance/wall_double/hos
 
 /obj/structure/closet/walllocker_double/command/iaa
-	closet_appearance = /decl/closet_appearance/wall_double/iaa
+	closet_appearance = /datum/decl/closet_appearance/wall_double/iaa
 
 /obj/structure/closet/walllocker_double/engineering
 	desc = "A wall mounted cabinet. This one is in engineering colors."
-	closet_appearance = /decl/closet_appearance/wall_double/engineering
+	closet_appearance = /datum/decl/closet_appearance/wall_double/engineering
 
 /obj/structure/closet/walllocker_double/engineering/north
 	pixel_y = 32

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -1,11 +1,11 @@
 /obj/structure/closet/wardrobe
 	name = "wardrobe"
 	desc = "It's a storage unit for standard-issue attire."
-	closet_appearance = /decl/closet_appearance/wardrobe
+	closet_appearance = /datum/decl/closet_appearance/wardrobe
 
 /obj/structure/closet/wardrobe/red
 	name = "security wardrobe"
-	closet_appearance = /decl/closet_appearance/wardrobe/red
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/red
 
 	starts_with = list(
 		/obj/item/clothing/under/rank/security = 3,
@@ -43,7 +43,7 @@
 
 /obj/structure/closet/wardrobe/detective
 	name = "detective wardrobe"
-	closet_appearance = /decl/closet_appearance/cabinet
+	closet_appearance = /datum/decl/closet_appearance/cabinet
 
 	open_sound = 'sound/effects/wooden_closet_open.ogg'
 	close_sound = 'sound/effects/wooden_closet_close.ogg'
@@ -68,7 +68,7 @@
 
 /obj/structure/closet/wardrobe/pink
 	name = "pink wardrobe"
-	closet_appearance = /decl/closet_appearance/wardrobe/pink
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/pink
 
 	starts_with = list(
 		/obj/item/clothing/under/color/pink = 3,
@@ -79,7 +79,7 @@
 
 /obj/structure/closet/wardrobe/black
 	name = "black wardrobe"
-	closet_appearance = /decl/closet_appearance/wardrobe/black
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/black
 
 	starts_with = list(
 		/obj/item/clothing/under/color/black = 3,
@@ -110,7 +110,7 @@
 /obj/structure/closet/wardrobe/chaplain_black
 	name = "chapel wardrobe"
 	desc = "It's a storage unit for approved religious attire."
-	closet_appearance = /decl/closet_appearance/wardrobe/chapel
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/chapel
 
 	starts_with = list(
 		/obj/item/clothing/under/rank/chaplain,
@@ -131,7 +131,7 @@
 /obj/structure/closet/wardrobe/monastary
 	name = "Monastary wardrobe"
 	desc = "It's a storage unit for approved religious attire."
-	closet_appearance = /decl/closet_appearance/wardrobe/black
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/black
 
 	starts_with = list(
 		/obj/item/clothing/suit/unathi/mantle = 2,
@@ -144,7 +144,7 @@
 
 /obj/structure/closet/wardrobe/green
 	name = "green wardrobe"
-	closet_appearance = /decl/closet_appearance/wardrobe/green
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/green
 
 	starts_with = list(
 		/obj/item/clothing/under/color/green = 3,
@@ -157,7 +157,7 @@
 
 /obj/structure/closet/wardrobe/xenos
 	name = "xenos wardrobe"
-	closet_appearance = /decl/closet_appearance/wardrobe/xenos
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/xenos
 
 	starts_with = list(
 		/obj/item/clothing/suit/unathi/mantle,
@@ -171,7 +171,7 @@
 /obj/structure/closet/wardrobe/orange
 	name = "prison wardrobe"
 	desc = "It's a storage unit for regulation prisoner attire."
-	closet_appearance = /decl/closet_appearance/wardrobe/orange
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/orange
 
 	starts_with = list(
 		/obj/item/clothing/under/color/prison = 3,
@@ -182,7 +182,7 @@
 
 /obj/structure/closet/wardrobe/yellow
 	name = "yellow wardrobe"
-	closet_appearance = /decl/closet_appearance/wardrobe/yellow
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/yellow
 
 	starts_with = list(
 		/obj/item/clothing/under/color/yellow = 3,
@@ -195,7 +195,7 @@
 
 /obj/structure/closet/wardrobe/atmospherics_yellow
 	name = "atmospherics wardrobe"
-	closet_appearance = /decl/closet_appearance/wardrobe/engineer/atmos
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/engineer/atmos
 
 	starts_with = list(
 		/obj/item/clothing/under/rank/atmospheric_technician = 3,
@@ -209,7 +209,7 @@
 
 /obj/structure/closet/wardrobe/engineering_yellow
 	name = "engineering wardrobe"
-	closet_appearance = /decl/closet_appearance/wardrobe/engineer
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/engineer
 
 	starts_with = list(
 		/obj/item/clothing/under/rank/engineer = 3,
@@ -226,7 +226,7 @@
 
 /obj/structure/closet/wardrobe/white
 	name = "white wardrobe"
-	closet_appearance = /decl/closet_appearance/wardrobe/white
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/white
 
 	starts_with = list(
 		/obj/item/clothing/under/color/white = 3,
@@ -238,7 +238,7 @@
 
 /obj/structure/closet/wardrobe/pjs
 	name = "pajama wardrobe"
-	closet_appearance = /decl/closet_appearance/wardrobe/pjs
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/pjs
 
 	starts_with = list(
 		/obj/item/clothing/under/pj/red = 2,
@@ -249,7 +249,7 @@
 
 /obj/structure/closet/wardrobe/science_white
 	name = "science wardrobe"
-	closet_appearance = /decl/closet_appearance/wardrobe/science
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/science
 
 	starts_with = list(
 		/obj/item/clothing/under/rank/scientist = 3,
@@ -279,7 +279,7 @@
 
 /obj/structure/closet/wardrobe/robotics_black
 	name = "robotics wardrobe"
-	closet_appearance = /decl/closet_appearance/wardrobe/robotics
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/robotics
 
 	starts_with = list(
 		/obj/item/clothing/under/rank/roboticist = 2,
@@ -301,7 +301,7 @@
 
 /obj/structure/closet/wardrobe/chemistry_white
 	name = "chemistry wardrobe"
-	closet_appearance = /decl/closet_appearance/wardrobe/medical/chemistry
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/medical/chemistry
 
 	starts_with = list(
 		/obj/item/clothing/under/rank/chemist = 2,
@@ -316,7 +316,7 @@
 
 /obj/structure/closet/wardrobe/genetics_white
 	name = "genetics wardrobe"
-	closet_appearance = /decl/closet_appearance/wardrobe/medical/genetics
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/medical/genetics
 
 	starts_with = list(
 		/obj/item/clothing/under/rank/geneticist = 2,
@@ -329,7 +329,7 @@
 
 /obj/structure/closet/wardrobe/virology_white
 	name = "virology wardrobe"
-	closet_appearance = /decl/closet_appearance/wardrobe/medical/virology
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/medical/virology
 
 	starts_with = list(
 		/obj/item/clothing/under/rank/virologist = 2,
@@ -344,7 +344,7 @@
 
 /obj/structure/closet/wardrobe/medic_white
 	name = "medical wardrobe"
-	closet_appearance = /decl/closet_appearance/wardrobe/medical/white
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/medical/white
 
 	starts_with = list(
 		/obj/item/clothing/under/rank/medical = 2,
@@ -369,7 +369,7 @@
 
 /obj/structure/closet/wardrobe/medic_gown
 	name = "cloning wardrobe"
-	closet_appearance = /decl/closet_appearance/wardrobe/medical/patient
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/medical/patient
 
 	starts_with = list(
 		/obj/item/clothing/under/medigown = 4)
@@ -377,7 +377,7 @@
 
 /obj/structure/closet/wardrobe/grey
 	name = "grey wardrobe"
-	closet_appearance = /decl/closet_appearance/wardrobe/grey
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/grey
 
 	starts_with = list(
 		/obj/item/clothing/under/color/grey = 3,
@@ -389,7 +389,7 @@
 
 /obj/structure/closet/wardrobe/mixed
 	name = "mixed wardrobe"
-	closet_appearance = /decl/closet_appearance/wardrobe/mixed
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/mixed
 
 	starts_with = list(
 		/obj/item/clothing/under/color/blue,
@@ -428,7 +428,7 @@
 
 /obj/structure/closet/wardrobe/tactical
 	name = "tactical equipment"
-	closet_appearance = /decl/closet_appearance/tactical
+	closet_appearance = /datum/decl/closet_appearance/tactical
 
 	starts_with = list(
 		/obj/item/clothing/under/tactical,
@@ -453,7 +453,7 @@
 
 /obj/structure/closet/wardrobe/ert
 	name = "emergency response team equipment"
-	closet_appearance = /decl/closet_appearance/ert
+	closet_appearance = /datum/decl/closet_appearance/ert
 
 	starts_with = list(
 		/obj/item/clothing/under/rank/centcom,
@@ -471,7 +471,7 @@
 
 /obj/structure/closet/wardrobe/suit
 	name = "suit locker"
-	closet_appearance = /decl/closet_appearance/wardrobe/suit
+	closet_appearance = /datum/decl/closet_appearance/wardrobe/suit
 
 	starts_with = list(
 		/obj/item/clothing/under/assistantformal,
@@ -499,7 +499,7 @@
 
 /obj/structure/closet/wardrobe/captain
 	name = "site manager's wardrobe"
-	closet_appearance = /decl/closet_appearance/cabinet
+	closet_appearance = /datum/decl/closet_appearance/cabinet
 
 	open_sound = 'sound/effects/wooden_closet_open.ogg'
 	close_sound = 'sound/effects/wooden_closet_close.ogg'

code/game/objects/structures/crates_lockers/closets/wardrobe_vr.dm

@@ -1,6 +1,6 @@
 //ert wardrobe override, because these guys really don't need edgy red lockers with CCO dress uniforms, syndi(!!) turtlenecks, two edgy skull bandanas, or facemasks with no sprite. -Killian
 /obj/structure/closet/wardrobe/ert
-	closet_appearance = /decl/closet_appearance/tactical/alt	//because ert lockers are red for some dumb reason
+	closet_appearance = /datum/decl/closet_appearance/tactical/alt	//because ert lockers are red for some dumb reason
 	starts_with = list(
 		/obj/item/clothing/under/ert,
 		/obj/item/radio/headset/ert,
@@ -14,7 +14,7 @@
 //would you believe mercs have no official locker? well, now they do. basically just a rebranded ERT locker but hey, it's an option. -Killian
 /obj/structure/closet/wardrobe/merc
 	name = "mercenary equipment"
-	closet_appearance = /decl/closet_appearance/tactical
+	closet_appearance = /datum/decl/closet_appearance/tactical
 
 	starts_with = list(
 		/obj/item/clothing/under/tactical,

code/game/objects/structures/crates_lockers/crates.dm

@@ -4,7 +4,7 @@
 	name = "crate"
 	desc = "A rectangular steel crate."
 	icon = 'icons/obj/closets/bases/crate.dmi'
-	closet_appearance = /decl/closet_appearance/crate
+	closet_appearance = /datum/decl/closet_appearance/crate
 	dir = 4 //Spawn facing 'forward' by default.
 	var/points_per_crate = 5
 	var/rigged = 0
@@ -138,7 +138,7 @@
 /obj/structure/closet/crate/secure
 	desc = "A secure crate."
 	name = "Secure crate"
-	closet_appearance = /decl/closet_appearance/crate/secure
+	closet_appearance = /datum/decl/closet_appearance/crate/secure
 	var/broken = 0
 	var/locked = 1
 
@@ -242,7 +242,7 @@
 /obj/structure/closet/crate/plastic
 	name = "plastic crate"
 	desc = "A rectangular plastic crate."
-	closet_appearance = /decl/closet_appearance/crate/plastic
+	closet_appearance = /datum/decl/closet_appearance/crate/plastic
 	points_per_crate = 1	//5 crates per ordered crate, +5 for the crate it comes in.
 
 /obj/structure/closet/crate/internals
@@ -252,7 +252,7 @@
 /obj/structure/closet/crate/trashcart
 	name = "trash cart"
 	desc = "A heavy, metal trashcart with wheels."
-	closet_appearance = /decl/closet_appearance/cart/trash
+	closet_appearance = /datum/decl/closet_appearance/cart/trash
 
 /*these aren't needed anymore
 /obj/structure/closet/crate/hat
@@ -267,7 +267,7 @@
 /obj/structure/closet/crate/medical
 	name = "medical crate"
 	desc = "A medical crate."
-	closet_appearance = /decl/closet_appearance/crate/medical
+	closet_appearance = /datum/decl/closet_appearance/crate/medical
 
 /obj/structure/closet/crate/rcd
 	name = "\improper RCD crate"
@@ -295,25 +295,25 @@
 /obj/structure/closet/crate/freezer
 	name = "freezer"
 	desc = "A freezer."
-	closet_appearance = /decl/closet_appearance/crate/freezer
+	closet_appearance = /datum/decl/closet_appearance/crate/freezer
 	var/target_temp = T0C - 40
 	var/cooling_power = 40
 
 /obj/structure/closet/crate/freezer/centauri
 	desc = "A freezer stamped with the logo of Centauri Provisions."
-	closet_appearance = /decl/closet_appearance/crate/freezer/centauri
+	closet_appearance = /datum/decl/closet_appearance/crate/freezer/centauri
 
 /obj/structure/closet/crate/freezer/nanotrasen
 	desc = "A freezer stamped with the logo of NanoTrasen."
-	closet_appearance = /decl/closet_appearance/crate/freezer/nanotrasen
+	closet_appearance = /datum/decl/closet_appearance/crate/freezer/nanotrasen
 
 /obj/structure/closet/crate/freezer/veymed
 	desc = "A freezer stamped with the logo of Vey-Medical."
-	closet_appearance = /decl/closet_appearance/crate/freezer/veymed
+	closet_appearance = /datum/decl/closet_appearance/crate/freezer/veymed
 
 /obj/structure/closet/crate/freezer/zenghu
 	desc = "A freezer stamped with the logo of Zeng-Hu Pharmaceuticals."
-	closet_appearance = /decl/closet_appearance/crate/freezer/zenghu
+	closet_appearance = /datum/decl/closet_appearance/crate/freezer/zenghu
 
 /obj/structure/closet/crate/freezer/return_air()
 	var/datum/gas_mixture/gas = (..())
@@ -347,7 +347,7 @@
 /obj/structure/closet/crate/weapon
 	name = "weapons crate"
 	desc = "A barely secured weapons crate."
-	closet_appearance = /decl/closet_appearance/crate/secure/weapon
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/weapon
 
 /obj/structure/closet/crate/freezer/rations //Fpr use in the escape shuttle
 	name = "emergency rations"
@@ -366,7 +366,7 @@
 /obj/structure/closet/crate/radiation
 	name = "radioactive gear crate"
 	desc = "A crate with a radiation sign on it."
-	closet_appearance = /decl/closet_appearance/crate/radiation
+	closet_appearance = /datum/decl/closet_appearance/crate/radiation
 
 	starts_with = list(
 		/obj/item/clothing/suit/radiation = 4,
@@ -376,111 +376,111 @@
 
 /obj/structure/closet/crate/aether
 	desc = "A crate painted in the colours of Aether Atmospherics and Recycling."
-	closet_appearance = /decl/closet_appearance/crate/aether
+	closet_appearance = /datum/decl/closet_appearance/crate/aether
 
 /obj/structure/closet/crate/centauri
 	desc = "A crate decorated with the logo of Centauri Provisions."
-	closet_appearance = /decl/closet_appearance/crate/centauri
+	closet_appearance = /datum/decl/closet_appearance/crate/centauri
 
 /obj/structure/closet/crate/einstein
 	desc = "A crate labelled with an Einstein Engines sticker."
-	closet_appearance = /decl/closet_appearance/crate/einstein
+	closet_appearance = /datum/decl/closet_appearance/crate/einstein
 
 /obj/structure/closet/crate/focalpoint
 	desc = "A crate marked with the decal of Focal Point Energistics."
-	closet_appearance = /decl/closet_appearance/crate/focalpoint
+	closet_appearance = /datum/decl/closet_appearance/crate/focalpoint
 
 /obj/structure/closet/crate/gilthari
 	desc = "A crate embossed with the logo of Gilthari Exports."
-	closet_appearance = /decl/closet_appearance/crate/gilthari
+	closet_appearance = /datum/decl/closet_appearance/crate/gilthari
 
 /obj/structure/closet/crate/grayson
 	desc = "A bare metal crate spraypainted with Grayson Manufactories decals."
-	closet_appearance = /decl/closet_appearance/crate/grayson
+	closet_appearance = /datum/decl/closet_appearance/crate/grayson
 
 /obj/structure/closet/crate/heph
 	desc = "A sturdy crate marked with the logo of Hephaestus Industries."
-	closet_appearance = /decl/closet_appearance/crate/heph
+	closet_appearance = /datum/decl/closet_appearance/crate/heph
 
 /obj/structure/closet/crate/morpheus
 	desc = "A crate crudely imprinted with 'MORPHEUS CYBERKINETICS'."
-	closet_appearance = /decl/closet_appearance/crate/morpheus
+	closet_appearance = /datum/decl/closet_appearance/crate/morpheus
 
 /obj/structure/closet/crate/nanotrasen
 	desc = "A crate emblazoned with the standard NanoTrasen livery."
-	closet_appearance = /decl/closet_appearance/crate/nanotrasen
+	closet_appearance = /datum/decl/closet_appearance/crate/nanotrasen
 
 /obj/structure/closet/crate/nanothreads
 	desc = "A crate emblazoned with the NanoThreads Garments livery, a subsidary of the NanoTrasen Corporation."
-	closet_appearance = /decl/closet_appearance/crate/nanotrasenclothing
+	closet_appearance = /datum/decl/closet_appearance/crate/nanotrasenclothing
 
 /obj/structure/closet/crate/nanomed
 	desc = "A crate emblazoned with the NanoMed Medical livery, a subsidary of the NanoTrasen Corporation."
-	closet_appearance = /decl/closet_appearance/crate/nanotrasenmedical
+	closet_appearance = /datum/decl/closet_appearance/crate/nanotrasenmedical
 
 /obj/structure/closet/crate/oculum
 	desc = "A crate minimally decorated with the logo of media giant Oculum Broadcast."
-	closet_appearance = /decl/closet_appearance/crate/oculum
+	closet_appearance = /datum/decl/closet_appearance/crate/oculum
 
 /obj/structure/closet/crate/veymed
 	desc = "A sterile crate extensively detailed in Veymed colours."
-	closet_appearance = /decl/closet_appearance/crate/veymed
+	closet_appearance = /datum/decl/closet_appearance/crate/veymed
 
 /obj/structure/closet/crate/ward
 	desc = "A crate decaled with the logo of Ward-Takahashi."
-	closet_appearance = /decl/closet_appearance/crate/ward
+	closet_appearance = /datum/decl/closet_appearance/crate/ward
 
 /obj/structure/closet/crate/xion
 	desc = "A crate painted in Xion Manufacturing Group orange."
-	closet_appearance = /decl/closet_appearance/crate/xion
+	closet_appearance = /datum/decl/closet_appearance/crate/xion
 
 /obj/structure/closet/crate/zenghu
 	desc = "A sterile crate marked with the logo of Zeng-Hu Pharmaceuticals."
-	closet_appearance = /decl/closet_appearance/crate/zenghu
+	closet_appearance = /datum/decl/closet_appearance/crate/zenghu
 
 /obj/structure/closet/crate/coyote_salvage
 	desc = "A supply crate marked with Coyote Salvage Corp colours."
-	closet_appearance = /decl/closet_appearance/crate/coyotesalvage
+	closet_appearance = /datum/decl/closet_appearance/crate/coyotesalvage
 
 /obj/structure/closet/crate/nukies
 	desc = "A luridly-coloured supply crate with Nukies! branding. Is it legal to have this here?"
-	closet_appearance = /decl/closet_appearance/crate/nukies
+	closet_appearance = /datum/decl/closet_appearance/crate/nukies
 
 /obj/structure/closet/crate/desatti
 	desc = "A strikingly-coloured supply crate with Desatti Catering branding."
-	closet_appearance = /decl/closet_appearance/crate/desatti
+	closet_appearance = /datum/decl/closet_appearance/crate/desatti
 
 // Brands/subsidiaries
 
 /obj/structure/closet/crate/allico
 	desc = "A crate painted in the distinctive cheerful colours of AlliCo. Ltd."
-	closet_appearance = /decl/closet_appearance/crate/allico
+	closet_appearance = /datum/decl/closet_appearance/crate/allico
 
 /obj/structure/closet/crate/carp
 	desc = "A crate painted with the garish livery of Consolidated Agricultural Resources Plc."
-	closet_appearance = /decl/closet_appearance/crate/carp
+	closet_appearance = /datum/decl/closet_appearance/crate/carp
 
 /obj/structure/closet/crate/hedberg
 	name = "weapons crate"
 	desc = "A weapons crate stamped with the logo of Hedberg-Hammarstrom and the lock conspicuously absent."
-	closet_appearance = /decl/closet_appearance/crate/secure/hedberg
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/hedberg
 
 /obj/structure/closet/crate/galaksi
 	desc = "A crate printed with the markings of Ward-Takahashi's Galaksi Appliance branding."
-	closet_appearance = /decl/closet_appearance/crate/galaksi
+	closet_appearance = /datum/decl/closet_appearance/crate/galaksi
 
 /obj/structure/closet/crate/thinktronic
 	desc = "A crate printed with the markings of Thinktronic Systems."
-	closet_appearance = /decl/closet_appearance/crate/thinktronic
+	closet_appearance = /datum/decl/closet_appearance/crate/thinktronic
 
 /obj/structure/closet/crate/ummarcar
 	desc = "A flimsy crate marked labelled 'UmMarcar Office Supply'."
-	closet_appearance = /decl/closet_appearance/crate/ummarcar
+	closet_appearance = /datum/decl/closet_appearance/crate/ummarcar
 
 /obj/structure/closet/crate/unathi
 	name = "import crate"
 	desc = "A crate painted with the markings of Moghes Imported Sissalik Jerky."
-	closet_appearance = /decl/closet_appearance/crate/unathiimport
+	closet_appearance = /datum/decl/closet_appearance/crate/unathiimport
 
 
 // Secure Crates
@@ -488,103 +488,103 @@
 /obj/structure/closet/crate/secure/weapon
 	name = "weapons crate"
 	desc = "A secure weapons crate."
-	closet_appearance = /decl/closet_appearance/crate/secure/weapon
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/weapon
 
 /obj/structure/closet/crate/secure/aether
 	desc = "A secure crate painted in the colours of Aether Atmospherics and Recycling."
-	closet_appearance = /decl/closet_appearance/crate/secure/aether
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/aether
 
 /obj/structure/closet/crate/secure/bishop
 	desc = "A secure crate finely decorated with the emblem of Bishop Cybernetics."
-	closet_appearance = /decl/closet_appearance/crate/secure/bishop
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/bishop
 
 /obj/structure/closet/crate/secure/cybersolutions
 	desc = "An unadorned secure metal crate labelled 'Cyber Solutions'."
-	closet_appearance = /decl/closet_appearance/crate/secure/cybersolutions
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/cybersolutions
 
 /obj/structure/closet/crate/secure/einstein
 	desc = "A secure crate labelled with an Einstein Engines sticker."
-	closet_appearance = /decl/closet_appearance/crate/secure/einstein
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/einstein
 
 /obj/structure/closet/crate/secure/focalpoint
 	desc = "A secure crate marked with the decal of Focal Point Energistics."
-	closet_appearance = /decl/closet_appearance/crate/secure/focalpoint
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/focalpoint
 
 /obj/structure/closet/crate/secure/gilthari
 	desc = "A secure crate embossed with the logo of Gilthari Exports."
-	closet_appearance = /decl/closet_appearance/crate/secure/gilthari
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/gilthari
 
 /obj/structure/closet/crate/secure/grayson
 	desc = "A secure bare metal crate spraypainted with Grayson Manufactories decals."
-	closet_appearance = /decl/closet_appearance/crate/secure/grayson
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/grayson
 
 /obj/structure/closet/crate/secure/hedberg
 	name = "weapons crate"
 	desc = "A secure weapons crate stamped with the logo of Hedberg-Hammarstrom."
-	closet_appearance = /decl/closet_appearance/crate/secure/hedberg
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/hedberg
 
 /obj/structure/closet/crate/secure/heph
 	name = "weapons crate"
 	desc = "A secure weapons crate marked with the logo of Hephaestus Industries."
-	closet_appearance = /decl/closet_appearance/crate/secure/heph
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/heph
 
 /obj/structure/closet/crate/secure/lawson
 	name = "weapons crate"
 	desc = "A secure weapons crate marked with the logo of Lawson Arms."
-	closet_appearance = /decl/closet_appearance/crate/secure/lawson
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/lawson
 
 /obj/structure/closet/crate/secure/morpheus
 	desc = "A secure crate crudely imprinted with 'MORPHEUS CYBERKINETICS'."
-	closet_appearance = /decl/closet_appearance/crate/secure/morpheus
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/morpheus
 
 /obj/structure/closet/crate/secure/nanotrasen
 	desc = "A secure crate emblazoned with the standard NanoTrasen livery."
-	closet_appearance = /decl/closet_appearance/crate/secure/nanotrasen
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/nanotrasen
 
 /obj/structure/closet/crate/secure/nanomed
 	desc = "A secure crate emblazoned with the NanoMed Medical livery, a subsidary of the NanoTrasen Corporation."
-	closet_appearance = /decl/closet_appearance/crate/secure/nanotrasenmedical
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/nanotrasenmedical
 
 /obj/structure/closet/crate/secure/scg
 	name = "weapons crate"
 	desc = "A secure crate in the official colours of the Solar Confederate Government."
-	closet_appearance = /decl/closet_appearance/crate/secure/solgov
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/solgov
 
 /obj/structure/closet/crate/secure/saare
 	name = "weapons crate"
 	desc = "A secure weapons crate plainly stamped with the logo of Stealth Assault Enterprises."
-	closet_appearance = /decl/closet_appearance/crate/secure/saare
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/saare
 
 /obj/structure/closet/crate/secure/veymed
 	desc = "A secure sterile crate extensively detailed in Veymed colours."
-	closet_appearance = /decl/closet_appearance/crate/secure/veymed
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/veymed
 
 /obj/structure/closet/crate/secure/ward
 	desc = "A secure crate decaled with the logo of Ward-Takahashi."
-	closet_appearance = /decl/closet_appearance/crate/secure/ward
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/ward
 
 /obj/structure/closet/crate/secure/xion
 	desc = "A secure crate painted in Xion Manufacturing Group orange."
-	closet_appearance = /decl/closet_appearance/crate/secure/xion
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/xion
 
 /obj/structure/closet/crate/secure/zenghu
 	desc = "A secure sterile crate marked with the logo of Zeng-Hu Pharmaceuticals."
-	closet_appearance = /decl/closet_appearance/crate/secure/zenghu
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/zenghu
 
 /obj/structure/closet/crate/secure/phoron
 	name = "phoron crate"
 	desc = "A secure phoron crate painted in standard NanoTrasen livery."
-	closet_appearance = /decl/closet_appearance/crate/secure/hazard
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/hazard
 
 /obj/structure/closet/crate/secure/gear
 	name = "gear crate"
 	desc = "A secure gear crate."
-	closet_appearance = /decl/closet_appearance/crate/secure/weapon
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/weapon
 
 /obj/structure/closet/crate/secure/hydrosec
 	name = "secure hydroponics crate"
 	desc = "A crate with a lock on it, painted in the scheme of the station's botanists."
-	closet_appearance = /decl/closet_appearance/crate/secure/hydroponics
+	closet_appearance = /datum/decl/closet_appearance/crate/secure/hydroponics
 
 /obj/structure/closet/crate/secure/engineering
 	desc = "A crate with a lock on it, painted in the scheme of the station's engineers."
@@ -604,7 +604,7 @@
 	name = "large crate"
 	desc = "A hefty metal crate."
 	icon = 'icons/obj/closets/bases/large_crate.dmi'
-	closet_appearance = /decl/closet_appearance/large_crate
+	closet_appearance = /datum/decl/closet_appearance/large_crate
 
 /obj/structure/closet/crate/large/close()
 	. = ..()
@@ -627,33 +627,33 @@
 /obj/structure/closet/crate/large/critter
 	name = "animal crate"
 	desc = "A hefty crate for hauling animals."
-	closet_appearance = /decl/closet_appearance/large_crate/critter
+	closet_appearance = /datum/decl/closet_appearance/large_crate/critter
 
 /obj/structure/closet/crate/large/aether
 	name = "large atmospherics crate"
 	desc = "A hefty metal crate, painted in Aether Atmospherics and Recycling colours."
-	closet_appearance = /decl/closet_appearance/large_crate/aether
+	closet_appearance = /datum/decl/closet_appearance/large_crate/aether
 
 /obj/structure/closet/crate/large/einstein
 	name = "large crate"
 	desc = "A hefty metal crate, painted in Einstein Engines colours."
-	closet_appearance = /decl/closet_appearance/large_crate/einstein
+	closet_appearance = /datum/decl/closet_appearance/large_crate/einstein
 
 /obj/structure/closet/crate/large/nanotrasen
 	name = "large crate"
 	desc = "A hefty metal crate, painted in standard NanoTrasen livery."
-	closet_appearance = /decl/closet_appearance/large_crate/nanotrasen
+	closet_appearance = /datum/decl/closet_appearance/large_crate/nanotrasen
 
 /obj/structure/closet/crate/large/xion
 	name = "large crate"
 	desc = "A hefty metal crate, painted in Xion Manufacturing Group orange."
-	closet_appearance = /decl/closet_appearance/large_crate/xion
+	closet_appearance = /datum/decl/closet_appearance/large_crate/xion
 
 /obj/structure/closet/crate/secure/large
 	name = "large crate"
 	desc = "A hefty metal crate with an electronic locking system."
 	icon = 'icons/obj/closets/bases/large_crate.dmi'
-	closet_appearance = /decl/closet_appearance/large_crate/secure
+	closet_appearance = /datum/decl/closet_appearance/large_crate/secure
 
 
 /obj/structure/closet/crate/secure/large/close()
@@ -681,23 +681,23 @@
 /obj/structure/closet/crate/secure/large/aether
 	name = "secure atmospherics crate"
 	desc = "A hefty metal crate with an electronic locking system, painted in Aether Atmospherics and Recycling colours."
-	closet_appearance = /decl/closet_appearance/large_crate/secure/aether
+	closet_appearance = /datum/decl/closet_appearance/large_crate/secure/aether
 
 /obj/structure/closet/crate/secure/large/einstein
 	desc = "A hefty metal crate with an electronic locking system, painted in Einstein Engines colours."
-	closet_appearance = /decl/closet_appearance/large_crate/secure/einstein
+	closet_appearance = /datum/decl/closet_appearance/large_crate/secure/einstein
 
 /obj/structure/closet/crate/large/secure/heph
 	desc = "A hefty metal crate with an electronic locking system, marked with Hephaestus Industries colours."
-	closet_appearance = /decl/closet_appearance/large_crate/secure/heph
+	closet_appearance = /datum/decl/closet_appearance/large_crate/secure/heph
 
 /obj/structure/closet/crate/secure/large/nanotrasen
 	desc = "A hefty metal crate with an electronic locking system, painted in standard NanoTrasen livery."
-	closet_appearance = /decl/closet_appearance/large_crate/secure/hazard
+	closet_appearance = /datum/decl/closet_appearance/large_crate/secure/hazard
 
 /obj/structure/closet/crate/large/secure/xion
 	desc = "A hefty metal crate with an electronic locking system, painted in Xion Manufacturing Group orange."
-	closet_appearance = /decl/closet_appearance/large_crate/secure/xion
+	closet_appearance = /datum/decl/closet_appearance/large_crate/secure/xion
 
 /obj/structure/closet/crate/engineering
 	name = "engineering crate"
@@ -710,7 +710,7 @@
 /obj/structure/closet/crate/hydroponics
 	name = "hydroponics crate"
 	desc = "All you need to destroy those pesky weeds and pests."
-	closet_appearance = /decl/closet_appearance/crate/hydroponics
+	closet_appearance = /datum/decl/closet_appearance/crate/hydroponics
 
 
 /obj/structure/closet/crate/hydroponics/prespawned

code/game/objects/structures/crates_lockers/crates_vr.dm

@@ -34,11 +34,11 @@
 	return
 
 /obj/structure/closet/crate/medical/blood
-	closet_appearance = /decl/closet_appearance/cart/biohazard/alt
+	closet_appearance = /datum/decl/closet_appearance/cart/biohazard/alt
 
 /obj/structure/closet/crate/fennec
 	name = "fennec treats crate"
 	desc = "A colorful crate filled with specialties catering to fennecs."
 	icon = 'icons/obj/closets/bases/fencrate_vr.dmi'
-	closet_appearance = /decl/closet_appearance/crate/fennec
+	closet_appearance = /datum/decl/closet_appearance/crate/fennec
 	points_per_crate = 0