Outfits objectified (#18611)

* oof

* ugh

* fqewavdf

* 4ryh

---------

Co-authored-by: DreamySkrell <>

code/datums/outfits/ert/ap_eridani.dm

@@ -1,4 +1,4 @@
-/datum/outfit/admin/ert/ap_eridani
+/obj/outfit/admin/ert/ap_eridani
 	name = "Eridani Asset Protection Specialist"
 
 	uniform = /obj/item/clothing/under/rank/security/pmc/epmc
@@ -39,10 +39,10 @@
 
 	id_iff = IFF_ERIDANI
 
-/datum/outfit/admin/ert/ap_eridani/get_id_access()
+/obj/outfit/admin/ert/ap_eridani/get_id_access()
 	return get_distress_access()
 
-/datum/outfit/admin/ert/ap_eridani/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/ert/ap_eridani/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	. = ..()
 	if(visualsOnly)
 		return
@@ -56,7 +56,7 @@
 		var/obj/item/clothing/shoes/jackboots/toeless/shoes = new(src)
 		H.equip_to_slot_if_possible(shoes, slot_shoes)
 
-/datum/outfit/admin/ert/ap_eridani/lead
+/obj/outfit/admin/ert/ap_eridani/lead
 	name = "Eridani Section Leader"
 
 	uniform = /obj/item/clothing/under/rank/security/pmc/epmc/alt
@@ -82,7 +82,7 @@
 		/obj/item/melee/telebaton = 1
 	)
 
-/datum/outfit/admin/ert/ap_eridani/doctor
+/obj/outfit/admin/ert/ap_eridani/doctor
 	name = "Eridani Medical Officer"
 
 	uniform = /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc
@@ -126,7 +126,7 @@
 		/obj/item/storage/pill_bottle/mortaphenyl = 1
 	)
 
-/datum/outfit/admin/ert/ap_eridani/corpsman
+/obj/outfit/admin/ert/ap_eridani/corpsman
 	name = "Eridani Corpsman"
 
 	uniform = /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc

code/datums/outfits/ert/coalition.dm

@@ -1,4 +1,4 @@
-/datum/outfit/admin/ert/coalition
+/obj/outfit/admin/ert/coalition
 	name = "Coalition Ranger ERT"
 	uniform = /obj/item/clothing/under/tactical
 	shoes = /obj/item/clothing/shoes/magboots
@@ -23,10 +23,10 @@
 	accessory = /obj/item/clothing/accessory/holster/hip/brown
 	accessory_contents = list(/obj/item/gun/projectile/colt = 1)
 
-/datum/outfit/admin/ert/coalition/get_id_access()
+/obj/outfit/admin/ert/coalition/get_id_access()
 	return list(ACCESS_DISTRESS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_COALITION, ACCESS_COALITION_NAVY)
 
-/datum/outfit/admin/ert/coalition/medic
+/obj/outfit/admin/ert/coalition/medic
 	name = "Coalition Medic"
 	belt = /obj/item/storage/belt/medical/first_responder/combat
 	back = /obj/item/storage/backpack/satchel/med
@@ -55,7 +55,7 @@
 		/obj/item/reagent_containers/glass/bottle/perconol = 1
 	)
 
-/datum/outfit/admin/ert/coalition/sapper
+/obj/outfit/admin/ert/coalition/sapper
 	name = "Coalition Sapper"
 	back = /obj/item/storage/backpack/duffel/eng
 	belt = /obj/item/storage/belt/utility/very_full
@@ -72,7 +72,7 @@
 
 	belt_contents = null
 
-/datum/outfit/admin/ert/coalition/leader
+/obj/outfit/admin/ert/coalition/leader
 	name = "Coalition Team Leader"
 	head = null
 	suit = null
@@ -90,7 +90,7 @@
 			/obj/item/grenade/flashbang = 1
 	)
 
-/datum/outfit/admin/ert/konyang
+/obj/outfit/admin/ert/konyang
 	name = "KASF Emergency Responder"
 	uniform = /obj/item/clothing/under/rank/konyang/space
 	suit = /obj/item/clothing/suit/space/void/sol/konyang
@@ -116,15 +116,15 @@
 		/obj/item/melee/energy/sword/knife/sol = 1
 	)
 
-/datum/outfit/admin/ert/konyang/get_id_access()
+/obj/outfit/admin/ert/konyang/get_id_access()
 	return list(ACCESS_DISTRESS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_COALITION, ACCESS_COALITION_NAVY, ACCESS_KONYANG_POLICE)
 
-/datum/outfit/admin/ert/konyang/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/ert/konyang/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	. = ..()
 	if(H.isSynthetic())
 		H.equip_to_slot_or_del(new /obj/item/device/suit_cooling_unit(H), slot_back)
 
-/datum/outfit/admin/ert/konyang/medic
+/obj/outfit/admin/ert/konyang/medic
 	name = "KASF Medic"
 	belt = /obj/item/storage/belt/medical/first_responder/combat
 	back = /obj/item/storage/backpack/satchel/med
@@ -153,7 +153,7 @@
 		/obj/item/melee/energy/sword/knife/sol = 1
 	)
 
-/datum/outfit/admin/ert/konyang/sapper
+/obj/outfit/admin/ert/konyang/sapper
 	name = "KASF Sapper"
 	back = /obj/item/storage/backpack/industrial
 	belt = /obj/item/storage/belt/utility/very_full
@@ -174,6 +174,6 @@
 
 	belt_contents = null
 
-/datum/outfit/admin/ert/konyang/leader
+/obj/outfit/admin/ert/konyang/leader
 	name = "KASF Officer"
 	uniform = /obj/item/clothing/under/rank/konyang/space/officer

code/datums/outfits/ert/deathsquad.dm

@@ -1,4 +1,4 @@
-/datum/outfit/admin/deathsquad
+/obj/outfit/admin/deathsquad
 	name = "Asset Protection"
 
 	uniform = /obj/item/clothing/under/ert
@@ -27,16 +27,16 @@
 
 	id_iff = IFF_DEATHSQUAD
 
-/datum/outfit/admin/deathsquad/leader
+/obj/outfit/admin/deathsquad/leader
 	name = "Asset Protection Lead"
 
 	l_pocket = /obj/item/pinpointer
 	r_hand = /obj/item/device/orbital_dropper/icarus_drones
 
-/datum/outfit/admin/deathsquad/get_id_access()
+/obj/outfit/admin/deathsquad/get_id_access()
 	return get_all_accesses()
 
-/datum/outfit/admin/deathsquad/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/deathsquad/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	. = ..()
 	if(visualsOnly)
 		return

code/datums/outfits/ert/elyra.dm

@@ -1,4 +1,4 @@
-/datum/outfit/admin/ert/elyran_trooper
+/obj/outfit/admin/ert/elyran_trooper
 	name = "Elyran Navy Crewman"
 
 	uniform = /obj/item/clothing/under/rank/elyran_fatigues
@@ -28,10 +28,10 @@
 	accessory = /obj/item/clothing/accessory/holster/hip/brown
 	accessory_contents = list(/obj/item/gun/projectile/sec/lethal = 1)
 
-/datum/outfit/admin/ert/elyran_trooper/get_id_access()
+/obj/outfit/admin/ert/elyran_trooper/get_id_access()
 	return get_distress_access()
 
-/datum/outfit/admin/ert/elyran_trooper/leader
+/obj/outfit/admin/ert/elyran_trooper/leader
 	name = "Elyran Navy Officer"
 
 	uniform = /obj/item/clothing/under/rank/elyran_fatigues/commander
@@ -47,7 +47,7 @@
 	l_hand = /obj/item/gun/projectile/plasma
 
 
-/datum/outfit/admin/ert/elyran_trooper/engineer
+/obj/outfit/admin/ert/elyran_trooper/engineer
 	name = "Elyran Navy Engineer"
 
 	back = /obj/item/storage/backpack/duffel/eng
@@ -62,7 +62,7 @@
 
 	belt_contents = null
 
-/datum/outfit/admin/ert/elyran_trooper/medical
+/obj/outfit/admin/ert/elyran_trooper/medical
 	name = "Elyran Navy Corpsman"
 
 	belt = /obj/item/storage/belt/medical/first_responder/combat
@@ -92,7 +92,7 @@
 		/obj/item/reagent_containers/glass/bottle/perconol = 1
 	)
 
-/datum/outfit/admin/ert/elyran_trooper/heavy
+/obj/outfit/admin/ert/elyran_trooper/heavy
 	name = "Elyran Navy Heavy Specialist"
 
 	head = null

code/datums/outfits/ert/fsf.dm

@@ -1,4 +1,4 @@
-/datum/outfit/admin/ert/fsf
+/obj/outfit/admin/ert/fsf
 	name = "Free Solarian Fleets Marine"
 
 	uniform = /obj/item/clothing/under/rank/sol/marine
@@ -30,10 +30,10 @@
 
 	id_iff = IFF_FSF
 
-/datum/outfit/admin/ert/fsf/get_id_access()
+/obj/outfit/admin/ert/fsf/get_id_access()
 	return get_distress_access_lesser()
 
-/datum/outfit/admin/ert/fsf/medic
+/obj/outfit/admin/ert/fsf/medic
 	name = "Free Solarian Fleets Medic"
 
 	belt = /obj/item/storage/belt/medical/first_responder/combat
@@ -65,7 +65,7 @@
 		/obj/item/reagent_containers/glass/bottle/perconol = 1
 	)
 
-/datum/outfit/admin/ert/fsf/sapper
+/obj/outfit/admin/ert/fsf/sapper
 	name = "Free Solarian Fleets Sapper"
 
 	back = /obj/item/storage/backpack/industrial
@@ -90,7 +90,7 @@
 
 	belt_contents = null
 
-/datum/outfit/admin/ert/fsf/leader
+/obj/outfit/admin/ert/fsf/leader
 	name = "Free Solarian Fleets Fireteam Leader"
 	l_hand = /obj/item/gun/projectile/automatic/rifle/sol
 	r_hand = null
@@ -108,7 +108,7 @@
 		/obj/item/handcuffs/ziptie = 2
 	)
 
-/datum/outfit/admin/ert/fsf/synth
+/obj/outfit/admin/ert/fsf/synth
 	name = "Free Solarian Fleets Synthetic Unit"
 
 	uniform = /obj/item/clothing/under/rank/sol

code/datums/outfits/ert/hephaestus_ert.dm

@@ -1,4 +1,4 @@
-/datum/outfit/admin/ert/hephaestus
+/obj/outfit/admin/ert/hephaestus
 	name = "Hephaestus Asset Protection"
 	uniform = /obj/item/clothing/under/rank/security/heph
 	shoes = /obj/item/clothing/shoes/magboots
@@ -32,10 +32,10 @@
 
 	id_iff = IFF_HEPH
 
-/datum/outfit/admin/ert/hephaestus/get_id_access()
+/obj/outfit/admin/ert/hephaestus/get_id_access()
 	return get_distress_access()
 
-/datum/outfit/admin/ert/hephaestus/medic
+/obj/outfit/admin/ert/hephaestus/medic
 	name = "Hephaestus Medic"
 	belt = /obj/item/storage/belt/medical/first_responder/combat
 	glasses = /obj/item/clothing/glasses/hud/health
@@ -69,7 +69,7 @@
 		/obj/item/reagent_containers/glass/bottle/perconol = 1
 	)
 
-/datum/outfit/admin/ert/hephaestus/engi
+/obj/outfit/admin/ert/hephaestus/engi
 	name = "Hephaestus Engineer"
 	back = /obj/item/storage/backpack/duffel/heph
 	belt = /obj/item/storage/belt/utility/very_full
@@ -90,6 +90,6 @@
 	)
 	belt_contents = null
 
-/datum/outfit/admin/ert/hephaestus/leader
+/obj/outfit/admin/ert/hephaestus/leader
 	name = "Hephaestus Squad Leader"
 	uniform = /obj/item/clothing/under/rank/captain/hephaestus

code/datums/outfits/ert/iac.dm

@@ -1,4 +1,4 @@
-/datum/outfit/admin/ert/iac
+/obj/outfit/admin/ert/iac
 	name = "IAC Doctor"
 
 	uniform = /obj/item/clothing/under/rank/iacjumpsuit
@@ -38,10 +38,10 @@
 
 	id_iff = IFF_IAC
 
-/datum/outfit/admin/ert/iac/get_id_access()
+/obj/outfit/admin/ert/iac/get_id_access()
 	return get_distress_access()
 
-/datum/outfit/admin/iac/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/iac/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	. = ..()
 	if(visualsOnly)
 		return
@@ -55,7 +55,7 @@
 		var/obj/item/clothing/shoes/footwraps = new(src)
 		H.equip_to_slot_if_possible(footwraps, slot_shoes)
 
-/datum/outfit/admin/ert/iac/bodyguard
+/obj/outfit/admin/ert/iac/bodyguard
 	name = "IAC Bodyguard"
 
 	accessory = /obj/item/clothing/accessory/storage/black_vest
@@ -85,7 +85,7 @@
 		/obj/item/device/flashlight/flare = 1
 	)
 
-/datum/outfit/admin/ert/iac/paramedic
+/obj/outfit/admin/ert/iac/paramedic
 	name = "IAC Paramedic"
 
 	head = /obj/item/clothing/head/helmet/iachelmet

code/datums/outfits/ert/kataphract.dm

@@ -1,4 +1,4 @@
-/datum/outfit/admin/ert/kataphract
+/obj/outfit/admin/ert/kataphract
 	name = "Kataphract-Hopeful"
 
 	uniform = /obj/item/clothing/under/unathi
@@ -28,7 +28,7 @@
 
 	id_iff = IFF_KATAPHRACT
 
-/datum/outfit/admin/ert/kataphract/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/ert/kataphract/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	if(H?.w_uniform)
 		H.w_uniform.color = pick("#42b360", "#b68029", "#5574c2")
 		H.w_uniform.accent_color = H.w_uniform.color
@@ -36,10 +36,10 @@
 		var/obj/item/clothing/shoes/magboots/hegemony/boots = new(H)
 		H.equip_to_slot_if_possible(boots, slot_shoes)
 
-/datum/outfit/admin/ert/kataphract/get_id_access()
+/obj/outfit/admin/ert/kataphract/get_id_access()
 	return get_distress_access()
 
-/datum/outfit/admin/ert/kataphract/klax
+/obj/outfit/admin/ert/kataphract/klax
 	name = "Kataphract-Hopeful Klax"
 
 	uniform = /obj/item/clothing/under/vaurca
@@ -61,7 +61,7 @@
 		/obj/item/reagent_containers/food/snacks/koisbar_clean = 3
 	)
 
-/datum/outfit/admin/ert/kataphract/klax/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/ert/kataphract/klax/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	if(H?.wear_mask && H.species.has_organ[BP_PHORON_RESERVE])
 		var/obj/item/organ/internal/vaurca/preserve/preserve = H.internal_organs_by_name[BP_PHORON_RESERVE]
 		H.internal = preserve
@@ -80,7 +80,7 @@
 	A.replaced(H, affected)
 	H.update_body()
 
-/datum/outfit/admin/ert/kataphract/specialist
+/obj/outfit/admin/ert/kataphract/specialist
 	name = "Kataphract-Hopeful Spec."
 
 	head = /obj/item/clothing/head/helmet/space/void/kataphract/spec
@@ -109,21 +109,21 @@
 		/obj/item/reagent_containers/hypospray/autoinjector/coagzolug = 1
 	)
 
-/datum/outfit/admin/ert/kataphract/specialist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/ert/kataphract/specialist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	if(H?.w_uniform)
 		H.w_uniform.color = pick("#42b360", "#b68029", "#5574c2")
 	if(H?.shoes)
 		var/obj/item/clothing/shoes/magboots/hegemony/boots = new(H)
 		H.equip_to_slot_if_possible(boots, slot_shoes)
 
-/datum/outfit/admin/ert/kataphract/leader
+/obj/outfit/admin/ert/kataphract/leader
 	name = "Kataphract Knight"
 
 	head = /obj/item/clothing/head/helmet/space/void/kataphract/lead
 	suit = /obj/item/clothing/suit/space/void/kataphract/lead
 	glasses = /obj/item/clothing/glasses/thermal
 
-/datum/outfit/admin/ert/kataphract/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/ert/kataphract/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	if(H?.w_uniform)
 		H.w_uniform.color = pick("#42b360", "#b68029", "#5574c2")
 	if(H?.shoes)

code/datums/outfits/ert/kosmostrelki.dm

@@ -1,4 +1,4 @@
-/datum/outfit/admin/ert/pra_cosmonaut
+/obj/outfit/admin/ert/pra_cosmonaut
 	name = "Kosmostrelki Trooper"
 
 	id = /obj/item/card/id/ert
@@ -23,10 +23,10 @@
 	accessory = /obj/item/clothing/accessory/badge/hadii_card
 	r_pocket = /obj/item/crowbar/red
 
-/datum/outfit/admin/ert/pra_cosmonaut/get_id_access()
+/obj/outfit/admin/ert/pra_cosmonaut/get_id_access()
 	return get_distress_access()
 
-/datum/outfit/admin/ert/pra_cosmonaut/commissar
+/obj/outfit/admin/ert/pra_cosmonaut/commissar
 	name = "Kosmostrelki Commissar"
 
 	uniform = /obj/item/clothing/under/tajaran/cosmonaut/commissar
@@ -50,7 +50,7 @@
 	l_pocket = /obj/item/device/megaphone
 	accessory = /obj/item/clothing/accessory/hadii_pin
 
-/datum/outfit/admin/ert/pra_cosmonaut/commander
+/obj/outfit/admin/ert/pra_cosmonaut/commander
 	name = "Kosmostrelki Commander"
 
 	back = /obj/item/storage/backpack/satchel/leather
@@ -72,7 +72,7 @@
 
 	l_pocket = /obj/item/device/megaphone
 
-/datum/outfit/admin/ert/pra_cosmonaut/tesla
+/obj/outfit/admin/ert/pra_cosmonaut/tesla
 	name = "Tesla Trooper"
 	r_hand = /obj/item/gun/energy/rifle/icelance
 	l_hand = /obj/item/rig/tesla
@@ -90,13 +90,13 @@
 						/obj/item/material/knife/trench = 1
 						)
 
-/datum/outfit/admin/ert/pra_cosmonaut/tesla/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/ert/pra_cosmonaut/tesla/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	var/obj/item/organ/A = new /obj/item/organ/internal/augment/tesla/advanced(H)
 	var/obj/item/organ/external/affected = H.get_organ(A.parent_organ)
 	A.replaced(H, affected)
 	H.update_body()
 
-/datum/outfit/admin/ert/pra_cosmonaut/medic
+/obj/outfit/admin/ert/pra_cosmonaut/medic
 	name = "Kosmostrelki Combat Medic"
 
 	gloves = /obj/item/clothing/gloves/latex/nitrile/tajara
@@ -127,7 +127,7 @@
 		/obj/item/device/healthanalyzer = 1
 	)
 
-/datum/outfit/admin/ert/pra_cosmonaut/engineer
+/obj/outfit/admin/ert/pra_cosmonaut/engineer
 	name = "Kosmostrelki Sapper"
 
 	gloves = /obj/item/clothing/gloves/yellow/specialt

code/datums/outfits/ert/mercenary.dm

@@ -1,4 +1,4 @@
-/datum/outfit/admin/ert/mercenary
+/obj/outfit/admin/ert/mercenary
 	name = "Mercenary Freelancer"
 
 	uniform = /obj/item/clothing/under/syndicate
@@ -34,10 +34,10 @@
 
 	id_iff = IFF_FREELANCER
 
-/datum/outfit/admin/ert/mercenary/get_id_access()
+/obj/outfit/admin/ert/mercenary/get_id_access()
 	return get_distress_access_lesser()
 
-/datum/outfit/admin/ert/mercenary/specialist
+/obj/outfit/admin/ert/mercenary/specialist
 	name = "Mercenary Freelancer Medic"
 
 	glasses = /obj/item/clothing/glasses/hud/health/aviator
@@ -67,7 +67,7 @@
 		/obj/item/material/knife/trench = 1
 	)
 
-/datum/outfit/admin/ert/mercenary/engineer
+/obj/outfit/admin/ert/mercenary/engineer
 	name = "Mercenary Freelancer Combat Engineer"
 
 	belt = /obj/item/storage/belt/military
@@ -97,7 +97,7 @@
 		/obj/item/device/flashlight/flare = 1,
 	)
 
-/datum/outfit/admin/ert/mercenary/leader
+/obj/outfit/admin/ert/mercenary/leader
 	name = "Mercenary Freelancer Leader"
 	l_hand = /obj/item/gun/projectile/automatic/rifle/shorty
 	r_hand = null

code/datums/outfits/ert/nt_ert.dm

@@ -1,4 +1,4 @@
-/datum/outfit/admin/ert/nanotrasen
+/obj/outfit/admin/ert/nanotrasen
 	name = "NanoTrasen ERT Responder"
 
 	uniform = /obj/item/clothing/under/ert
@@ -20,10 +20,10 @@
 		/obj/item/ammo_magazine/a556/ap = 1
 	)
 
-/datum/outfit/admin/ert/nanotrasen/get_id_access()
+/obj/outfit/admin/ert/nanotrasen/get_id_access()
 	return get_all_station_access() | get_centcom_access("Emergency Response Team")
 
-/datum/outfit/admin/ert/nanotrasen/specialist
+/obj/outfit/admin/ert/nanotrasen/specialist
 	name = "NanoTrasen ERT Engineer Specialist"
 
 	belt = /obj/item/storage/belt/utility/full
@@ -31,7 +31,7 @@
 
 	belt_contents = null
 
-/datum/outfit/admin/ert/nanotrasen/specialist/medical
+/obj/outfit/admin/ert/nanotrasen/specialist/medical
 	name = "NanoTrasen ERT Medical Specialist"
 
 	belt = /obj/item/storage/belt/medical/first_responder/combat
@@ -48,7 +48,7 @@
 		/obj/item/reagent_containers/glass/bottle/perconol = 1
 	)
 
-/datum/outfit/admin/ert/nanotrasen/leader
+/obj/outfit/admin/ert/nanotrasen/leader
 	name = "NanoTrasen ERT Leader"
 
 	back = /obj/item/rig/ert

code/datums/outfits/ert/scc_ert.dm

@@ -1,4 +1,4 @@
-/datum/outfit/admin/ert/scc
+/obj/outfit/admin/ert/scc
 	name = "ERT Security Specialist (SCC)"
 
 	uniform = /obj/item/clothing/under/rank/security
@@ -17,10 +17,10 @@
 		/obj/item/ammo_magazine/a556/ap = 1
 	)
 
-/datum/outfit/admin/ert/scc/get_id_access()
+/obj/outfit/admin/ert/scc/get_id_access()
 	return get_all_station_access() | get_centcom_access("Emergency Response Team")
 
-/datum/outfit/admin/ert/scc/engineer
+/obj/outfit/admin/ert/scc/engineer
 	name = "ERT Engineering Specialist (SCC)"
 
 	belt = /obj/item/storage/belt/utility/full
@@ -28,7 +28,7 @@
 
 	belt_contents = null
 
-/datum/outfit/admin/ert/scc/medic
+/obj/outfit/admin/ert/scc/medic
 	name = "ERT Medical Specialist (SCC)"
 
 	belt = /obj/item/storage/belt/medical/first_responder/combat
@@ -45,7 +45,7 @@
 		/obj/item/reagent_containers/glass/bottle/perconol = 1
 	)
 
-/datum/outfit/admin/ert/scc/commander
+/obj/outfit/admin/ert/scc/commander
 	name = "ERT Commander (SCC)"
 
 	back = /obj/item/rig/ert/scc

code/datums/outfits/ert/syndicate.dm

@@ -1,4 +1,4 @@
-/datum/outfit/admin/deathsquad/syndicate
+/obj/outfit/admin/deathsquad/syndicate
 	name = "Syndicate Commando"
 
 	uniform = /obj/item/clothing/under/syndicate
@@ -24,7 +24,7 @@
 
 	id_iff = IFF_SYNDICATE
 
-/datum/outfit/admin/deathsquad/syndicate/leader
+/obj/outfit/admin/deathsquad/syndicate/leader
 	name = "Syndicate Commando Lead"
 
 	l_pocket = /obj/item/pinpointer

code/datums/outfits/ert/tcfl.dm

@@ -1,4 +1,4 @@
-/datum/outfit/admin/ert/legion
+/obj/outfit/admin/ert/legion
 	name = "TCFL Volunteer"
 
 	head = /obj/item/clothing/head/beret/legion/field
@@ -14,7 +14,7 @@
 
 	id_iff = IFF_TCFL
 
-/datum/outfit/admin/ert/legion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/ert/legion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	. = ..()
 	if(isvaurca(H))
 		H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/vaurca/filter(H), slot_wear_mask)
@@ -22,23 +22,23 @@
 		H.internal = preserve
 		H.internals.icon_state = "internal1"
 
-/datum/outfit/admin/ert/legion/get_id_access()
+/obj/outfit/admin/ert/legion/get_id_access()
 	return get_distress_access()
 
-/datum/outfit/admin/ert/legion/specialist
+/obj/outfit/admin/ert/legion/specialist
 	name = "TCFL Legionnaire"
 	accessory = /obj/item/clothing/accessory/legion/specialist
 
-/datum/outfit/admin/ert/legion/leader
+/obj/outfit/admin/ert/legion/leader
 	name = "TCFL Prefect"
 	accessory = /obj/item/clothing/accessory/legion
 
-/datum/outfit/admin/ert/legion/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/ert/legion/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	.=..()
 	var/obj/item/card/id/distress/legion/I = H.wear_id
 	I.access += (ACCESS_CENT_SPECOPS)
 
-/datum/outfit/admin/ert/legion/pilot
+/obj/outfit/admin/ert/legion/pilot
 	name = "TCFL Dropship Pilot"
 	uniform = /obj/item/clothing/under/legion/pilot
 	head = /obj/item/clothing/head/helmet/pilot/legion
@@ -51,7 +51,7 @@
 
 	backpack_contents = null
 
-/datum/outfit/admin/ert/legion/sentinel
+/obj/outfit/admin/ert/legion/sentinel
 	name = "TCFL Sentinel"
 	head = /obj/item/clothing/head/beret/legion/sentinel
 	uniform = /obj/item/clothing/under/legion/sentinel
@@ -79,7 +79,7 @@
 		/obj/item/melee/telebaton = 1
 	)
 
-/datum/outfit/admin/ert/legion/sentinel/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/ert/legion/sentinel/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	.=..()
 	var/obj/item/card/id/distress/legion/I = H.wear_id
 	I.access += (ACCESS_CENT_SPECOPS)

code/datums/outfits/event/outfit_events.dm

@@ -1,4 +1,4 @@
-/datum/outfit/admin/event/lance
+/obj/outfit/admin/event/lance
 	name = "Lancer"
 
 	uniform = /obj/item/clothing/under/lance
@@ -38,13 +38,13 @@
 	id_iff = IFF_LANCER
 	var/id_access = "Lancer"
 
-/datum/outfit/admin/event/lance/post_equip(mob/living/carbon/human/H, visualsOnly)
+/obj/outfit/admin/event/lance/post_equip(mob/living/carbon/human/H, visualsOnly)
 	organize_voidsuit(H)
 
-/datum/outfit/admin/event/lance/get_id_access()
+/obj/outfit/admin/event/lance/get_id_access()
 	return get_syndicate_access(id_access)
 
-/datum/outfit/admin/event/lance/engineer
+/obj/outfit/admin/event/lance/engineer
 	name = "Lance Engineer"
 
 	back = /obj/item/gun/projectile/shotgun/pump/combat/sol
@@ -65,7 +65,7 @@
 	)
 	id_access = "Lance Engineer"
 
-/datum/outfit/admin/event/lance/medic
+/obj/outfit/admin/event/lance/medic
 	name = "Lance Medic"
 
 	gloves = /obj/item/clothing/gloves/latex/nitrile
@@ -91,7 +91,7 @@
 			)
 	id_access = "Lance Medic"
 
-/datum/outfit/admin/event/lance/operative
+/obj/outfit/admin/event/lance/operative
 	name = "Lance Operative"
 
 	uniform = /obj/item/clothing/under/dress/lance_dress/male
@@ -108,10 +108,10 @@
 	)
 	id_access = "Lance Operative"
 
-/datum/outfit/admin/event/lance/operative/post_equip(mob/living/carbon/human/H, visualsOnly)
+/obj/outfit/admin/event/lance/operative/post_equip(mob/living/carbon/human/H, visualsOnly)
 	return
 
-/datum/outfit/admin/event/sol_marine
+/obj/outfit/admin/event/sol_marine
 	name = "Solarian Marine"
 
 	uniform = /obj/item/clothing/under/rank/sol
@@ -144,7 +144,7 @@
 
 	id_iff = IFF_SOL
 
-/datum/outfit/admin/event/sol_marine/heavy
+/obj/outfit/admin/event/sol_marine/heavy
 	name = "Heavy Solarian Marine"
 
 	head = null

code/datums/outfits/event/outfit_killers.dm

@@ -1,4 +1,4 @@
-/datum/outfit/admin/killer
+/obj/outfit/admin/killer
 	name = "Masked Killer"
 
 	uniform = /obj/item/clothing/under/overalls
@@ -14,13 +14,13 @@
 	r_hand = /obj/item/material/twohanded/fireaxe
 	id = null
 
-/datum/outfit/admin/killer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/killer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	for(var/obj/item/carried_item in H.contents)
 		if(!istype(carried_item, /obj/item/implant))//If it's not an implant.
 			carried_item.add_blood(H)//Oh yes, there will be blood...
 
 
-/datum/outfit/admin/killer/assassin
+/obj/outfit/admin/killer/assassin
 	name = "Assassin"
 
 	uniform = /obj/item/clothing/under/suit_jacket
@@ -35,7 +35,7 @@
 	pda = /obj/item/modular_computer/handheld/pda/command
 	id_iff = IFF_SYNDICATE
 
-/datum/outfit/admin/killer/assassin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/killer/assassin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	var/obj/item/storage/secure/briefcase/sec_briefcase = new(H)
 	for(var/obj/item/briefcase_item in sec_briefcase)
 		qdel(briefcase_item)
@@ -47,5 +47,5 @@
 	sec_briefcase.contents += new /obj/item/plastique
 	H.equip_to_slot_or_del(sec_briefcase, slot_l_hand)
 
-/datum/outfit/admin/killer/assassin/get_id_access()
+/obj/outfit/admin/killer/assassin/get_id_access()
 	return get_all_station_access()

code/datums/outfits/event/outfit_megacorps.dm

@@ -1,4 +1,4 @@
-/datum/outfit/admin/megacorp/hephaestus_trooper
+/obj/outfit/admin/megacorp/hephaestus_trooper
 	name = "Hephaestus Asset Protection"
 
 	uniform = /obj/item/clothing/under/rank/engineer/apprentice/heph
@@ -28,7 +28,7 @@
 	)
 	id_iff = IFF_HEPH
 
-/datum/outfit/admin/megacorp/hephaestus_trooper/heavy
+/obj/outfit/admin/megacorp/hephaestus_trooper/heavy
 	name = "Hephaestus Heavy Asset Protection"
 
 	back = /obj/item/gun/projectile/shotgun/pump/combat
@@ -41,7 +41,7 @@
 			/obj/item/ammo_casing/shotgun/pellet = 8
 	)
 
-/datum/outfit/admin/megacorp/zenghu_trooper
+/obj/outfit/admin/megacorp/zenghu_trooper
 	name = "Zeng Hu Pharmaceuticals Asset Protection"
 
 	uniform = /obj/item/clothing/under/rank/medical/first_responder/zeng
@@ -71,7 +71,7 @@
 	)
 	id_iff = IFF_ZENGHU
 
-/datum/outfit/admin/megacorp/zenghu_trooper/heavy
+/obj/outfit/admin/megacorp/zenghu_trooper/heavy
 	name = "Zeng Hu Pharmaceuticals Heavy Asset Protection"
 
 	gloves = /obj/item/clothing/gloves/force
@@ -79,7 +79,7 @@
 
 	accessory_contents = list(/obj/item/gun/energy/decloner = 1)
 
-/datum/outfit/admin/megacorp/zavodskoi_trooper
+/obj/outfit/admin/megacorp/zavodskoi_trooper
 	name = "Zavodskoi Interstellar Asset Protection"
 
 	uniform = /obj/item/clothing/under/rank/security/zavod
@@ -115,7 +115,7 @@
 	)
 	id_iff = IFF_ZAVOD
 
-/datum/outfit/admin/megacorp/zavodskoi_trooper/heavy
+/obj/outfit/admin/megacorp/zavodskoi_trooper/heavy
 	name = "Zavodskoi Interstellar Heavy Asset Protection"
 
 	gloves = /obj/item/clothing/gloves/force
@@ -130,7 +130,7 @@
 			/obj/item/ammo_magazine/c762/sol = 2
 	)
 
-/datum/outfit/admin/megacorp/einstein_trooper/heavy
+/obj/outfit/admin/megacorp/einstein_trooper/heavy
 	name = "Einstein Engines Asset Protection"
 
 	uniform = /obj/item/clothing/under/rank/einstein

code/datums/outfits/event/outfit_nanotrasen.dm

@@ -1,4 +1,4 @@
-/datum/outfit/admin/nt
+/obj/outfit/admin/nt
 	name = "NanoTrasen Representative"
 
 	uniform = /obj/item/clothing/under/rank/centcom
@@ -16,10 +16,10 @@
 	id_icon = "centcom"
 	var/id_access = "NanoTrasen Representative"
 
-/datum/outfit/admin/nt/get_id_access()
+/obj/outfit/admin/nt/get_id_access()
 	return get_all_station_access() | get_centcom_access(id_access)
 
-/datum/outfit/admin/nt/officer
+/obj/outfit/admin/nt/officer
 	name = "NanoTrasen Navy Officer"
 
 	uniform = /obj/item/clothing/under/rank/centcom_officer
@@ -27,7 +27,7 @@
 	head = /obj/item/clothing/head/beret/centcom/officer
 	l_pocket = /obj/item/device/orbital_dropper/icarus_drones
 
-/datum/outfit/admin/nt/captain
+/obj/outfit/admin/nt/captain
 	name = "NanoTrasen Navy Captain"
 
 	uniform = /obj/item/clothing/under/rank/centcom_captain
@@ -35,7 +35,7 @@
 	head = /obj/item/clothing/head/beret/centcom/captain
 	l_pocket = /obj/item/device/orbital_dropper/icarus_drones
 
-/datum/outfit/admin/nt/protection_detail
+/obj/outfit/admin/nt/protection_detail
 	name = "ERT Protection Detail"
 
 	uniform = /obj/item/clothing/under/ccpolice
@@ -62,7 +62,7 @@
 	id_icon = "ccia"
 	id_access = "CCIA Agent"
 
-/datum/outfit/admin/nt/protection_detail/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/nt/protection_detail/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 
 	if(H && H.belt)
 
@@ -83,7 +83,7 @@
 		H.belt.contents += shield
 
 
-/datum/outfit/admin/nt/ert_commander
+/obj/outfit/admin/nt/ert_commander
 	name = "ERT Commander"
 
 	uniform = /obj/item/clothing/under/rank/centcom_commander
@@ -106,7 +106,7 @@
 
 	id_access = "BlackOps Commander"
 
-/datum/outfit/admin/nt/cciaa
+/obj/outfit/admin/nt/cciaa
 	name = "CCIA Agent"
 
 	uniform = /obj/item/clothing/under/rank/centcom_officer
@@ -128,7 +128,7 @@
 	id_icon = "ccia"
 	id_access = "CCIA Agent"
 
-/datum/outfit/admin/nt/odinsec
+/obj/outfit/admin/nt/odinsec
 	name = "NTCC Odin Security Specialist"
 
 	uniform = /obj/item/clothing/under/ccpolice
@@ -161,7 +161,7 @@
 
 	id_access = "Odin Security"
 
-/datum/outfit/admin/nt/odinsec/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/nt/odinsec/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 
 	if(H && H.w_uniform)
 
@@ -172,7 +172,7 @@
 		var/obj/item/clothing/under/rank/U = H.w_uniform
 		U.attach_accessory(null, holster)
 
-/datum/outfit/admin/nt/specops
+/obj/outfit/admin/nt/specops
 	name = "Special Operations Officer"
 
 	uniform = /obj/item/clothing/under/syndicate/combat
@@ -192,7 +192,7 @@
 
 	id_access = "Death Commando"
 
-/datum/outfit/admin/nt/bssb
+/obj/outfit/admin/nt/bssb
 	name = "BSSB Agent"
 
 	uniform = /obj/item/clothing/under/rank/bssb
@@ -216,14 +216,14 @@
 	id_icon = "bssb"
 	id_access = "CCIA Agent"
 
-/datum/outfit/admin/nt/bssb/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/nt/bssb/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 
 	if(H?.wear_suit)
 		var/obj/item/clothing/accessory/badge/bssb/senior/badge = new(src)
 		var/obj/item/clothing/U = H.wear_suit
 		U.attach_accessory(null, badge)
 
-/datum/outfit/admin/nt/bssb/guard
+/obj/outfit/admin/nt/bssb/guard
 	name = "BSSB Escort"
 
 	suit = /obj/item/clothing/suit/storage/toggle/bssb/armor
@@ -251,14 +251,14 @@
 		/obj/item/clothing/head/helmet = 1
 	)
 
-/datum/outfit/admin/nt/bssb/guard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/nt/bssb/guard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 
 	if(H?.wear_suit)
 		var/obj/item/clothing/accessory/badge/bssb/badge = new(src)
 		var/obj/item/clothing/U = H.wear_suit
 		U.attach_accessory(null, badge)
 
-/datum/outfit/admin/nt/odindoc
+/obj/outfit/admin/nt/odindoc
 	name = "NTCC Odin Medical Specialist"
 
 	uniform = /obj/item/clothing/under/rank/medical/surgeon/zavod
@@ -297,7 +297,7 @@
 
 	id_access = "Medical Doctor"
 
-/datum/outfit/admin/nt/odinpharm
+/obj/outfit/admin/nt/odinpharm
 	name = "NTCC Odin Pharmacy Specialist"
 
 	uniform = /obj/item/clothing/under/rank/medical/pharmacist
@@ -314,7 +314,7 @@
 
 	id_access = "Medical Doctor"
 
-/datum/outfit/admin/nt/odinbartender
+/obj/outfit/admin/nt/odinbartender
 	name = "NTCC Odin Bartender"
 
 	uniform = /obj/item/clothing/under/rank/bartender
@@ -324,7 +324,7 @@
 
 	id_access = "Service"
 
-/datum/outfit/admin/nt/odinchef
+/obj/outfit/admin/nt/odinchef
 	name = "NTCC Odin Chef"
 
 	uniform = /obj/item/clothing/under/rank/chef
@@ -336,7 +336,7 @@
 
 	id_access = "Service"
 
-/datum/outfit/admin/nt/odinjanitor
+/obj/outfit/admin/nt/odinjanitor
 	name = "NTCC Odin Sanitation Specialist"
 
 	uniform = /obj/item/clothing/under/rank/janitor

code/datums/outfits/event/outfit_scc.dm

@@ -1,4 +1,4 @@
-/datum/outfit/admin/scc
+/obj/outfit/admin/scc
 	name = "SCC Agent"
 
 	uniform = /obj/item/clothing/under/rank/scc
@@ -20,17 +20,17 @@
 	id_icon = "centcom"
 	var/id_access = "SCC Agent"
 
-/datum/outfit/admin/scc/get_id_access()
+/obj/outfit/admin/scc/get_id_access()
 	return get_all_station_access() | get_centcom_access(id_access)
 
-/datum/outfit/admin/scc/executive
+/obj/outfit/admin/scc/executive
 	name = "SCC Executive"
 
 	uniform = /obj/item/clothing/under/rank/scc/executive
 
 	id_access = "SCC Executive"
 
-/datum/outfit/admin/scc/bodyguard
+/obj/outfit/admin/scc/bodyguard
 	name = "SCC Bodyguard"
 
 	head = /obj/item/clothing/head/helmet/merc/scc

code/datums/outfits/event/outfit_tfcl.dm

@@ -1,4 +1,4 @@
-/datum/outfit/admin/tcfl
+/obj/outfit/admin/tcfl
 	name = "TCFL Legate"
 
 	uniform = /obj/item/clothing/under/legion/legate
@@ -27,5 +27,5 @@
 	id_iff = IFF_TCFL
 	var/id_access = "NanoTrasen Representative"
 
-/datum/outfit/admin/tcfl/get_id_access()
+/obj/outfit/admin/tcfl/get_id_access()
 	return get_all_accesses() | get_centcom_access(id_access)

code/datums/outfits/outfit.dm

@@ -1,5 +1,19 @@
-/datum/outfit
-	var/name = "Naked"
+
+/// General outfit abstraction.
+/// To be used for both a mob's outfit (for a ghostspawner, ship/station job, corpse),
+/// where the outfit is applied to the mob.
+/// But also for "standalone" outfits (just items spawned in a locker, on the floor),
+/// where the outfit items are "spilled" onto the floor (not all items, does not spawn IDs for example).
+/obj/outfit
+	name = "Naked"
+	icon = 'icons/effects/map_effects.dmi'
+	icon_state = "outfit"
+
+	/// If spilling onto the floor, prob chance for the item to spill.
+	var/spill_prob = 98
+	/// If spilling onto the floor, if true, items to spill will be shuffled.
+	var/spill_shuffle = TRUE
+
 	var/collect_not_del = FALSE
 
 	//The following vars can either be a path or a list of paths
@@ -11,11 +25,13 @@
 	var/gloves = null
 	var/wrist = null
 	var/shoes = null
+
 	var/head = null
 	var/mask = null
 	var/l_ear = null
 	var/r_ear = null
 	var/glasses = null
+
 	var/l_pocket = null
 	var/r_pocket = null
 	var/suit_store = null
@@ -74,7 +90,72 @@
 	var/list/implants = null //A list of implants that should be implanted
 	var/list/spells = list() // A list of spells to grant
 
-/datum/outfit/proc/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/Initialize(mapload, ...)
+	. = ..()
+	// if loc is not null, means the outfit was mapped in or spawned manually
+	if(loc!=null)
+		spill()
+
+/// Spawn the items on the loc turf.
+/// Delete self later.
+/obj/outfit/proc/spill()
+	// get a list of item types to spawn
+	var/list/items = list(
+		uniform,
+		suit,
+		back,
+		belt,
+		gloves,
+		wrist,
+		shoes,
+
+		head,
+		mask,
+		l_ear,
+		r_ear,
+		glasses,
+
+		l_pocket,
+		r_pocket,
+		suit_store,
+		accessory,
+		suit_accessory,
+
+		l_hand,
+		r_hand,
+		pda,
+		radio,
+
+		backpack,
+	)
+
+	// add contents to the list
+	for(var/c in backpack_contents)
+		items += c
+	for(var/c in accessory_contents)
+		items += c
+	for(var/c in belt_contents)
+		items += c
+
+	// shuffle
+	if(spill_shuffle)
+		items = shuffle(items)
+
+	// go over each item
+	for(var/i in items)
+		if(i && prob(spill_prob))
+			spill_item(i)
+
+	// and finally delete self
+	qdel(src)
+
+/obj/outfit/proc/spill_item(var/path)
+	if(islist(path))
+		path = pick(path)
+	if(path && ispath(path))
+		new path(loc)
+
+/obj/outfit/proc/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	//to be overriden for customization depending on client prefs,species etc
 	if(allow_backbag_choice)
 		switch(H.backbag)
@@ -211,14 +292,14 @@
 	else if (wrist)
 		equip_item(H, wrist, slot_wrists, callback = radio_callback)
 
-/datum/outfit/proc/turn_into_thinset(var/obj/item/device/radio/headset/wrist/radio)
+/obj/outfit/proc/turn_into_thinset(var/obj/item/device/radio/headset/wrist/radio)
 	if(istype(radio))
 		radio.icon_state = replacetext(radio.icon_state, "wrist", "thin")
 		radio.item_state = replacetext(radio.item_state, "wrist", "thin")
 
 // Used to equip an item to the mob. Mainly to prevent copypasta for collect_not_del.
 //override_collect temporarily allows equip_or_collect without enabling it for the job. Mostly used to prevent weirdness with hand equips when the player is missing one
-/datum/outfit/proc/equip_item(mob/living/carbon/human/H, path, slot, var/override_collect = FALSE, var/item_color, var/datum/callback/callback)
+/obj/outfit/proc/equip_item(mob/living/carbon/human/H, path, slot, var/override_collect = FALSE, var/item_color, var/datum/callback/callback)
 	var/obj/item/I
 
 	if(isnum(path))	//Check if parameter is not numeric. Must be a path, list of paths or name of a gear datum
@@ -241,7 +322,7 @@
 	else
 		H.equip_to_slot_or_del(I, slot)
 
-/datum/outfit/proc/equip_uniform_accessory(mob/living/carbon/human/H)
+/obj/outfit/proc/equip_uniform_accessory(mob/living/carbon/human/H)
 	if(!H)
 		return
 
@@ -266,7 +347,7 @@
 			if(W)
 				holster.holster(W, H)
 
-/datum/outfit/proc/equip_suit_accessory(mob/living/carbon/human/H)
+/obj/outfit/proc/equip_suit_accessory(mob/living/carbon/human/H)
 	if(!H)
 		return
 
@@ -275,10 +356,10 @@
 		var/obj/item/clothing/accessory/A = new suit_accessory
 		S.attach_accessory(H, A)
 
-/datum/outfit/proc/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/proc/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	//to be overriden for changing items post equip (such as toggeling internals, ...)
 
-/datum/outfit/proc/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/proc/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	//Start with uniform,suit,backpack for additional slots
 	if(back)
 		equip_item(H, back, slot_back)
@@ -459,7 +540,7 @@
 	return 1
 
 // this proc takes all the scattered voidsuit pieces and reassembles them into one piece
-/datum/outfit/proc/organize_voidsuit(mob/living/carbon/human/H, var/add_magboots = TRUE)
+/obj/outfit/proc/organize_voidsuit(mob/living/carbon/human/H, var/add_magboots = TRUE)
 	var/obj/item/tank/T = H.s_store
 	H.unEquip(T, TRUE)
 
@@ -479,7 +560,7 @@
 
 	H.equip_to_slot_if_possible(VS, slot_wear_suit)
 
-/datum/outfit/proc/apply_fingerprints(mob/living/carbon/human/H)
+/obj/outfit/proc/apply_fingerprints(mob/living/carbon/human/H)
 	if(!istype(H))
 		return
 	if(H.back)
@@ -520,7 +601,7 @@
 		H.r_store.add_fingerprint(H, 1)
 	return 1
 
-/datum/outfit/proc/imprint_idcard(mob/living/carbon/human/H, obj/item/card/id/C)
+/obj/outfit/proc/imprint_idcard(mob/living/carbon/human/H, obj/item/card/id/C)
 	if(istype(C))
 		C.access = get_id_access(H)
 		C.rank = get_id_rank(H)
@@ -530,7 +611,7 @@
 		if(H.mind && H.mind.initial_account)
 			C.associated_account_number = H.mind.initial_account.account_number
 
-/datum/outfit/proc/register_pda(obj/item/modular_computer/P, obj/item/card/id/I)
+/obj/outfit/proc/register_pda(obj/item/modular_computer/P, obj/item/card/id/I)
 	if(!P.card_slot)
 		return
 	P.card_slot.insert_id(I)
@@ -539,15 +620,15 @@
 		P.enable_computer(null, TRUE) // passing null because we don't want the UI to open
 		P.minimize_program()
 
-/datum/outfit/proc/get_id_access(mob/living/carbon/human/H)
+/obj/outfit/proc/get_id_access(mob/living/carbon/human/H)
 	return list()
 
-/datum/outfit/proc/get_id_assignment(mob/living/carbon/human/H, var/ignore_suffix = FALSE)
+/obj/outfit/proc/get_id_assignment(mob/living/carbon/human/H, var/ignore_suffix = FALSE)
 	. = GetAssignment(H)
 
 	if (. && . != "Unassigned" && H?.mind?.selected_faction && !ignore_suffix)
 		if (H.mind.selected_faction.title_suffix)
 			. += " ([H.mind.selected_faction.title_suffix])"
 
-/datum/outfit/proc/get_id_rank(mob/living/carbon/human/H)
+/obj/outfit/proc/get_id_rank(mob/living/carbon/human/H)
 	return GetAssignment(H)

code/datums/outfits/outfit_admin.dm

@@ -1,22 +1,22 @@
-/datum/outfit/admin
+/obj/outfit/admin
 	var/id_icon
 
-/datum/outfit/admin/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	. = ..()
 	if(!visualsOnly)
 		if(H.mind)
 			H.mind.assigned_role = name
 		H.job = name
 
-/datum/outfit/admin/imprint_idcard(mob/living/carbon/human/H, obj/item/card/id/C)
+/obj/outfit/admin/imprint_idcard(mob/living/carbon/human/H, obj/item/card/id/C)
 	..()
 	if(id_icon)
 		C.icon_state = id_icon
 
-/datum/outfit/admin/random_employee
+/obj/outfit/admin/random_employee
 	name = "Random Employee"
 
-/datum/outfit/admin/random_employee/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/random_employee/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	. = ..()
 	if(!visualsOnly)
 		//Select a random job, set the assigned_role / job var and equip it
@@ -32,7 +32,7 @@
 		job.equip(H, FALSE, FALSE, alt_title)
 
 
-/datum/outfit/admin/random
+/obj/outfit/admin/random
 	name = "Random Civilian"
 
 	uniform = "suit selection"
@@ -49,7 +49,7 @@
 		/obj/item/storage/backpack/duffel
 	)
 
-/datum/outfit/admin/random/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/random/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	. = ..()
 	if(!visualsOnly)
 		if(prob(10)) //Equip something smokable
@@ -80,19 +80,19 @@
 			var/datum/gear/G = gear_datums["gloves selection"]
 			H.equip_or_collect(G.spawn_random(), slot_gloves)
 
-/datum/outfit/admin/random/visitor
+/obj/outfit/admin/random/visitor
 	name = "Random Visitor"
 
 	id = /obj/item/card/id
 	pda = /obj/item/modular_computer/handheld/pda/civilian
 
-/datum/outfit/admin/random/visitor/get_id_assignment()
+/obj/outfit/admin/random/visitor/get_id_assignment()
 	return "Visitor"
 
-/datum/outfit/admin/random/visitor/get_id_rank()
+/obj/outfit/admin/random/visitor/get_id_rank()
 	return "Visitor"
 
-/datum/outfit/admin/virtual_reality
+/obj/outfit/admin/virtual_reality
 	name = "Virtual Reality Outfit"
 	uniform = /obj/item/clothing/under/chameleon
 	suit = /obj/item/clothing/suit/chameleon

code/datums/outfits/outfit_antag.dm

@@ -1,6 +1,6 @@
 // Anything that's coded as an "antagonist" that needs outfits should go here, unless it's an ERT.
 
-/datum/outfit/admin/syndicate
+/obj/outfit/admin/syndicate
 	name = "Syndicate Agent"
 	allow_backbag_choice = TRUE
 
@@ -30,7 +30,7 @@
 	var/id_access = "Syndicate Operative"
 	var/uplink_uses = DEFAULT_TELECRYSTAL_AMOUNT
 
-/datum/outfit/admin/syndicate/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/syndicate/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	. = ..()
 	if(visualsOnly)
 		return
@@ -42,11 +42,11 @@
 		U.hidden_uplink.bluecrystals = round(uplink_uses / 2)
 		U.hidden_uplink.tgui_menu = 1
 
-/datum/outfit/admin/syndicate/get_id_access()
+/obj/outfit/admin/syndicate/get_id_access()
 	return get_syndicate_access(id_access)
 
 
-/datum/outfit/admin/syndicate/operative
+/obj/outfit/admin/syndicate/operative
 	name = "Syndicate Operative"
 
 	suit = /obj/item/clothing/suit/space/void/merc
@@ -71,7 +71,7 @@
 		/obj/item/clothing/shoes/combat = 1
 )
 
-/datum/outfit/admin/syndicate/officer
+/obj/outfit/admin/syndicate/officer
 	name = "Syndicate Officer"
 
 	head = /obj/item/clothing/head/beret/red
@@ -95,7 +95,7 @@
 	)
 	id_access = "Syndicate Operative Leader"
 
-/datum/outfit/admin/syndicate/spy
+/obj/outfit/admin/syndicate/spy
 	name = "Syndicate Spy"
 	uniform = /obj/item/clothing/under/suit_jacket/really_black
 	shoes = /obj/item/clothing/shoes/sneakers/black/noslip
@@ -108,7 +108,7 @@
 
 // Syndicate Auxiliary Outfits (ninja, merc, etc.)
 
-/datum/outfit/admin/syndicate/ninja
+/obj/outfit/admin/syndicate/ninja
 	name = "Infiltrator"
 	allow_backbag_choice = FALSE
 
@@ -137,14 +137,14 @@
 
 	id_access = "Syndicate Agent"
 
-/datum/outfit/admin/syndicate/ninja/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/syndicate/ninja/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	. = ..()
 	if(visualsOnly)
 		return
 
 	H.equip_to_slot_or_del(new /obj/item/device/special_uplink/ninja(H, H.mind), slot_l_store)
 
-/datum/outfit/admin/syndicate/mercenary
+/obj/outfit/admin/syndicate/mercenary
 	name = "Mercenary"
 
 	uniform = /obj/item/clothing/under/syndicate
@@ -161,7 +161,7 @@
 
 	id_iff = IFF_MERCENARY
 
-/datum/outfit/admin/syndicate/mercenary/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/syndicate/mercenary/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	. = ..()
 	if(visualsOnly)
 		return
@@ -169,7 +169,7 @@
 	if(!H.shoes)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots/toeless(H), slot_shoes)
 
-/datum/outfit/admin/syndicate/mercenary/loner
+/obj/outfit/admin/syndicate/mercenary/loner
 	name = "Loner"
 
 	l_ear = /obj/item/device/radio/headset/syndicate
@@ -184,7 +184,7 @@
 	id_iff = IFF_LONER
 	id_access = "Lone Operative"
 
-/datum/outfit/admin/syndicate/raider
+/obj/outfit/admin/syndicate/raider
 	name = "Raider"
 	allow_backbag_choice = FALSE
 
@@ -335,7 +335,7 @@
 
 	backpack_contents = list()
 
-/datum/outfit/admin/syndicate/raider/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/syndicate/raider/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 
 	new /obj/random/backpack(H.loc)
 	var/obj/item/storage/backpack/bag
@@ -370,7 +370,7 @@
 
 	return ..()
 
-/datum/outfit/admin/syndicate/raider/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/syndicate/raider/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	. = ..()
 	if(visualsOnly)
 		return
@@ -385,7 +385,7 @@
 	if(W)
 		W.handle_item_insertion(passport)
 
-/datum/outfit/admin/syndicate/burglar
+/obj/outfit/admin/syndicate/burglar
 	name = "Burglar"
 	allow_backbag_choice = FALSE
 
@@ -431,7 +431,7 @@
 
 	id_iff = IFF_BURGLAR
 
-/datum/outfit/admin/syndicate/burglar/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/syndicate/burglar/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	. = ..()
 	if(visualsOnly)
 		return
@@ -488,7 +488,7 @@
 		W.handle_item_insertion(passport)
 
 
-/datum/outfit/admin/syndicate/jockey
+/obj/outfit/admin/syndicate/jockey
 	name = "Jockey"
 	allow_backbag_choice = FALSE
 
@@ -525,7 +525,7 @@
 
 	id_iff = IFF_JOCKEY
 
-/datum/outfit/admin/syndicate/jockey/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/syndicate/jockey/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	. = ..()
 	if(visualsOnly)
 		return
@@ -549,7 +549,7 @@
 
 // Non-syndicate antag outfits
 
-/datum/outfit/admin/highlander
+/obj/outfit/admin/highlander
 	name = "Highlander"
 
 	uniform = /obj/item/clothing/under/kilt
@@ -562,7 +562,7 @@
 	id = /obj/item/card/id/highlander
 	id_iff = IFF_HIGHLANDER
 
-/datum/outfit/admin/highlander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/highlander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	. = ..()
 	if(visualsOnly)
 		return
@@ -572,7 +572,7 @@
 		W.name = "[H.real_name]'s ID"
 		W.registered_name = H.real_name
 
-/datum/outfit/admin/syndicate/cultist
+/obj/outfit/admin/syndicate/cultist
 	name = "Cultist"
 	allow_backbag_choice = FALSE
 
@@ -592,10 +592,10 @@
 
 	id_iff = IFF_CULTIST
 
-/datum/outfit/admin/syndicate/cultist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/syndicate/cultist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	return
 
-/datum/outfit/admin/syndicate/cultist/super
+/obj/outfit/admin/syndicate/cultist/super
 	name = "Super Cultist"
 
 	head = /obj/item/clothing/head/helmet/space/cult
@@ -603,7 +603,7 @@
 
 	suit_store = /obj/item/gun/energy/rifle/cult
 
-/datum/outfit/admin/syndicate/raider_techno
+/obj/outfit/admin/syndicate/raider_techno
 	name = "Raider Techno"
 	allow_backbag_choice = FALSE
 
@@ -624,7 +624,7 @@
 
 	id_iff = IFF_BLUESPACE
 
-/datum/outfit/admin/syndicate/raider_techno/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/syndicate/raider_techno/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	var/list/loadouts = list("Nature", "Techno", "Cobra", "Brawler", "Shimmer")
 	if(H.gender in list(FEMALE, PLURAL, NEUTER))
 		loadouts += list("Storm", "Sorceress")
@@ -666,7 +666,7 @@
 			back = /obj/item/technomancer_core/summoner
 	return ..()
 
-/datum/outfit/admin/syndicate/raider_techno/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/syndicate/raider_techno/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	. = ..()
 	if(visualsOnly)
 		return
@@ -689,14 +689,14 @@
 	if(catalog)
 		catalog.bind_to_owner(H)
 
-/datum/outfit/admin/golem
+/obj/outfit/admin/golem
 	name = "Bluespace Golem"
 	allow_backbag_choice = FALSE
 
 	l_ear = /obj/item/device/radio/headset/bluespace
 	id_iff = IFF_BLUESPACE
 
-/datum/outfit/admin/techomancer
+/obj/outfit/admin/techomancer
 	name = "Technomancer"
 	allow_backbag_choice = FALSE
 
@@ -716,7 +716,7 @@
 
 	var/id_assignment = "Technomagus"
 
-/datum/outfit/admin/techomancer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/obj/outfit/admin/techomancer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	. = ..()
 	if(visualsOnly)
 		return
@@ -734,7 +734,7 @@
 	if(catalog)
 		catalog.bind_to_owner(H)
 
-/datum/outfit/admin/techomancer/apprentice
+/obj/outfit/admin/techomancer/apprentice
 	name = "Technomancer Apprentice"
 
 	head = /obj/item/clothing/head/chameleon/technomancer
@@ -746,7 +746,7 @@
 
 	id_assignment = "Techno-apprentice"
 
-/datum/outfit/admin/techomancer/apprentice/post_equip(mob/living/carbon/human/H, visualsOnly)
+/obj/outfit/admin/techomancer/apprentice/post_equip(mob/living/carbon/human/H, visualsOnly)
 	. = ..()
 	if(visualsOnly)
 		return
@@ -756,7 +756,7 @@
 	of your own.  You also have a catalog, to purchase your own functions and equipment as you see fit.</b>")
 	to_chat(H, "<b>It would be wise to speak to your master, and learn what their plans are for today. Your clothing is holographic, you should change its look before leaving.</b>")
 
-/datum/outfit/admin/techomancer/golem
+/obj/outfit/admin/techomancer/golem
 	name = "Technomancer Golem"
 
 	head = null