Merge remote-tracking branch 'citadel/master' into combat_rework_experimental

modular_citadel/code/datums/status_effects/chems.dm

@@ -583,16 +583,6 @@
 				C.Stun(60)
 				to_chat(owner, "<span class='warning'><i>Your muscles seize up, then start spasming wildy!</i></span>")
 
-			//wah intensifies wah-rks
-			else if (lowertext(customTriggers[trigger]) == "cum")//aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-				if (lewd)
-					if(ishuman(C))
-						var/mob/living/carbon/human/H = C
-						H.mob_climax(forced_climax=TRUE)
-					C.SetStun(10)//We got your stun effects in somewhere, Kev.
-				else
-					C.throw_at(get_step_towards(hearing_args[HEARING_SPEAKER],C), 3, 1) //cut this if it's too hard to get working
-
 			//kneel (knockdown)
 			else if (lowertext(customTriggers[trigger]) == "kneel")//as close to kneeling as you can get, I suppose.
 				to_chat(owner, "<span class='notice'><i>You drop to the ground unsurreptitiously.</i></span>")
@@ -674,15 +664,6 @@
 		deltaResist *= 1.25
 	if (owner.reagents.has_reagent(/datum/reagent/medicine/neurine))
 		deltaResist *= 1.5
-	if (!(owner.client?.prefs.cit_toggles & NO_APHRO) && lewd)
-		if (owner.reagents.has_reagent(/datum/reagent/drug/anaphrodisiac))
-			deltaResist *= 1.5
-		if (owner.reagents.has_reagent(/datum/reagent/drug/anaphrodisiacplus))
-			deltaResist *= 2
-		if (owner.reagents.has_reagent(/datum/reagent/drug/aphrodisiac))
-			deltaResist *= 0.75
-		if (owner.reagents.has_reagent(/datum/reagent/drug/aphrodisiacplus))
-			deltaResist *= 0.5
 	//Antag resistance
 	//cultists are already brainwashed by their god
 	if(iscultist(owner))

modular_citadel/code/modules/client/loadout/__donator.dm

@@ -1,496 +1,518 @@
 //This is the file that handles donator loadout items.
 
-/datum/gear/pingcoderfailsafe
+/datum/gear/donator
 	name = "IF YOU SEE THIS, PING A CODER RIGHT NOW!"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/bikehorn/golden
+	category = LOADOUT_CATEGORY_DONATOR
 	ckeywhitelist = list("This entry should never appear with this variable set.") //If it does, then that means somebody fucked up the whitelist system pretty hard
 
-/datum/gear/donortestingbikehorn
+/datum/gear/donator/pet
+	name = "Pet Beacon"
+	slot = SLOT_IN_BACKPACK
+	path = /obj/item/choice_beacon/pet
+	ckeywhitelist = list()
+	donator_group_id = DONATOR_GROUP_TIER_1 // can be accessed by all donators
+
+/datum/gear/donator/carpet
+	name = "Carpet Beacon"
+	slot = SLOT_IN_BACKPACK
+	path = /obj/item/choice_beacon/box/carpet
+	ckeywhitelist = list()
+	donator_group_id = DONATOR_GROUP_TIER_1
+
+/datum/gear/donator/chameleon_bedsheet
+	name = "Chameleon Bedsheet"
+	slot = SLOT_NECK
+	path = /obj/item/bedsheet/chameleon
+	ckeywhitelist = list()
+	donator_group_id = DONATOR_GROUP_TIER_1
+
+/datum/gear/donator/donortestingbikehorn
 	name = "Donor item testing bikehorn"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/bikehorn
 	geargroupID = list("DONORTEST") //This is a list mainly for the sake of testing, but geargroupID works just fine with ordinary strings
 
-/datum/gear/kevhorn
+/datum/gear/donator/kevhorn
 	name = "Airhorn"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/bikehorn/airhorn
 	ckeywhitelist = list("kevinz000")
 
-/datum/gear/cebusoap
-	name = "Cebutris' soap"
-	category = SLOT_IN_BACKPACK
-	path = /obj/item/custom/ceb_soap
-	ckeywhitelist = list("cebutris")
-
-/datum/gear/kiaracloak
+/datum/gear/donator/kiaracloak
 	name = "Kiara's cloak"
-	category = SLOT_NECK
+	slot = SLOT_NECK
 	path = /obj/item/clothing/neck/cloak/inferno
 	ckeywhitelist = list("inferno707")
 
-/datum/gear/kiaracollar
+/datum/gear/donator/kiaracollar
 	name = "Kiara's collar"
-	category = SLOT_NECK
+	slot = SLOT_NECK
 	path = /obj/item/clothing/neck/petcollar/inferno
 	ckeywhitelist = list("inferno707")
 
-/datum/gear/kiaramedal
+/datum/gear/donator/kiaramedal
 	name = "Insignia of Steele"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/clothing/accessory/medal/steele
 	ckeywhitelist = list("inferno707")
 
-/datum/gear/hheart
+/datum/gear/donator/hheart
 	name = "The Hollow Heart"
-	category = SLOT_WEAR_MASK
+	slot = SLOT_WEAR_MASK
 	path = /obj/item/clothing/mask/hheart
 	ckeywhitelist = list("inferno707")
 
-/datum/gear/engravedzippo
+/datum/gear/donator/engravedzippo
 	name = "Engraved zippo"
-	category = SLOT_HANDS
+	slot = SLOT_HANDS
 	path = /obj/item/lighter/gold
 	ckeywhitelist = list("dirtyoldharry")
 
-/datum/gear/geisha
+/datum/gear/donator/geisha
 	name = "Geisha suit"
-	category = SLOT_W_UNIFORM
+	slot = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/costume/geisha
 	ckeywhitelist = list("atiefling")
 
-/datum/gear/specialscarf
+/datum/gear/donator/specialscarf
 	name = "Special scarf"
-	category = SLOT_NECK
+	slot = SLOT_NECK
 	path = /obj/item/clothing/neck/scarf/zomb
 	ckeywhitelist = list("zombierobin")
 
-/datum/gear/redmadcoat
+/datum/gear/donator/redmadcoat
 	name = "The Mad's labcoat"
-	category = SLOT_WEAR_SUIT
+	slot = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/toggle/labcoat/mad/red
 	ckeywhitelist = list("zombierobin")
 
-/datum/gear/santahat
+/datum/gear/donator/santahat
 	name = "Santa hat"
-	category = SLOT_HEAD
+	slot = SLOT_HEAD
 	path = /obj/item/clothing/head/santa/fluff
 	ckeywhitelist = list("illotafv")
 
-/datum/gear/reindeerhat
+/datum/gear/donator/reindeerhat
 	name = "Reindeer hat"
-	category = SLOT_HEAD
+	slot = SLOT_HEAD
 	path = /obj/item/clothing/head/hardhat/reindeer/fluff
 	ckeywhitelist = list("illotafv")
 
-/datum/gear/treeplushie
+/datum/gear/donator/treeplushie
 	name = "Christmas tree plushie"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/toy/plush/tree
 	ckeywhitelist = list("illotafv")
 
-/datum/gear/santaoutfit
+/datum/gear/donator/santaoutfit
 	name = "Santa costume"
-	category = SLOT_WEAR_SUIT
+	slot = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/space/santa/fluff
 	ckeywhitelist = list("illotafv")
 
-/datum/gear/treecloak
+/datum/gear/donator/treecloak
 	name = "Christmas tree cloak"
-	category = SLOT_NECK
+	slot = SLOT_NECK
 	path = /obj/item/clothing/neck/cloak/festive
 	ckeywhitelist = list("illotafv")
 
-/datum/gear/carrotplush
+/datum/gear/donator/carrotplush
 	name = "Carrot plushie"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/toy/plush/carrot
 	ckeywhitelist = list("improvedname")
 
-/datum/gear/carrotcloak
+/datum/gear/donator/carrotcloak
 	name = "Carrot cloak"
-	category = SLOT_NECK
+	slot = SLOT_NECK
 	path = /obj/item/clothing/neck/cloak/carrot
 	ckeywhitelist = list("improvedname")
 
-/datum/gear/albortorosamask
+/datum/gear/donator/albortorosamask
 	name = "Alborto Rosa mask"
-	category = SLOT_WEAR_MASK
+	slot = SLOT_WEAR_MASK
 	path = /obj/item/clothing/mask/luchador/zigfie
 	ckeywhitelist = list("zigfie")
 
-/datum/gear/mankini
+/datum/gear/donator/mankini
 	name = "Mankini"
-	category = SLOT_W_UNIFORM
+	slot = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/misc/stripper/mankini
 	ckeywhitelist = list("zigfie")
 
-/datum/gear/pinkshoes
+/datum/gear/donator/pinkshoes
 	name = "Pink shoes"
-	category = SLOT_SHOES
+	slot = SLOT_SHOES
 	path = /obj/item/clothing/shoes/sneakers/pink
 	ckeywhitelist = list("zigfie")
 
-/datum/gear/reecesgreatcoat
+/datum/gear/donator/reecesgreatcoat
 	name = "Reece's Great Coat"
-	category = SLOT_WEAR_SUIT
+	slot = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/trenchcoat/green
 	ckeywhitelist = list("geemiesif")
 
-/datum/gear/russianflask
+/datum/gear/donator/russianflask
 	name = "Russian flask"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/reagent_containers/food/drinks/flask/russian
 	cost = 2
 	ckeywhitelist = list("slomka")
 
-/datum/gear/stalkermask
+/datum/gear/donator/stalkermask
 	name = "S.T.A.L.K.E.R. mask"
-	category = SLOT_WEAR_MASK
+	slot = SLOT_WEAR_MASK
 	path = /obj/item/clothing/mask/gas/stalker
 	ckeywhitelist = list("slomka")
 
-/datum/gear/stripedcollar
+/datum/gear/donator/stripedcollar
 	name = "Striped collar"
-	category = SLOT_NECK
+	slot = SLOT_NECK
 	path = /obj/item/clothing/neck/petcollar/stripe
 	ckeywhitelist = list("jademanique")
 
-/datum/gear/performersoutfit
+/datum/gear/donator/performersoutfit
 	name = "Bluish performer's outfit"
-	category = SLOT_W_UNIFORM
+	slot = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/costume/singer/yellow/custom
 	ckeywhitelist = list("killer402402")
 
-/datum/gear/vermillion
+/datum/gear/donator/vermillion
 	name = "Vermillion clothing"
-	category = SLOT_W_UNIFORM
+	slot = SLOT_W_UNIFORM
 	path = /obj/item/clothing/suit/vermillion
 	ckeywhitelist = list("fractious")
 
-/datum/gear/AM4B
+/datum/gear/donator/AM4B
 	name = "Foam Force AM4-B"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/gun/ballistic/automatic/AM4B
 	ckeywhitelist = list("zeronetalpha")
 
-/datum/gear/carrotsatchel
+/datum/gear/donator/carrotsatchel
 	name = "Carrot Satchel"
-	category = SLOT_HANDS
+	slot = SLOT_HANDS
 	path = /obj/item/storage/backpack/satchel/carrot
 	ckeywhitelist = list("improvedname")
 
-/datum/gear/naomisweater
+/datum/gear/donator/naomisweater
 	name = "worn black sweater"
-	category = SLOT_W_UNIFORM
+	slot = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/sweater/black/naomi
 	ckeywhitelist = list("technicalmagi")
 
-/datum/gear/naomicollar
+/datum/gear/donator/naomicollar
 	name = "worn pet collar"
-	category = SLOT_NECK
+	slot = SLOT_NECK
 	path = /obj/item/clothing/neck/petcollar/naomi
 	ckeywhitelist = list("technicalmagi")
 
-/datum/gear/gladiator
+/datum/gear/donator/gladiator
 	name = "Gladiator Armor"
-	category = SLOT_WEAR_SUIT
+	slot = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/under/costume/gladiator
 	ckeywhitelist = list("aroche")
 
-/datum/gear/bloodredtie
+/datum/gear/donator/bloodredtie
 	name = "Blood Red Tie"
-	category = SLOT_NECK
+	slot = SLOT_NECK
 	path = /obj/item/clothing/neck/tie/bloodred
 	ckeywhitelist = list("kyutness")
 
-/datum/gear/puffydress
+/datum/gear/donator/puffydress
 	name = "Puffy Dress"
-	category = SLOT_WEAR_SUIT
+	slot = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/puffydress
 	ckeywhitelist = list("stallingratt")
 
-/datum/gear/labredblack
+/datum/gear/donator/labredblack
 	name = "Black and Red Coat"
-	category = SLOT_WEAR_SUIT
+	slot = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/toggle/labcoat/labredblack
 	ckeywhitelist = list("blakeryan", "durandalphor")
 
-/datum/gear/torisword
+/datum/gear/donator/torisword
 	name = "Rainbow Zweihander"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/dualsaber/hypereutactic/toy/rainbow
 	ckeywhitelist = list("annoymous35")
 
-/datum/gear/darksabre
+/datum/gear/donator/darksabre
 	name = "Dark Sabre"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/toy/darksabre
 	ckeywhitelist = list("inferno707")
 
-datum/gear/darksabresheath
+/datum/gear/donator/darksabresheath
 	name = "Dark Sabre Sheath"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/storage/belt/sabre/darksabre
 	ckeywhitelist = list("inferno707")
 
-/datum/gear/toriball
+/datum/gear/donator/toriball
 	name = "Rainbow Tennis Ball"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/toy/tennis/rainbow
 	ckeywhitelist = list("annoymous35")
 
-/datum/gear/izzyball
+/datum/gear/donator/izzyball
 	name = "Katlin's Ball"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/toy/tennis/rainbow/izzy
 	ckeywhitelist = list("izzyinbox")
 
-/datum/gear/cloak
+/datum/gear/donator/cloak
 	name = "Green Cloak"
-	category = SLOT_NECK
+	slot = SLOT_NECK
 	path = /obj/item/clothing/neck/cloak/green
 	ckeywhitelist = list("killer402402")
 
-/datum/gear/steelflask
+/datum/gear/donator/steelflask
 	name = "Steel Flask"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/reagent_containers/food/drinks/flask/steel
 	cost = 2
 	ckeywhitelist = list("nik707")
 
-/datum/gear/paperhat
+/datum/gear/donator/paperhat
 	name = "Paper Hat"
-	category = SLOT_HEAD
+	slot = SLOT_HEAD
 	path = /obj/item/clothing/head/paperhat
 	ckeywhitelist = list("kered2")
 
-/datum/gear/cloakce
+/datum/gear/donator/cloakce
 	name = "Polychromic CE Cloak"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/clothing/neck/cloak/polychromic/polyce
 	ckeywhitelist = list("worksbythesea", "blakeryan")
 
-/datum/gear/ssk
+/datum/gear/donator/ssk
 	name = "Stun Sword Kit"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = 	/obj/item/ssword_kit
 	ckeywhitelist = list("phillip458")
 
-/datum/gear/techcoat
+/datum/gear/donator/techcoat
 	name = "Techomancers Labcoat"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/clothing/suit/toggle/labcoat/mad/techcoat
 	ckeywhitelist = list("wilchen")
 
-/datum/gear/leechjar
+/datum/gear/donator/leechjar
 	name = "Jar of Leeches"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = 	/obj/item/custom/leechjar
 	ckeywhitelist = list("sgtryder")
 
-/datum/gear/darkarmor
+/datum/gear/donator/darkarmor
 	name = "Dark Armor"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/clothing/suit/armor/vest/darkcarapace
 	ckeywhitelist = list("inferno707")
 
-/datum/gear/devilwings
+/datum/gear/donator/devilwings
 	name = "Strange Wings"
-	category = SLOT_NECK
+	slot = SLOT_NECK
 	path = /obj/item/clothing/neck/devilwings
 	ckeywhitelist = list("kitsun")
 
-/datum/gear/flagcape
+/datum/gear/donator/flagcape
 	name = "US Flag Cape"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/clothing/neck/flagcape
 	ckeywhitelist = list("darnchacha")
 
-/datum/gear/luckyjack
+/datum/gear/donator/luckyjack
 	name = "Lucky Jackboots"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/clothing/shoes/lucky
 	ckeywhitelist = list("donaldtrumpthecommunist")
 
-/datum/gear/raiqbawks
+/datum/gear/donator/raiqbawks
 	name = "Miami Boombox"
-	category = SLOT_HANDS
+	slot = SLOT_HANDS
 	cost = 2
 	path = /obj/item/boombox/raiq
 	ckeywhitelist = list("chefferz")
 
-/datum/gear/m41
+/datum/gear/donator/m41
 	name = "Toy M41"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/toy/gun/m41
 	ckeywhitelist = list("thalverscholen")
 
-/datum/gear/Divine_robes
+/datum/gear/donator/Divine_robes
 	name = "Divine robes"
-	category = SLOT_W_UNIFORM
+	slot = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/custom/lunasune
 	ckeywhitelist = list("invader4352")
 
-/datum/gear/gothcoat
+/datum/gear/donator/gothcoat
 	name = "Goth Coat"
-	category = SLOT_WEAR_SUIT
+	slot = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/gothcoat
 	ckeywhitelist = list("norko")
 
-/datum/gear/corgisuit
+/datum/gear/donator/corgisuit
 	name = "Corgi Suit"
-	category = SLOT_WEAR_SUIT
+	slot = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/ian_costume
 	ckeywhitelist = list("cathodetherobot")
 
-/datum/gear/sharkcloth
+/datum/gear/donator/sharkcloth
 	name = "Leon's Skimpy Outfit"
-	category = SLOT_WEAR_SUIT
+	slot = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/under/custom/leoskimpy
 	ckeywhitelist = list("spectrosis")
 
-/datum/gear/mimemask
+/datum/gear/donator/mimemask
 	name = "Mime Mask"
-	category = SLOT_WEAR_MASK
+	slot = SLOT_WEAR_MASK
 	path = /obj/item/clothing/mask/gas/mime
 	ckeywhitelist = list("pireamaineach")
 
-/datum/gear/mimeoveralls
+/datum/gear/donator/mimeoveralls
 	name = "Mime's Overalls"
-	category = SLOT_WEAR_SUIT
+	slot = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/under/custom/mimeoveralls
 	ckeywhitelist = list("pireamaineach")
 
-/datum/gear/soulneck
+/datum/gear/donator/soulneck
 	name = "Soul Necklace"
-	category = SLOT_NECK
+	slot = SLOT_NECK
 	path = /obj/item/clothing/neck/undertale
 	ckeywhitelist = list("twilightic")
 
-/datum/gear/frenchberet
+/datum/gear/donator/frenchberet
 	name = "French Beret"
-	category = SLOT_HEAD
+	slot = SLOT_HEAD
 	path = /obj/item/clothing/head/frenchberet
 	ckeywhitelist = list("notazoltan")
 
-/datum/gear/zuliecloak
+/datum/gear/donator/zuliecloak
 	name = "Project: Zul-E"
-	category = SLOT_WEAR_SUIT
+	slot = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/cloak/zuliecloak
 	ckeywhitelist = list("asky")
 
-/datum/gear/blackredgold
+/datum/gear/donator/blackredgold
 	name = "Black, Red, and Gold Coat"
-	category = SLOT_WEAR_SUIT
+	slot = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/blackredgold
 	ckeywhitelist = list("ttbnc")
 
-/datum/gear/fritzplush
+/datum/gear/donator/fritzplush
 	name = "Fritz Plushie"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/toy/plush/mammal/dog/fritz
 	ckeywhitelist = list("analwerewolf")
 
-/datum/gear/kimono
+/datum/gear/donator/kimono
 	name = "Kimono"
-	category = SLOT_WEAR_SUIT
+	slot = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/kimono
 	ckeywhitelist = list("sfox63")
 
-/datum/gear/commjacket
+/datum/gear/donator/commjacket
 	name = "Dusty Commisar's Cloak"
-	category = SLOT_WEAR_SUIT
+	slot = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/commjacket
 	ckeywhitelist = list("sadisticbatter")
 
-/datum/gear/mw2_russian_para
+/datum/gear/donator/mw2_russian_para
 	name = "Russian Paratrooper Jumper"
-	category = SLOT_W_UNIFORM
+	slot = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/custom/mw2_russian_para
 	ckeywhitelist = list("investigator77")
 
-/datum/gear/longblackgloves
+/datum/gear/donator/longblackgloves
 	name = "Luna's Gauntlets"
-	category = SLOT_GLOVES
+	slot = SLOT_GLOVES
 	path = /obj/item/clothing/gloves/longblackgloves
 	ckeywhitelist = list("bigmanclancy")
 
-/datum/gear/trendy_fit
+/datum/gear/donator/trendy_fit
 	name = "Trendy Fit"
-	category = SLOT_W_UNIFORM
+	slot = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/custom/trendy_fit
 	ckeywhitelist = list("midgetdragon")
 
-/datum/gear/singery
+/datum/gear/donator/singery
 	name = "Yellow Performer Outfit"
-	category = SLOT_W_UNIFORM
+	slot = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/costume/singer/yellow
 	ckeywhitelist = list("maxlynchy")
 
-/datum/gear/csheet
+/datum/gear/donator/csheet
 	name = "NT Bedsheet"
-	category = SLOT_NECK
+	slot = SLOT_NECK
 	path = /obj/item/bedsheet/captain
 	ckeywhitelist = list("tikibomb")
 
-/datum/gear/borgplush
+/datum/gear/donator/borgplush
 	name = "Robot Plush"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/toy/plush/borgplushie
 	ckeywhitelist = list("nicholaiavenicci")
 
-/datum/gear/donorberet
+/datum/gear/donator/donorberet
 	name = "Atmos Beret"
-	category = SLOT_HEAD
+	slot = SLOT_HEAD
 	path = /obj/item/clothing/head/blueberet
 	ckeywhitelist = list("foxystalin")
 
-/datum/gear/donorgoggles
+/datum/gear/donator/donorgoggles
 	name = "Flight Goggles"
-	category = SLOT_HEAD
+	slot = SLOT_HEAD
 	path = /obj/item/clothing/head/flight
 	ckeywhitelist = list("maxlynchy")
 
-/datum/gear/onionneck
+/datum/gear/donator/onionneck
 	name = "Onion Necklace"
-	category = SLOT_NECK
+	slot = SLOT_NECK
 	path = /obj/item/clothing/neck/necklace/onion
 	ckeywhitelist = list("cdrcross")
 
-/datum/gear/mikubikini
+/datum/gear/donator/mikubikini
 	name = "starlight singer bikini"
-	category = SLOT_W_UNIFORM
+	slot = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/custom/mikubikini
 	ckeywhitelist = list("grandvegeta")
 
-/datum/gear/mikujacket
+/datum/gear/donator/mikujacket
 	name = "starlight singer jacket"
-	category = SLOT_WEAR_SUIT
+	slot = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/mikujacket
 	ckeywhitelist = list("grandvegeta")
 
-/datum/gear/mikuhair
+/datum/gear/donator/mikuhair
 	name = "starlight singer hair"
-	category = SLOT_W_UNIFORM
+	slot = SLOT_W_UNIFORM
 	path = /obj/item/clothing/head/mikuhair
 	ckeywhitelist = list("grandvegeta")
 
-/datum/gear/mikugloves
+/datum/gear/donator/mikugloves
 	name = "starlight singer gloves"
-	category = SLOT_GLOVES
+	slot = SLOT_GLOVES
 	path = /obj/item/clothing/gloves/mikugloves
 	ckeywhitelist = list("grandvegeta")
 
-/datum/gear/mikuleggings
+/datum/gear/donator/mikuleggings
 	name = "starlight singer leggings"
-	category = SLOT_SHOES
+	slot = SLOT_SHOES
 	path = /obj/item/clothing/shoes/sneakers/mikuleggings
 	ckeywhitelist = list("grandvegeta")
 
-/datum/gear/cosmos
+/datum/gear/donator/cosmos
 	name = "cosmic space bedsheet"
-	category = SLOT_IN_BACKPACK
+	slot = SLOT_IN_BACKPACK
 	path = /obj/item/bedsheet/cosmos
 	ckeywhitelist = list("grunnyyy")
+
+/datum/gear/donator/hisakaki
+	name = "halo"
+	slot = SLOT_HEAD
+	path = 	/obj/item/clothing/head/halo
+	ckeywhitelist = list("hisakaki")

modular_citadel/code/modules/client/loadout/_loadout.dm

@@ -27,8 +27,13 @@ GLOBAL_LIST_EMPTY(loadout_whitelist_ids)
 /proc/initialize_global_loadout_items()
 	load_loadout_config()
 	for(var/item in subtypesof(/datum/gear))
-		var/datum/gear/I = new item
-		LAZYSET(GLOB.loadout_items[slot_to_string(I.category)], I.name, I)
+		var/datum/gear/I = item
+		if(!initial(I.name))
+			continue
+		I = new item
+		LAZYINITLIST(GLOB.loadout_items[I.category])
+		LAZYINITLIST(GLOB.loadout_items[I.category][I.subcategory])
+		GLOB.loadout_items[I.category][I.subcategory][I.name] = I
 		if(islist(I.geargroupID))
 			var/list/ggidlist = I.geargroupID
 			I.ckeywhitelist = list()
@@ -41,7 +46,9 @@ GLOBAL_LIST_EMPTY(loadout_whitelist_ids)
 
 /datum/gear
 	var/name
-	var/category
+	var/category = LOADOUT_CATEGORY_NONE
+	var/subcategory = LOADOUT_SUBCATEGORY_NONE
+	var/slot
 	var/description
 	var/path //item-to-spawn path
 	var/cost = 1 //normally, each loadout costs a single point.

modular_citadel/code/modules/client/loadout/_medical.dm

@@ -1,47 +1,45 @@
-/datum/gear/medicbriefcase
+/datum/gear/hands/medicbriefcase
 	name = "Medical Briefcase"
-	category = SLOT_HANDS
 	path = /obj/item/storage/briefcase/medical
 	restricted_roles = list("Medical Doctor", "Chief Medical Officer")
 	restricted_desc = "MD, CMO"
 
-/datum/gear/stethoscope
+/datum/gear/neck/stethoscope
 	name = "Stethoscope"
-	category = SLOT_NECK
 	path = /obj/item/clothing/neck/stethoscope
 	restricted_roles = list("Medical Doctor", "Chief Medical Officer")
 
-/datum/gear/bluescrubs
+/datum/gear/uniform/bluescrubs
 	name = "Blue Scrubs"
-	category = SLOT_W_UNIFORM
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	path = /obj/item/clothing/under/rank/medical/doctor/blue
 	restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist")
 	restricted_desc = "Medical"
-	
-/datum/gear/greenscrubs
+
+/datum/gear/uniform/greenscrubs
 	name = "Green Scrubs"
-	category = SLOT_W_UNIFORM
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	path = /obj/item/clothing/under/rank/medical/doctor/green
 	restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist")
 	restricted_desc = "Medical"
 
-/datum/gear/purplescrubs
+/datum/gear/uniform/purplescrubs
 	name = "Purple Scrubs"
-	category = SLOT_W_UNIFORM
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	path = /obj/item/clothing/under/rank/medical/doctor/purple
 	restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist")
 	restricted_desc = "Medical"
 
-/datum/gear/nursehat
+/datum/gear/head/nursehat
 	name = "Nurse Hat"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/nursehat
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist")
 	restricted_desc = "Medical"
 
-/datum/gear/nursesuit
+/datum/gear/uniform/nursesuit
 	name = "Nurse Suit"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/rank/medical/doctor/nurse
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist")
-	restricted_desc = "Medical"
+	restricted_desc = "Medical"

modular_citadel/code/modules/client/loadout/_security.dm

@@ -1,71 +1,70 @@
-/datum/gear/navyblueuniformhos
+/datum/gear/uniform/navyblueuniformhos
  	name = "Head of Security navyblue uniform"
- 	category = SLOT_W_UNIFORM
+ 	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
  	path = /obj/item/clothing/under/rank/security/head_of_security/formal
  	restricted_roles = list("Head of Security")
 
-/datum/gear/navybluehosberet
+/datum/gear/head/navybluehosberet
 	name = "Head of security's navyblue beret"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/beret/sec/navyhos
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_roles = list("Head of Security")
 
-/datum/gear/navybluejackethos
+/datum/gear/suit/navybluejackethos
 	name = "head of security's navyblue jacket"
-	category = SLOT_WEAR_SUIT
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
 	path = /obj/item/clothing/suit/armor/hos/navyblue
 	restricted_roles = list("Head of Security")
 
-/datum/gear/navybluejacketofficer
+/datum/gear/suit/navybluejacketofficer
 	name = "security officer's navyblue jacket"
-	category = SLOT_WEAR_SUIT
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
 	path = /obj/item/clothing/suit/armor/navyblue
 	restricted_roles = list("Security Officer")
 
-/datum/gear/navyblueofficerberet
+/datum/gear/head/navyblueofficerberet
 	name = "Security officer's Navyblue beret"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/beret/sec/navyofficer
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_roles = list("Security Officer")
 
-/datum/gear/navyblueuniformofficer
+/datum/gear/uniform/navyblueuniformofficer
  	name = "Security officer navyblue uniform"
- 	category = SLOT_W_UNIFORM
+ 	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
  	path = /obj/item/clothing/under/rank/security/officer/formal
  	restricted_roles = list("Security Officer")
 
-/datum/gear/navybluejacketwarden
+/datum/gear/suit/navybluejacketwarden
 	name = "warden navyblue jacket"
-	category = SLOT_WEAR_SUIT
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
 	path = /obj/item/clothing/suit/armor/vest/warden/navyblue
 	restricted_roles = list("Warden")
 
-/datum/gear/navybluewardenberet
+/datum/gear/head/navybluewardenberet
 	name = "Warden's navyblue beret"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/beret/sec/navywarden
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_roles = list("Warden")
 
-/datum/gear/navyblueuniformwarden
+/datum/gear/uniform/navyblueuniformwarden
  	name = "Warden navyblue uniform"
- 	category = SLOT_W_UNIFORM
+ 	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
  	path = /obj/item/clothing/under/rank/security/warden/formal
  	restricted_roles = list("Warden")
 
-/datum/gear/secskirt
+/datum/gear/uniform/secskirt
 	name = "Security skirt"
-	category = SLOT_W_UNIFORM
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	path = /obj/item/clothing/under/rank/security/officer/skirt
 	restricted_roles = list("Security Officer", "Warden", "Head of Security")
 
-/datum/gear/hosskirt
+/datum/gear/uniform/hosskirt
 	name = "Head of security's skirt"
-	category = SLOT_W_UNIFORM
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	path = /obj/item/clothing/under/rank/security/head_of_security/skirt
 	restricted_roles = list("Head of Security")
 
-/datum/gear/sechud
+/datum/gear/glasses/sechud
 	name = "Security Hud"
-	category = SLOT_GLASSES
 	path = /obj/item/clothing/glasses/hud/security
-	restricted_roles = list("Security Officer", "Warden", "Head of Security")
+	restricted_roles = list("Security Officer", "Warden", "Head of Security")

modular_citadel/code/modules/client/loadout/_service.dm

@@ -1,33 +1,33 @@
-/datum/gear/greytidestationwide
+/datum/gear/uniform/greytidestationwide
 	name = "Staff Assistant's jumpsuit"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/misc/staffassistant
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_roles = list("Assistant")
 
-/datum/gear/neetsuit
+/datum/gear/suit/neetsuit
 	name = "D.A.B. suit"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/assu_suit
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_roles = list("Assistant")
 	cost = 2
 
-/datum/gear/neethelm
+/datum/gear/head/neethelm
 	name = "D.A.B. helmet"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/assu_helmet
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_roles = list("Assistant")
 	cost = 2
 
-/datum/gear/plushvar
+/datum/gear/backpack/plushvar
 	name = "Ratvar Plushie"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/toy/plush/plushvar
+	subcategory = LOADOUT_SUBCATEGORY_BACKPACK_TOYS
 	cost = 5
 	restricted_roles = list("Chaplain")
 
-/datum/gear/narplush
+/datum/gear/backpack/narplush
 	name = "Narsie Plushie"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/toy/plush/narplush
+	subcategory = LOADOUT_SUBCATEGORY_BACKPACK_TOYS
 	cost = 5
 	restricted_roles = list("Chaplain")

modular_citadel/code/modules/client/loadout/backpack.dm

@@ -1,112 +1,104 @@
-/datum/gear/plushbox
+/datum/gear/backpack
+	category = LOADOUT_CATEGORY_BACKPACK
+	subcategory = LOADOUT_SUBCATEGORY_BACKPACK_GENERAL
+	slot = SLOT_IN_BACKPACK
+
+/datum/gear/backpack/plushbox
 	name = "Plushie Choice Box"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/choice_beacon/box/plushie
+	subcategory = LOADOUT_SUBCATEGORY_BACKPACK_TOYS
 
-/datum/gear/tennis
+/datum/gear/backpack/tennis
 	name = "Classic Tennis Ball"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/toy/tennis
+	subcategory = LOADOUT_SUBCATEGORY_BACKPACK_TOYS
 
-/datum/gear/tennisred
+/datum/gear/backpack/tennis/red
 	name = "Red Tennis Ball"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/toy/tennis/red
 
-/datum/gear/tennisyellow
+/datum/gear/backpack/tennis/yellow
 	name = "Yellow Tennis Ball"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/toy/tennis/yellow
 
-/datum/gear/tennisgreen
+/datum/gear/backpack/tennis/green
 	name = "Green Tennis Ball"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/toy/tennis/green
 
-/datum/gear/tenniscyan
+/datum/gear/backpack/tennis/cyan
 	name = "Cyan Tennis Ball"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/toy/tennis/cyan
 
-/datum/gear/tennisblue
+/datum/gear/backpack/tennis/blue
 	name = "Blue Tennis Ball"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/toy/tennis/blue
 
-/datum/gear/tennispurple
+/datum/gear/backpack/tennis/purple
 	name = "Purple Tennis Ball"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/toy/tennis/purple
 
-/datum/gear/dildo
+/datum/gear/backpack/dildo
 	name = "Customizable dildo"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/dildo/custom
+	subcategory = LOADOUT_SUBCATEGORY_BACKPACK_TOYS
 
-/datum/gear/toykatana
+/datum/gear/backpack/toykatana
 	name = "Toy Katana"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/toy/katana
+	subcategory = LOADOUT_SUBCATEGORY_BACKPACK_TOYS
 	cost = 3
 
-/datum/gear/tapeplayer
+/datum/gear/backpack/tapeplayer
 	name = "Taperecorder"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/taperecorder
 
-/datum/gear/tape
+/datum/gear/backpack/tape
 	name = "Spare cassette tape"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/tape/random
 
-/datum/gear/newspaper
+/datum/gear/backpack/newspaper
 	name = "Newspaper"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/newspaper
 
-/datum/gear/crayons
+/datum/gear/backpack/crayons
 	name = "Box of crayons"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/storage/crayons
+	subcategory = LOADOUT_SUBCATEGORY_BACKPACK_TOYS
 
-/datum/gear/multipen
+/datum/gear/backpack/multipen
 	name = "A multicolored pen"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/pen/fourcolor
 
-/datum/gear/fountainpen
+/datum/gear/backpack/fountainpen
 	name = "A fancy pen"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/pen/fountain
 	cost = 2
 
-/datum/gear/modular_tablet
+/datum/gear/backpack/modular_tablet
 	name = "A modular tablet"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/modular_computer/tablet/preset/cheap/
 	cost = 4
 
-/datum/gear/modular_laptop
+/datum/gear/backpack/modular_laptop
 	name = "A modular laptop"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/modular_computer/laptop/preset/civilian
 	cost = 7
 
-/datum/gear/ringbox_gold
+/datum/gear/backpack/ringbox_gold
 	name = "A gold ring box"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/storage/fancy/ringbox
 	cost = 3
 
-/datum/gear/ringbox_silver
+/datum/gear/backpack/ringbox_silver
 	name = "A silver ring box"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/storage/fancy/ringbox/silver
 	cost = 3
 
-/datum/gear/ringbox_diamond
+/datum/gear/backpack/ringbox_diamond
 	name = "A diamond ring box"
-	category = SLOT_IN_BACKPACK
 	path = /obj/item/storage/fancy/ringbox/diamond
 	cost = 5
 
+/datum/gear/backpack/necklace//this is here because loadout doesn't support proper accessories
+	name = "A renameable necklace"
+	path = /obj/item/clothing/accessory/necklace

modular_citadel/code/modules/client/loadout/glasses.dm

@@ -1,49 +1,43 @@
-/datum/gear/blindfold
+/datum/gear/glasses
+	category = LOADOUT_CATEGORY_GLASSES
+	slot = SLOT_GLASSES
+
+/datum/gear/glasses/blindfold
 	name = "Blindfold"
-	category = SLOT_GLASSES
 	path = /obj/item/clothing/glasses/sunglasses/blindfold
 
-/datum/gear/cold
+/datum/gear/glasses/cold
 	name = "Cold goggles"
-	category = SLOT_GLASSES
 	path = /obj/item/clothing/glasses/cold
 
-/datum/gear/eyepatch
+/datum/gear/glasses/eyepatch
 	name = "Eyepatch"
-	category = SLOT_GLASSES
 	path = /obj/item/clothing/glasses/eyepatch
 
-/datum/gear/heat
+/datum/gear/glasses/heat
 	name = "Heat goggles"
-	category = SLOT_GLASSES
 	path = /obj/item/clothing/glasses/heat
 
-/datum/gear/hipster
+/datum/gear/glasses/hipster
 	name = "Hipster glasses"
-	category = SLOT_GLASSES
 	path = /obj/item/clothing/glasses/regular/hipster
 
-/datum/gear/jamjar
+/datum/gear/glasses/jamjar
 	name = "Jamjar glasses"
-	category = SLOT_GLASSES
 	path = /obj/item/clothing/glasses/regular/jamjar
 
-/datum/gear/monocle
+/datum/gear/glasses/monocle
 	name = "Monocle"
-	category = SLOT_GLASSES
 	path = /obj/item/clothing/glasses/monocle
 
-/datum/gear/orange
+/datum/gear/glasses/orange
 	name = "Orange glasses"
-	category = SLOT_GLASSES
 	path = /obj/item/clothing/glasses/orange
 
-/datum/gear/red
+/datum/gear/glasses/red
 	name = "Red Glasses"
-	category = SLOT_GLASSES
 	path = /obj/item/clothing/glasses/red
 
-/datum/gear/prescription
+/datum/gear/glasses/prescription
 	name = "Prescription glasses"
-	category = SLOT_GLASSES
 	path = /obj/item/clothing/glasses/regular

modular_citadel/code/modules/client/loadout/gloves.dm

@@ -1,28 +1,34 @@
-/datum/gear/fingerless
+/datum/gear/gloves
+	category = LOADOUT_CATEGORY_GLOVES
+	slot = SLOT_GLOVES
+
+/datum/gear/gloves/fingerless
 	name = "Fingerless Gloves"
-	category = SLOT_GLOVES
 	path = /obj/item/clothing/gloves/fingerless
 
-/datum/gear/evening
+/datum/gear/gloves/evening
 	name = "Evening gloves"
-	category = SLOT_GLOVES
 	path = /obj/item/clothing/gloves/evening
+	
+/datum/gear/gloves/midnight
+	name = "Midnight gloves"
+	path = /obj/item/clothing/gloves/evening/black
 
-/datum/gear/goldring
+/datum/gear/gloves/goldring
 	name = "A gold ring"
-	category = SLOT_GLOVES
 	path = /obj/item/clothing/gloves/ring
 	cost = 2
 
-/datum/gear/silverring
+/datum/gear/gloves/silverring
 	name = "A silver ring"
-	category = SLOT_GLOVES
 	path = /obj/item/clothing/gloves/ring/silver
 	cost = 2
 
-/datum/gear/diamondring
+/datum/gear/gloves/diamondring
 	name = "A diamond ring"
-	category = SLOT_GLOVES
 	path = /obj/item/clothing/gloves/ring/diamond
 	cost = 4
 
+/datum/gear/gloves/customring
+	name = "A ring, renameable"
+	path = /obj/item/clothing/gloves/ring/custom

modular_citadel/code/modules/client/loadout/hands.dm

@@ -1,67 +1,54 @@
-/datum/gear/cane
+/datum/gear/hands
+	category = LOADOUT_CATEGORY_HANDS
+	slot = SLOT_HANDS
+
+/datum/gear/hands/cane
 	name = "Cane"
-	category = SLOT_HANDS
 	path = /obj/item/cane
 
-/datum/gear/cigarettes
+/datum/gear/hands/cigarettes
 	name = "Cigarette pack"
-	category = SLOT_HANDS
 	path = /obj/item/storage/fancy/cigarettes
 
-/datum/gear/dice
+/datum/gear/hands/dice
 	name = "Dice bag"
-	category = SLOT_HANDS
 	path = /obj/item/storage/box/dice
 
-/datum/gear/eightball
+/datum/gear/hands/eightball
 	name = "Magic eightball"
-	category = SLOT_HANDS
 	path = /obj/item/toy/eightball
 
-/datum/gear/matches
+/datum/gear/hands/matches
 	name = "Matchbox"
-	category = SLOT_HANDS
 	path = /obj/item/storage/box/matches
 
-/datum/gear/cheaplighter
+/datum/gear/hands/cheaplighter
 	name = "Cheap lighter"
-	category = SLOT_HANDS
 	path = /obj/item/lighter/greyscale
 
-/datum/gear/cards
+/datum/gear/hands/cards
 	name = "Playing cards"
-	category = SLOT_HANDS
 	path = /obj/item/toy/cards/deck
 
-/datum/gear/skub
+/datum/gear/hands/skub
 	name = "Skub"
-	category = SLOT_HANDS
 	path = /obj/item/skub
 
-/datum/gear/carpplushie
-	name = "Space carp plushie"
-	category = SLOT_HANDS
-	path = /obj/item/toy/plush/carpplushie
-
-/datum/gear/wallet
+/datum/gear/hands/wallet
 	name = "Wallet"
-	category = SLOT_HANDS
 	path = /obj/item/storage/wallet
 
-/datum/gear/flask
+/datum/gear/hands/flask
 	name = "Flask"
-	category = SLOT_HANDS
 	path = /obj/item/reagent_containers/food/drinks/flask
 	cost = 2
 
-/datum/gear/zippolighter
+/datum/gear/hands/zippolighter
 	name = "Zippo Lighter"
-	category = SLOT_HANDS
 	path = /obj/item/lighter
 	cost = 2
 
-/datum/gear/cigar
+/datum/gear/hands/cigar
 	name = "Cigar"
-	category = SLOT_HANDS
 	path = /obj/item/clothing/mask/cigarette/cigar
 	cost = 4 //smoking is bad mkay

modular_citadel/code/modules/client/loadout/head.dm

@@ -1,146 +1,136 @@
-/datum/gear/baseball
+/datum/gear/head
+	category = LOADOUT_CATEGORY_HEAD
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_GENERAL
+	slot = SLOT_HEAD
+
+/datum/gear/head/baseball
 	name = "Ballcap"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/soft/mime
 
-/datum/gear/beanie
+/datum/gear/head/beanie
 	name = "Beanie"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/beanie
 
-/datum/gear/beret
+/datum/gear/head/beret
 	name = "Black beret"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/beret/black
 
-/datum/gear/flatcap
+/datum/gear/head/flatcap
 	name = "Flat cap"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/flatcap
 
-/datum/gear/pirate
+/datum/gear/head/pirate
 	name = "Pirate hat"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/pirate
 
-/datum/gear/rice_hat
+/datum/gear/head/rice_hat
 	name = "Rice hat"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/rice_hat
 
-/datum/gear/ushanka
-	name = "Ushanka"
-	category = SLOT_HEAD
+/datum/gear/head/ushanka
 	path = /obj/item/clothing/head/ushanka
 
-/datum/gear/slime
+/datum/gear/head/slime
 	name = "Slime hat"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/collectable/slime
 
-/datum/gear/fedora
+/datum/gear/head/fedora
 	name = "Fedora"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/fedora
 
-/datum/gear/that
+/datum/gear/head/that
 	name = "Top Hat"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/that
 
-/datum/gear/maidband
+/datum/gear/head/maidband
 	name = "Maid headband"
-	category = SLOT_HEAD
 	path= /obj/item/clothing/head/maid
 
-/datum/gear/flakhelm
+/datum/gear/head/flakhelm
 	name = "Flak Helmet"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/flakhelm
 	cost = 2
 
-/datum/gear/bunnyears
+/datum/gear/head/bunnyears
 	name = "Bunny Ears"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/rabbitears
 
-/datum/gear/mailmanhat
+/datum/gear/head/mailmanhat
 	name = "Mailman's Hat"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/mailman
 
 //trek fancy Hats!
-/datum/gear/trekcap
+/datum/gear/head/trekcap
 	name = "Federation Officer's Cap (White)"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/caphat/formal/fedcover
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_roles = list("Captain","Head of Personnel")
 
-/datum/gear/trekcapcap
+/datum/gear/head/trekcapcap
 	name = "Federation Officer's Cap (Black)"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/caphat/formal/fedcover/black
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_roles = list("Captain","Head of Personnel")
 
-/datum/gear/trekcapmedisci
+/datum/gear/head/trekcapmedisci
 	name = "Federation Officer's Cap (Blue)"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/caphat/formal/fedcover/medsci
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
 
-/datum/gear/trekcapeng
+/datum/gear/head/trekcapeng
 	name = "Federation Officer's Cap (Yellow)"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/caphat/formal/fedcover/eng
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_desc = "Engineering, Security, and Cargo"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
-/datum/gear/trekcapsec
+/datum/gear/head/trekcapsec
 	name = "Federation Officer's Cap (Red)"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/caphat/formal/fedcover/sec
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_desc = "Engineering, Security, and Cargo"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
 // orvilike "original" kepi
-/datum/gear/orvkepicom
+/datum/gear/head/orvkepicom
 	name = "Federation Kepi, command"
 	description = "A visored cap. Intended to be used with ORV uniform."
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/kepi/orvi/command
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_desc = "Heads of Staff"
 	restricted_roles = list("Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster")
 
-/datum/gear/orvkepiops
+/datum/gear/head/orvkepiops
 	name = "Federation Kepi, ops/sec"
 	description = "A visored cap. Intended to be used with ORV uniform."
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/kepi/orvi/engsec
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_desc = "Engineering, Security and Cargo"
 	restricted_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer", "Warden", "Detective", "Security Officer", "Head of Security", "Cargo Technician", "Shaft Miner", "Quartermaster")
 
-/datum/gear/orvkepimedsci
+/datum/gear/head/orvkepimedsci
 	name = "Federation Kepi, medsci"
 	description = "A visored cap. Intended to be used with ORV uniform."
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/kepi/orvi/medsci
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Virologist", "Paramedic", "Geneticist", "Research Director", "Scientist", "Roboticist")
 
-/datum/gear/orvkepisrv
+/datum/gear/head/orvkepisrv
 	name = "Federation Kepi, service"
 	description = "A visored cap. Intended to be used with ORV uniform."
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/kepi/orvi/service
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer"
 	restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain")
 
-/datum/gear/orvkepiass
+/datum/gear/head/orvkepiass
 	name = "Federation Kepi, assistant"
 	description = "A visored cap. Intended to be used with ORV uniform."
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/kepi/orvi
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_roles = list("Assistant")
 
 /*Commenting out Until next Christmas or made automatic
@@ -156,35 +146,37 @@
 */
 
 //Cowboy Stuff
-/datum/gear/cowboyhat
+/datum/gear/head/cowboyhat
 	name = "Cowboy Hat, Brown"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/cowboyhat
 
-/datum/gear/cowboyhat/black
+/datum/gear/head/cowboyhat/black
 	name = "Cowboy Hat, Black"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/cowboyhat/black
 
-/datum/gear/cowboyhat/white
+/datum/gear/head/cowboyhat/white
 	name = "Cowboy Hat, White"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/cowboyhat/white
 
-/datum/gear/cowboyhat/pink
+/datum/gear/head/cowboyhat/pink
 	name = "Cowboy Hat, Pink"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/cowboyhat/pink
 
-/datum/gear/cowboyhat/sec
+/datum/gear/head/cowboyhat/sec
 	name = "Cowboy Hat, Security"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/cowboyhat/sec
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
 	restricted_desc = "Security"
 	restricted_roles = list("Warden","Detective","Security Officer","Head of Security")
 
-// Misc
-/datum/gear/wkepi
+/datum/gear/head/wkepi
 	name = "white kepi"
-	category = SLOT_HEAD
 	path = /obj/item/clothing/head/kepi
+
+/datum/gear/head/widered
+	name = "Wide red hat"
+	path = /obj/item/clothing/head/widered
+
+/datum/gear/head/kabuto
+	name = "Kabuto helmet"
+	path = /obj/item/clothing/head/kabuto

modular_citadel/code/modules/client/loadout/mask.dm

@@ -1,16 +1,16 @@
-/datum/gear/balaclava
+/datum/gear/mask
+	category = LOADOUT_CATEGORY_MASK
+	slot = SLOT_WEAR_MASK
+
+/datum/gear/mask/balaclava
 	name = "Balaclava"
-	category = SLOT_WEAR_MASK
 	path = /obj/item/clothing/mask/balaclava
 
-/datum/gear/moustache
+/datum/gear/mask/moustache
 	name = "Fake moustache"
-	category = SLOT_WEAR_MASK
 	path = /obj/item/clothing/mask/fakemoustache
 
-/datum/gear/joy
+/datum/gear/mask/joy
 	name = "Joy mask"
-	category = SLOT_WEAR_MASK
 	path = /obj/item/clothing/mask/joy
 	cost = 3
-

modular_citadel/code/modules/client/loadout/neck.dm

@@ -1,99 +1,88 @@
-/datum/gear/bluetie
+/datum/gear/neck
+	category = LOADOUT_CATEGORY_NECK
+	subcategory = LOADOUT_SUBCATEGORY_NECK_GENERAL
+	slot = SLOT_NECK
+
+/datum/gear/neck/bluetie
 	name = "Blue tie"
-	category = SLOT_NECK
+	subcategory = LOADOUT_SUBCATEGORY_NECK_TIE
 	path = /obj/item/clothing/neck/tie/blue
 
-/datum/gear/redtie
+/datum/gear/neck/redtie
 	name = "Red tie"
-	category = SLOT_NECK
+	subcategory = LOADOUT_SUBCATEGORY_NECK_TIE
 	path = /obj/item/clothing/neck/tie/red
 
-/datum/gear/blacktie
+/datum/gear/neck/blacktie
 	name = "Black tie"
-	category = SLOT_NECK
+	subcategory = LOADOUT_SUBCATEGORY_NECK_TIE
 	path = /obj/item/clothing/neck/tie/black
 
-/datum/gear/collar
+/datum/gear/neck/collar
 	name = "Collar"
-	category = SLOT_NECK
 	path = /obj/item/clothing/neck/petcollar
 
-/datum/gear/leathercollar
+/datum/gear/neck/leathercollar
 	name = "Leather collar"
-	category = SLOT_NECK
 	path = /obj/item/clothing/neck/petcollar/leather
 
-/datum/gear/choker
+/datum/gear/neck/choker
 	name = "Choker"
-	category = SLOT_NECK
 	path = /obj/item/clothing/neck/petcollar/choker
 
-/datum/gear/scarf
+/datum/gear/neck/scarf
 	name = "White scarf"
-	category = SLOT_NECK
+	subcategory = LOADOUT_SUBCATEGORY_NECK_SCARVES
 	path = /obj/item/clothing/neck/scarf
 
-/datum/gear/blackscarf
+/datum/gear/neck/scarf/black
 	name = "Black scarf"
-	category = SLOT_NECK
 	path = /obj/item/clothing/neck/scarf/black
 
-/datum/gear/redscarf
+/datum/gear/neck/scarf/red
 	name = "Red scarf"
-	category = SLOT_NECK
 	path = /obj/item/clothing/neck/scarf/red
 
-/datum/gear/greenscarf
+/datum/gear/neck/scarf/green
 	name = "Green scarf"
-	category = SLOT_NECK
 	path = /obj/item/clothing/neck/scarf/green
 
-/datum/gear/darkbluescarf
+/datum/gear/neck/scarf/darkblue
 	name = "Dark blue scarf"
-	category = SLOT_NECK
 	path = /obj/item/clothing/neck/scarf/darkblue
 
-/datum/gear/purplescarf
+/datum/gear/neck/scarf/purple
 	name = "Purple scarf"
-	category = SLOT_NECK
 	path = /obj/item/clothing/neck/scarf/purple
 
-/datum/gear/yellowscarf
+/datum/gear/neck/scarf/yellow
 	name = "Yellow scarf"
-	category = SLOT_NECK
 	path = /obj/item/clothing/neck/scarf/yellow
 
-/datum/gear/orangescarf
+/datum/gear/neck/scarf/orange
 	name = "Orange scarf"
-	category = SLOT_NECK
 	path = /obj/item/clothing/neck/scarf/orange
 
-/datum/gear/cyanscarf
+/datum/gear/neck/scarf/cyan
 	name = "Cyan scarf"
-	category = SLOT_NECK
 	path = /obj/item/clothing/neck/scarf/cyan
 
-/datum/gear/stripedredscarf
+/datum/gear/neck/scarf/stripedred
 	name = "Striped red scarf"
-	category = SLOT_NECK
 	path = /obj/item/clothing/neck/stripedredscarf
 
-/datum/gear/stripedbluescarf
+/datum/gear/neck/scarf/stripedblue
 	name = "Striped blue scarf"
-	category = SLOT_NECK
 	path = /obj/item/clothing/neck/stripedbluescarf
 
-/datum/gear/stripedgreenscarf
+/datum/gear/neck/scarf/stripedgreen
 	name = "Striped green scarf"
-	category = SLOT_NECK
 	path = /obj/item/clothing/neck/stripedgreenscarf
 
-/datum/gear/headphones
+/datum/gear/neck/headphones
 	name = "Headphones"
-	category = SLOT_NECK
 	path = /obj/item/clothing/ears/headphones
 
-/datum/gear/polycloak
+/datum/gear/neck/polycloak
 	name = "Polychromatic Cloak"
-	category = SLOT_NECK
 	path = /obj/item/clothing/neck/cloak/polychromic

modular_citadel/code/modules/client/loadout/shoes.dm

@@ -1,84 +1,71 @@
-/datum/gear/laceup
+/datum/gear/shoes
+	category = LOADOUT_CATEGORY_SHOES
+	slot = SLOT_SHOES
+
+/datum/gear/shoes/laceup
 	name = "Laceup shoes"
-	category = SLOT_SHOES
 	path = /obj/item/clothing/shoes/laceup
 
-/datum/gear/workboots
+/datum/gear/shoes/workboots
 	name = "Work boots"
-	category = SLOT_SHOES
 	path = /obj/item/clothing/shoes/workboots
 
-/datum/gear/jackboots
+/datum/gear/shoes/jackboots
 	name = "Jackboots"
-	category = SLOT_SHOES
 	path = /obj/item/clothing/shoes/jackboots
 
-/datum/gear/winterboots
+/datum/gear/shoes/winterboots
 	name = "Winter boots"
-	category = SLOT_SHOES
 	path = /obj/item/clothing/shoes/winterboots
 
-/datum/gear/sandals
+/datum/gear/shoes/sandals
 	name = "Sandals"
-	category = SLOT_SHOES
 	path = /obj/item/clothing/shoes/sandal
 
-/datum/gear/blackshoes
+/datum/gear/shoes/blackshoes
 	name = "Black shoes"
-	category = SLOT_SHOES
 	path = /obj/item/clothing/shoes/sneakers/black
 
-/datum/gear/brownshoes
+/datum/gear/shoes/brownshoes
 	name = "Brown shoes"
-	category = SLOT_SHOES
 	path = /obj/item/clothing/shoes/sneakers/brown
 
-/datum/gear/whiteshoes
+/datum/gear/shoes/whiteshoes
 	name = "White shoes"
-	category = SLOT_SHOES
 	path = /obj/item/clothing/shoes/sneakers/white
 
-/datum/gear/gildedcuffs
+/datum/gear/shoes/gildedcuffs
 	name = "Gilded leg wraps"
-	category = SLOT_SHOES
 	path= /obj/item/clothing/shoes/wraps
 
-/datum/gear/silvercuffs
+/datum/gear/shoes/silvercuffs
 	name = "Silver leg wraps"
-	category = SLOT_SHOES
 	path= /obj/item/clothing/shoes/wraps/silver
 
-/datum/gear/redcuffs
+/datum/gear/shoes/redcuffs
 	name = "Red leg wraps"
-	category = SLOT_SHOES
 	path= /obj/item/clothing/shoes/wraps/red
 
-/datum/gear/bluecuffs
+/datum/gear/shoes/bluecuffs
 	name = "Blue leg wraps"
-	category = SLOT_SHOES
 	path= /obj/item/clothing/shoes/wraps/blue
 
-/datum/gear/christmasbootsr
+/datum/gear/shoes/christmasbootsr
 	name = "Red Christmas Boots"
-	category = SLOT_SHOES
 	path= /obj/item/clothing/shoes/winterboots/christmasbootsr
 
-/datum/gear/christmasbootsg
+/datum/gear/shoes/christmasbootsg
 	name = "Green Christmas Boots"
-	category = SLOT_SHOES
 	path= /obj/item/clothing/shoes/winterboots/christmasbootsg
 
-/datum/gear/santaboots
+/datum/gear/shoes/santaboots
 	name = "Santa Boots"
-	category = SLOT_SHOES
 	path= /obj/item/clothing/shoes/winterboots/santaboots
 
-/datum/gear/cowboyboots
+/datum/gear/shoes/cowboyboots
 	name = "Cowboy Boots, Brown"
-	category = SLOT_SHOES
 	path = /obj/item/clothing/shoes/cowboyboots
 
-/datum/gear/cowboyboots/black
+/datum/gear/shoes/cowboyboots/black
 	name = "Cowboy Boots, Black"
-	category = SLOT_SHOES
-	path = /obj/item/clothing/shoes/cowboyboots/black
+	path = /obj/item/clothing/shoes/cowboyboots/black

modular_citadel/code/modules/client/loadout/suit.dm

@@ -1,261 +1,250 @@
-/datum/gear/poncho
+/datum/gear/suit
+	category = LOADOUT_CATEGORY_SUIT
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_GENERAL
+	slot = SLOT_WEAR_SUIT
+
+/datum/gear/suit/poncho
 	name = "Poncho"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/poncho
 
-/datum/gear/ponchogreen
+/datum/gear/suit/ponchogreen
 	name = "Green poncho"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/poncho/green
 
-/datum/gear/ponchored
+/datum/gear/suit/ponchored
 	name = "Red poncho"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/poncho/red
 
-/datum/gear/redhood
+/datum/gear/suit/redhood
 	name = "Red cloak"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/cloak/david
 	cost = 3
 
-/datum/gear/jacketbomber
+/datum/gear/suit/jacketbomber
 	name = "Bomber jacket"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/jacket
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
-/datum/gear/jacketflannelblack // all of these are reskins of bomber jackets but with the vibe to make you look like a true lumberjack
+/datum/gear/suit/jacketflannelblack // all of these are reskins of bomber jackets but with the vibe to make you look like a true lumberjack
 	name = "Black flannel jacket"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/jacket/flannel
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
-/datum/gear/jacketflannelred
+/datum/gear/suit/jacketflannelred
 	name = "Red flannel jacket"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/jacket/flannel/red
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
-/datum/gear/jacketflannelaqua
+/datum/gear/suit/jacketflannelaqua
 	name = "Aqua flannel jacket"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/jacket/flannel/aqua
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
-/datum/gear/jacketflannelbrown
+/datum/gear/suit/jacketflannelbrown
 	name = "Brown flannel jacket"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/jacket/flannel/brown
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
-/datum/gear/jacketleather
+/datum/gear/suit/jacketleather
 	name = "Leather jacket"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/jacket/leather
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
-/datum/gear/overcoatleather
+/datum/gear/suit/overcoatleather
 	name = "Leather overcoat"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/jacket/leather/overcoat
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
-/datum/gear/jacketpuffer
+/datum/gear/suit/jacketpuffer
 	name = "Puffer jacket"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/jacket/puffer
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
-/datum/gear/vestpuffer
+/datum/gear/suit/vestpuffer
 	name = "Puffer vest"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/jacket/puffer/vest
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
-/datum/gear/jacketlettermanbrown
+/datum/gear/suit/jacketlettermanbrown
 	name = "Brown letterman jacket"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/jacket/letterman
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
-/datum/gear/jacketlettermanred
+/datum/gear/suit/jacketlettermanred
 	name = "Red letterman jacket"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/jacket/letterman_red
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
-/datum/gear/jacketlettermanNT
+/datum/gear/suit/jacketlettermanNT
 	name = "Nanotrasen letterman jacket"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/jacket/letterman_nanotrasen
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
-/datum/gear/coat
+/datum/gear/suit/coat
 	name = "Winter coat"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/wintercoat
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_COATS
 
-/datum/gear/coat/aformal
+/datum/gear/suit/coat/aformal
 	name = "Assistant's formal winter coat"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/wintercoat/aformal
 
-/datum/gear/coat/runed
+/datum/gear/suit/coat/runed
 	name = "Runed winter coat"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/wintercoat/narsie/fake
 
-/datum/gear/coat/brass
+/datum/gear/suit/coat/brass
 	name = "Brass winter coat"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/wintercoat/ratvar/fake
 
-/datum/gear/coat/polycoat
+/datum/gear/suit/coat/polycoat
 	name = "Polychromic winter coat"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/wintercoat/polychromic
 	cost = 4 //too many people with neon green coats is hard on the eyes
 
-/datum/gear/coat/med
+/datum/gear/suit/coat/med
 	name = "Medical winter coat"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/wintercoat/medical
 	restricted_roles = list("Chief Medical Officer", "Medical Doctor") // Reserve it to Medical Doctors and their boss, the Chief Medical Officer
 
-/datum/gear/coat/paramedic
+/datum/gear/suit/coat/paramedic
 	name = "Paramedic winter coat"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/wintercoat/paramedic
 	restricted_roles = list("Chief Medical Officer", "Paramedic") // Reserve it to Paramedics and their boss, the Chief Medical Officer
 
-/datum/gear/coat/robotics
+/datum/gear/suit/coat/robotics
 	name = "Robotics winter coat"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/wintercoat/robotics
 	restricted_roles = list("Research Director", "Roboticist")
 
-/datum/gear/coat/sci
+/datum/gear/suit/coat/sci
 	name = "Science winter coat"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/wintercoat/science
 	restricted_roles = list("Research Director", "Scientist", "Roboticist") // Reserve it to the Science Departement
 
-/datum/gear/coat/eng
+/datum/gear/suit/coat/eng
 	name = "Engineering winter coat"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/wintercoat/engineering
 	restricted_roles = list("Chief Engineer", "Station Engineer") // Reserve it to Station Engineers and their boss, the Chief Engineer
 
-/datum/gear/coat/eng/atmos
+/datum/gear/suit/coat/eng/atmos
 	name = "Atmospherics winter coat"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos
 	restricted_roles = list("Chief Engineer", "Atmospheric Technician") // Reserve it to Atmos Techs and their boss, the Chief Engineer
 
-/datum/gear/coat/hydro
+/datum/gear/suit/coat/hydro
 	name = "Hydroponics winter coat"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/wintercoat/hydro
 	restricted_roles = list("Head of Personnel", "Botanist") // Reserve it to Botanists and their boss, the Head of Personnel
 
-/datum/gear/coat/bar
+/datum/gear/suit/coat/bar
 	name = "Bar winter coat"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/wintercoat/bar
 	restricted_roles = list("Bartender") // Reserve it to Bartenders and not the Head of Personnel because he doesnt deserve to look as fancy as them
 
-/datum/gear/coat/cargo
+/datum/gear/suit/coat/cargo
 	name = "Cargo winter coat"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/wintercoat/cargo
 	restricted_roles = list("Quartermaster", "Cargo Technician") // Reserve it to Cargo Techs and their boss, the Quartermaster
 
-/datum/gear/coat/miner
+/datum/gear/suit/coat/miner
 	name = "Mining winter coat"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/wintercoat/miner
 	restricted_roles = list("Quartermaster", "Shaft Miner") // Reserve it to Miners and their boss, the Quartermaster
 
-/datum/gear/militaryjacket
+/datum/gear/suit/militaryjacket
 	name = "Military Jacket"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/jacket/miljacket
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 
-/datum/gear/ianshirt
+/datum/gear/suit/ianshirt
 	name = "Ian Shirt"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/ianshirt
 
-/datum/gear/flakjack
+/datum/gear/suit/flakjack
 	name = "Flak Jacket"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/flakjack
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
 	cost = 2
 
-/datum/gear/trekds9_coat
+/datum/gear/suit/trekds9_coat
 	name = "DS9 Overcoat (use uniform)"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/storage/trek/ds9
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
 	restricted_desc = "All, barring Service and Civilian"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster",
 							"Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Scientist", "Roboticist",
 							"Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer",
 							"Cargo Technician", "Shaft Miner") //everyone who actually deserves a job.
 //Federation jackets from movies
-/datum/gear/trekcmdcap
+/datum/gear/suit/trekcmdcap
 	name = "Fed (movie) uniform, Black"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/storage/fluff/fedcoat/capt
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
 	restricted_roles = list("Captain","Head of Personnel")
 
-/datum/gear/trekcmdmov
+/datum/gear/suit/trekcmdmov
 	name = "Fed (movie) uniform, Red"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/storage/fluff/fedcoat
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
 	restricted_desc = "Heads of Staff and Security"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster","Warden","Detective","Security Officer")
 
-/datum/gear/trekmedscimov
+/datum/gear/suit/trekmedscimov
 	name = "Fed (movie) uniform, Blue"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/storage/fluff/fedcoat/medsci
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
 
-/datum/gear/trekengmov
+/datum/gear/suit/trekengmov
 	name = "Fed (movie) uniform, Yellow"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/storage/fluff/fedcoat/eng
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
 	restricted_desc = "Engineering and Cargo"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Cargo Technician", "Shaft Miner", "Quartermaster")
 
-/datum/gear/trekcmdcapmod
+/datum/gear/suit/trekcmdcapmod
 	name = "Fed (Modern) uniform, White"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/storage/fluff/modernfedcoat
 	restricted_roles = list("Captain","Head of Personnel")
 
-/datum/gear/trekcmdmod
+/datum/gear/suit/trekcmdmod
 	name = "Fed (Modern) uniform, Red"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/storage/fluff/modernfedcoat/sec
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
 	restricted_desc = "Heads of Staff and Security"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster","Warden","Detective","Security Officer")
 
-/datum/gear/trekmedscimod
+/datum/gear/suit/trekmedscimod
 	name = "Fed (Modern) uniform, Blue"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/storage/fluff/modernfedcoat/medsci
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
 
-/datum/gear/trekengmod
+/datum/gear/suit/trekengmod
 	name = "Fed (Modern) uniform, Yellow"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/storage/fluff/modernfedcoat/eng
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_JOBS
 	restricted_desc = "Engineering and Cargo"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Cargo Technician", "Shaft Miner", "Quartermaster")
 
-/datum/gear/christmascoatr
+/datum/gear/suit/christmascoatr
 	name = "Red Christmas Coat"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/wintercoat/christmascoatr
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_COATS
 
-/datum/gear/christmascoatg
+/datum/gear/suit/christmascoatg
 	name = "Green Christmas Coat"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/wintercoat/christmascoatg
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_COATS
 
-/datum/gear/christmascoatrg
+/datum/gear/suit/christmascoatrg
 	name = "Red and Green Christmas Coat"
-	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/hooded/wintercoat/christmascoatrg
+	subcategory = LOADOUT_SUBCATEGORY_SUIT_COATS
+
+/datum/gear/suit/samurai
+	name = "Samurai outfit"
+	path = /obj/item/clothing/suit/samurai

modular_citadel/code/modules/client/loadout/uniform.dm

@@ -1,562 +1,542 @@
-/datum/gear/suitblack
-	name = "Black suit"
-	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/suit/black
+/datum/gear/uniform
+	category = LOADOUT_CATEGORY_UNIFORM
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_GENERAL
+	slot = SLOT_W_UNIFORM
 
-/datum/gear/suitgreen
+/datum/gear/uniform/suit
+	name = "Black suit"
+	path = /obj/item/clothing/under/suit/black
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SUITS
+
+/datum/gear/uniform/suit/green
 	name = "Green suit"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/suit/green
 
-/datum/gear/suitred
+/datum/gear/uniform/suit/red
 	name = "Red suit"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/suit/red
 
-/datum/gear/suitcharcoal
+/datum/gear/uniform/suit/charcoal
 	name = "Charcoal suit"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/suit/charcoal
 
-/datum/gear/suitnavy
+/datum/gear/uniform/suit/navy
 	name = "Navy suit"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/suit/navy
 
-/datum/gear/suitburgundy
+/datum/gear/uniform/suit/burgundy
 	name = "Burgundy suit"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/suit/burgundy
 
-/datum/gear/suittan
+/datum/gear/uniform/suit/tan
 	name = "Tan suit"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/suit/tan
 
-/datum/gear/suitwhite
+/datum/gear/uniform/suit/white
 	name = "White suit"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/suit/white
 
-/datum/gear/assistantformal
+/datum/gear/uniform/assistantformal
 	name = "Assistant's formal uniform"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/misc/assistantformal
 
-/datum/gear/maidcostume
+/datum/gear/uniform/maidcostume
 	name = "Maid costume"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/costume/maid
 
-/datum/gear/mailmanuniform
+/datum/gear/uniform/mailmanuniform
 	name = "Mailman's jumpsuit"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/misc/mailman
 
-/datum/gear/skirtblack
+/datum/gear/uniform/skirt
 	name = "Black skirt"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/dress/skirt
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS
 
-/datum/gear/skirtblue
+/datum/gear/uniform/skirt/blue
 	name = "Blue skirt"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/dress/skirt/blue
 
-/datum/gear/skirtred
+/datum/gear/uniform/skirt/red
 	name = "Red skirt"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/dress/skirt/red
 
-/datum/gear/skirtpurple
+/datum/gear/uniform/skirt/purple
 	name = "Purple skirt"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/dress/skirt/purple
 
-/datum/gear/skirtplaid
+/datum/gear/uniform/skirt/plaid
 	name = "Plaid skirt"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/dress/skirt/plaid
 
-/datum/gear/schoolgirlblue
+/datum/gear/uniform/schoolgirlblue
 	name = "Blue Schoolgirl Uniform"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/costume/schoolgirl
 
-/datum/gear/schoolgirlred
+/datum/gear/uniform/schoolgirlred
 	name = "Red Schoolgirl Uniform"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/costume/schoolgirl/red
 
-/datum/gear/schoolgirlgreen
+/datum/gear/uniform/schoolgirlgreen
 	name = "Green Schoolgirl Uniform"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/costume/schoolgirl/green
 
-/datum/gear/schoolgirlorange
+/datum/gear/uniform/schoolgirlorange
 	name = "Orange Schoolgirl Uniform"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/costume/schoolgirl/orange
 
-/datum/gear/stripeddress
+/datum/gear/uniform/dress
 	name = "Striped Dress"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/dress/striped
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES
 
-/datum/gear/sundresswhite
+/datum/gear/uniform/dress/sun/white
 	name = "White Sundress"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/dress/sundress/white
 
-/datum/gear/sundress
+/datum/gear/uniform/dress/sun
 	name = "Sundress"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/dress/sundress
 
-/datum/gear/greendress
+/datum/gear/uniform/dress/green
 	name = "Green Dress"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/dress/green
 
-/datum/gear/pinkdress
+/datum/gear/uniform/dress/pink
 	name = "Pink Dress"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/dress/pink
-/datum/gear/flowerdress
+
+/datum/gear/uniform/dress/orange
 	name = "Flower Dress"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/dress/flower
 
-/datum/gear/sweptskirt
+/datum/gear/uniform/skirt/swept
 	name = "Swept skirt"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/dress/skirt/swept
 
-/datum/gear/croptop
+/datum/gear/uniform/croptop
 	name = "Croptop"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/croptop
 
-/datum/gear/yoga
+/datum/gear/uniform/pants
 	name = "Yoga Pants"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/pants/yoga
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_PANTS
 
-/datum/gear/kilt
+/datum/gear/uniform/kilt
 	name = "Kilt"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/costume/kilt
 
-/datum/gear/camoshorts
+/datum/gear/uniform/pants/camo
 	name = "Camo Pants"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/pants/camo
 
-/datum/gear/athleticshorts
+/datum/gear/uniform/shorts
 	name = "Athletic Shorts"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/shorts/red
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SHORTS
 
-/datum/gear/bjeans
+/datum/gear/uniform/pants/bjeans
 	name = "Black Jeans"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/pants/blackjeans
 
-/datum/gear/cjeans
+/datum/gear/uniform/pants/cjeans
 	name = "Classic Jeans"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/pants/classicjeans
 
-/datum/gear/khaki
+/datum/gear/uniform/pants/khaki
 	name = "Khaki Pants"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/pants/khaki
 
-/datum/gear/wpants
+/datum/gear/uniform/pants/white
 	name = "White Pants"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/pants/white
 
-/datum/gear/rpants
+/datum/gear/uniform/pants/red
 	name = "Red Pants"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/pants/red
 
-/datum/gear/tpants
+/datum/gear/uniform/pants/tan
 	name = "Tan Pants"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/pants/tan
 
-/datum/gear/trpants
+/datum/gear/uniform/pants/track
 	name = "Track Pants"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/pants/track
 
-/datum/gear/rippedjeans
+/datum/gear/uniform/pants/ripped
 	name = "Ripped Jeans"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/pants/jeanripped
 
-/datum/gear/jeanshort
+/datum/gear/uniform/shorts/jean
 	name = "Jean Shorts"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/pants/jeanshort
 
-/datum/gear/denimskirt
+/datum/gear/uniform/skirt/denim
 	name = "Denim Skirt"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/pants/denimskirt
 
-/datum/gear/yoga
-	name = "Yoga Pants"
-	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/pants/yoga
-
 // Pantsless Sweaters
 
-/datum/gear/turtleneck
+/datum/gear/uniform/turtleneck
 	name = "Tactitool Turtleneck"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/syndicate/cosmetic
 
-/datum/gear/creamsweater
+/datum/gear/uniform/sweater
 	name = "Cream Commando Sweater"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/sweater
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SWEATERS
 
-/datum/gear/blacksweater
+/datum/gear/uniform/sweater/black
 	name = "Black Commando Sweater"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/sweater/black
 
-/datum/gear/purpsweater
+/datum/gear/uniform/sweater/purple
 	name = "Purple Commando Sweater"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/sweater/purple
 
-/datum/gear/greensweater
+/datum/gear/uniform/sweater/green
 	name = "Green Commando Sweater"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/sweater/green
 
-/datum/gear/redsweater
+/datum/gear/uniform/sweater/red
 	name = "Red Commando Sweater"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/sweater/red
 
-/datum/gear/bluesweater
+/datum/gear/uniform/sweater/blue
 	name =  "Navy Commando Sweater"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/sweater/blue
 
-/datum/gear/keyholesweater
+/datum/gear/uniform/sweater/keyhole
 	name =  "Keyhole Sweater"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/misc/keyholesweater
 
-/datum/gear/polyjump
+/datum/gear/uniform/polyjump
 	name = "Polychromic Jumpsuit"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/misc/polyjumpsuit
 	cost = 2
-	
-/datum/gear/polyskirt
+
+/datum/gear/uniform/skirt/poly
 	name = "Polychromic Jumpskirt"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/dress/skirt/polychromic
 	cost = 2
 
-/datum/gear/polysuit
+/datum/gear/uniform/suit/poly
 	name = "Polychromic Button-up Shirt"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/misc/poly_shirt
 	cost = 3
-	
-/datum/gear/polypleated
+
+/datum/gear/uniform/skirt/poly/pleated
 	name = "Polychromic Pleated Sweaterskirt"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/dress/skirt/polychromic/pleated
 	cost = 3
 
-/datum/gear/polykilt
+/datum/gear/uniform/polykilt
 	name = "Polychromic Kilt"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/costume/kilt/polychromic
 	cost = 3
 
-/datum/gear/polyshorts
+/datum/gear/uniform/shorts/poly
 	name = "Polychromic Shorts"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/misc/polyshorts
 	cost = 3
 
-/datum/gear/polyshortpants
+/datum/gear/uniform/shorts/poly/athletic
 	name = "Polychromic Athletic Shorts"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/shorts/polychromic
 	cost = 2
 
 // Trekie things
 //TOS
-/datum/gear/trekcmdtos
+/datum/gear/uniform/trekcmdtos
 	name = "TOS uniform, cmd"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/command
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Heads of Staff"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
 
-/datum/gear/trekmedscitos
+/datum/gear/uniform/trekmedscitos
 	name = "TOS uniform, med/sci"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/medsci
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
 
-/datum/gear/trekengtos
+/datum/gear/uniform/trekengtos
 	name = "TOS uniform, ops/sec"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/engsec
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Engineering, Security, and Cargo"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
 //TNG
-/datum/gear/trekcmdtng
+/datum/gear/uniform/trekcmdtng
 	name = "TNG uniform, cmd"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/command/next
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Heads of Staff"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
 
-/datum/gear/trekmedscitng
+/datum/gear/uniform/trekmedscitng
 	name = "TNG uniform, med/sci"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/medsci/next
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
 
-/datum/gear/trekengtng
+/datum/gear/uniform/trekengtng
 	name = "TNG uniform, ops/sec"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/engsec/next
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Engineering, Security, and Cargo"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
 //VOY
-/datum/gear/trekcmdvoy
+/datum/gear/uniform/trekcmdvoy
 	name = "VOY uniform, cmd"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/command/voy
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Heads of Staff"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
 
-/datum/gear/trekmedscivoy
+/datum/gear/uniform/trekmedscivoy
 	name = "VOY uniform, med/sci"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/medsci/voy
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
 
-/datum/gear/trekengvoy
+/datum/gear/uniform/trekengvoy
 	name = "VOY uniform, ops/sec"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/engsec/voy
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Engineering, Security, and Cargo"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
 //DS9
-/datum/gear/trekcmdds9
+/datum/gear/uniform/trekcmdds9
 	name = "DS9 uniform, cmd"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/command/ds9
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Heads of Staff"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
 
-/datum/gear/trekmedscids9
+/datum/gear/uniform/trekmedscids9
 	name = "DS9 uniform, med/sci"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/medsci/ds9
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
 
-/datum/gear/trekengds9
+/datum/gear/uniform/trekengds9
 	name = "DS9 uniform, ops/sec"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/engsec/ds9
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Engineering, Security, and Cargo"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
 //ENT
-/datum/gear/trekcmdent
+/datum/gear/uniform/trekcmdent
 	name = "ENT uniform, cmd"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/command/ent
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Heads of Staff"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
 
-/datum/gear/trekmedscient
+/datum/gear/uniform/trekmedscient
 	name = "ENT uniform, med/sci"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/medsci/ent
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
 
-/datum/gear/trekengent
+/datum/gear/uniform/trekengent
 	name = "ENT uniform, ops/sec"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/engsec/ent
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Engineering, Security, and Cargo"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
 //TheMotionPicture
-/datum/gear/trekfedutil
+/datum/gear/uniform/trekfedutil
 	name = "TMP uniform"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/fedutil
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "All, barring Service and Civilian"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster",
 							"Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Scientist", "Roboticist",
 							"Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer",
 							"Cargo Technician", "Shaft Miner")
 
-/datum/gear/trekfedtrainee
+/datum/gear/uniform/trekfedtrainee
 	name = "TMP uniform, trainee"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/fedutil/trainee
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_roles = list("Assistant", "Janitor", "Cargo Technician")
 
-/datum/gear/trekfedservice
+/datum/gear/uniform/trekfedservice
 	name = "TMP uniform, service"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/fedutil/service
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer"
 	restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain")
 
 //Orvilike
-/datum/gear/orvcmd
+/datum/gear/uniform/orvcmd
 	name = "ORV uniform, cmd"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/command/orv
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Heads of Staff"
 	restricted_roles = list("Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster")
 
-/datum/gear/orvcmd_capt
+/datum/gear/uniform/orvcmd_capt
 	name = "ORV uniform, capt"
-	category = SLOT_W_UNIFORM
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	path = /obj/item/clothing/under/trek/command/orv/captain
 	restricted_roles = list("Captain")
 
-/datum/gear/orvmedsci
+/datum/gear/uniform/orvmedsci
 	name = "ORV uniform, med/sci"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/medsci/orv
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Virologist", "Paramedic", "Geneticist", "Research Director", "Scientist", "Roboticist")
 
-/datum/gear/orvcmd_medsci
+/datum/gear/uniform/orvcmd_medsci
 	name = "ORV uniform, med/sci, cmd"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/command/orv/medsci
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_roles = list("Chief Medical Officer", "Research Director")
 
-/datum/gear/orvops
+/datum/gear/uniform/orvops
 	name = "ORV uniform, ops/sec"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/engsec/orv
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_desc = "Engineering, Security and Cargo"
 	restricted_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer", "Warden", "Detective", "Security Officer", "Head of Security", "Cargo Technician", "Shaft Miner", "Quartermaster")
 
-/datum/gear/orvcmd_ops
+/datum/gear/uniform/orvcmd_ops
 	name = "ORV uniform, ops/sec, cmd"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/command/orv/engsec
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_roles = list("Chief Engineer", "Head of Security")
 
-/datum/gear/orvass
+/datum/gear/uniform/orvass
 	name = "ORV uniform, assistant"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/orv
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_roles = list("Assistant")
 
-/datum/gear/orvsrv
+/datum/gear/uniform/orvsrv
 	name = "ORV uniform, service"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/trek/orv/service
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain")
 	restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer"
 
 //Memes
-/datum/gear/gear_harnesses
+/datum/gear/uniform/gear_harnesses
 	name = "Gear Harness"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/misc/gear_harness
 
 //Christmas
 /*Commenting out Until next Christmas or made automatic
-/datum/gear/christmasmaler
+/datum/gear/uniform/christmasmaler
 	name = "Red Masculine Christmas Suit"
 	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/costume/christmas
 
-/datum/gear/christmasmaleg
+/datum/gear/uniform/christmasmaleg
 	name = "Green Masculine Christmas Suit"
 	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/costume/christmas/green
 
-/datum/gear/christmasfemaler
+/datum/gear/uniform/christmasfemaler
 	name = "Red Feminine Christmas Suit"
 	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/costume/christmas/croptop
 
-/datum/gear/christmasfemaleg
+/datum/gear/uniform/christmasfemaleg
 	name = "Green Feminine Christmas Suit"
 	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/costume/christmas/croptop/green
 
-/datum/gear/pinkstripper
+/datum/gear/uniform/pinkstripper
 	name = "Pink stripper outfit"
 	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/misc/stripper
 	cost = 3
 */
 
-/datum/gear/greenstripper
+/datum/gear/uniform/greenstripper
 	name = "Green stripper outfit"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/misc/stripper/green
 	cost = 3
 
-/datum/gear/qipao
+/datum/gear/uniform/qipao
 	name = "Qipao, Black"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/costume/qipao
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES
 	cost = 3
 
-/datum/gear/qipao/white
+/datum/gear/uniform/qipao/white
 	name = "Qipao, White"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/costume/qipao/white
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES
 	cost = 3
 
-/datum/gear/qipao/red
+/datum/gear/uniform/qipao/red
 	name = "Qipao, Red"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/costume/qipao/red
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES
 	cost = 3
 
-/datum/gear/cheongsam
+/datum/gear/uniform/cheongsam
 	name = "Cheongsam, Black"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/costume/cheongsam
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES
 	cost = 3
 
-/datum/gear/cheongsam/white
+/datum/gear/uniform/cheongsam/white
 	name = "Cheongsam, White"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/costume/cheongsam/white
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES
 	cost = 3
 
-/datum/gear/cheongsam/red
+/datum/gear/uniform/cheongsam/red
 	name = "Cheongsam, Red"
-	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/costume/cheongsam/red
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES
 	cost = 3
+
+/datum/gear/uniform/dress/black
+	name = "Black dress"
+	path = /obj/item/clothing/under/misc/black_dress
+
+/datum/gear/uniform/skirt/pinktutu
+	name = "Pink tutu"
+	path = /obj/item/clothing/under/misc/pinktutu
+
+/datum/gear/uniform/bathrobe
+	name = "Bathrobe"
+	path = /obj/item/clothing/under/misc/bathrobe
+
+/datum/gear/uniform/kimono
+	name = "Kimono"
+	path = /obj/item/clothing/under/costume/kimono
+
+/datum/gear/uniform/kimono/black
+	name = "Black kimono"
+	path = /obj/item/clothing/under/costume/kimono/black
+
+/datum/gear/uniform/kimono/kamishimo
+	name = "Kamishimo"
+	path = /obj/item/clothing/under/costume/kimono/kamishimo
+
+/datum/gear/uniform/kimono/fancy
+	name = "Fancy kimono"
+	path = /obj/item/clothing/under/costume/kimono/fancy
+
+/datum/gear/uniform/kimono/sakura
+	name = "Sakura kimono"
+	path = /obj/item/clothing/under/costume/kimono/sakura

modular_citadel/code/modules/custom_loadout/custom_items.dm

@@ -1,26 +1,8 @@
-
 //For custom items.
 
 // Unless there's a digitigrade version make sure you add mutantrace_variation = NONE to all clothing/under and shoes - Pooj
 // Digitigrade stuff is uniform_digi.dmi and digishoes.dmi in icons/mob
 
-/obj/item/custom/ceb_soap
-	name = "Cebutris' Soap"
-	desc = "A generic bar of soap that doesn't really seem to work right."
-	gender = PLURAL
-	icon = 'icons/obj/custom.dmi'
-	icon_state = "cebu"
-	w_class = WEIGHT_CLASS_TINY
-	item_flags = NOBLUDGEON
-
-/obj/item/soap/cebu //real versions, for admin shenanigans. Adminspawn only
-	desc = "A bright blue bar of soap that smells of wolves"
-	icon = 'icons/obj/custom.dmi'
-	icon_state = "cebu"
-
-/obj/item/soap/cebu/fast //speedyquick cleaning version. Still not as fast as Syndiesoap. Adminspawn only.
-	cleanspeed = 15
-
 /obj/item/clothing/neck/cloak/inferno
 	name = "Kiara's Cloak"
 	desc = "The design on this seems a little too familiar."
@@ -316,7 +298,7 @@
 
 /obj/item/clothing/neck/petcollar/naomi
 	name = "worn pet collar"
-	desc = "a pet collar that looks well used."
+	desc = "A pet collar that looks well used."
 
 /obj/item/clothing/neck/cloak/green
 	name = "Generic Green Cloak"
@@ -568,3 +550,11 @@
 	desc = "A fancy cloak embroidered with polychromatic thread in a pattern that reminds one of the wielders of unlimited power."
 	icon_state = "polyce"
 	poly_colors = list("#808080", "#8CC6FF", "#FF3535")
+
+/obj/item/clothing/head/halo
+	name = "transdimensional halo"
+	desc = "An oddly shaped halo that magically hovers above the head."
+	icon_state = "halo"
+	item_state = "halo"
+	icon = 'icons/obj/custom.dmi'
+	mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'

modular_citadel/code/modules/mentor/mentorsay.dm

@@ -13,7 +13,7 @@
 	log_mentor("MSAY: [key_name(src)] : [msg]")
 
 	if(check_rights_for(src, R_ADMIN,0))
-		msg = "<b><font color ='#8A2BE2'><span class='prefix'>MENTOR:</span> <EM>[key_name(src, 0, 0)]</EM>: <span class='message'>[msg]</span></font></b>"
+		msg = "<span class='mentorsay_admin filter_MSAY'><span class='prefix'>MENTOR:</span> <EM>[key_name(src, 0, 0)]</EM>: <span class='message'>[msg]</span></span>"
 	else
-		msg = "<b><font color ='#E236D8'><span class='prefix'>MENTOR:</span> <EM>[key_name(src, 0, 0)]</EM>: <span class='message'>[msg]</span></font></b>"
-	to_chat(GLOB.admins | GLOB.mentors, msg)
+		msg = "<span class='mentorsay filter_MSAY'><span class='prefix'>MENTOR:</span> <EM>[key_name(src, 0, 0)]</EM>: <span class='message'>[msg]</span></span>"
+	to_chat(GLOB.admins | GLOB.mentors, msg, confidential = TRUE)

modular_citadel/code/modules/mob/cit_emotes.dm

@@ -3,10 +3,6 @@
 /mob
 	var/nextsoundemote = 1
 
-//Disables the custom emote blacklist from TG that normally applies to slimes.
-/datum/emote/living/custom
-	mob_type_blacklist_typecache = list(/mob/living/brain)
-
 /datum/emote/living/insult
 	key = "insult"
 	key_third_person = "insults"
@@ -74,7 +70,6 @@
 	emote_type = EMOTE_AUDIBLE
 	muzzle_ignore = TRUE
 	restraint_check = TRUE
-	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/snap/run_emote(mob/living/user, params)
 	if(!(. = ..()))
@@ -91,7 +86,6 @@
 	emote_type = EMOTE_AUDIBLE
 	muzzle_ignore = TRUE
 	restraint_check = TRUE
-	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/snap2/run_emote(mob/living/user, params)
 	if(!(. = ..()))
@@ -108,7 +102,6 @@
 	emote_type = EMOTE_AUDIBLE
 	muzzle_ignore = TRUE
 	restraint_check = TRUE
-	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/snap3/run_emote(mob/living/user, params)
 	if(!(. = ..()))
@@ -125,7 +118,6 @@
 	emote_type = EMOTE_AUDIBLE
 	muzzle_ignore = FALSE
 	restraint_check = FALSE
-	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/awoo/run_emote(mob/living/user, params)
 	if(!(. = ..()))
@@ -142,7 +134,6 @@
 	emote_type = EMOTE_AUDIBLE
 	muzzle_ignore = FALSE
 	restraint_check = FALSE
-	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/nya/run_emote(mob/living/user, params)
 	if(!(. = ..()))
@@ -159,7 +150,6 @@
 	emote_type = EMOTE_AUDIBLE
 	muzzle_ignore = FALSE
 	restraint_check = FALSE
-	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/weh/run_emote(mob/living/user, params)
 	if(!(. = ..()))
@@ -176,7 +166,6 @@
 	emote_type = EMOTE_AUDIBLE
 	muzzle_ignore = FALSE
 	restraint_check = FALSE
-	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/peep/run_emote(mob/living/user, params)
 	if(!(. = ..()))
@@ -200,7 +189,6 @@
 	emote_type = EMOTE_AUDIBLE
 	muzzle_ignore = FALSE
 	restraint_check = FALSE
-	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/mothsqueak/run_emote(mob/living/user, params)
 	if(!(. = ..()))
@@ -217,7 +205,6 @@
 	emote_type = EMOTE_AUDIBLE
 	muzzle_ignore = FALSE
 	restraint_check = FALSE
-	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/merp/run_emote(mob/living/user, params)
 	if(!(. = ..()))
@@ -234,7 +221,6 @@
 	emote_type = EMOTE_AUDIBLE
 	muzzle_ignore = FALSE
 	restraint_check = FALSE
-	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/bark/run_emote(mob/living/user, params)
 	if(!(. = ..()))
@@ -252,7 +238,6 @@
 	emote_type = EMOTE_AUDIBLE
 	muzzle_ignore = FALSE
 	restraint_check = FALSE
-	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/squish/run_emote(mob/living/user, params)
 	if(!(. = ..()))

modular_citadel/code/modules/projectiles/guns/ballistic/handguns.dm

@@ -16,13 +16,12 @@
 	spread = 20
 	actions_types = list()
 
-/obj/item/gun/ballistic/automatic/toy/pistol/stealth/update_icon()
-	..()
+/obj/item/gun/ballistic/automatic/toy/pistol/stealth/update_overlays()
+	. = ..()
 	if(magazine)
-		cut_overlays()
-		add_overlay("foamsp-magazine")
-	else
-		cut_overlays()
+		. += "foamsp-magazine"
+
+/obj/item/gun/ballistic/automatic/toy/pistol/stealth/update_icon_state()
 	icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
 
 /////////RAYGUN MEMES/////////

modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm

@@ -155,11 +155,15 @@
 	casing_ejector = 0
 	spread = 10
 	recoil = 0.05
+	automatic_burst_overlay = FALSE
+	var/magtype = "flechettegun"
 
-/obj/item/gun/ballistic/automatic/flechette/update_icon()
-	cut_overlays()
+/obj/item/gun/ballistic/automatic/flechette/update_overlays()
+	. = ..()
 	if(magazine)
-		add_overlay("flechettegun-magazine")
+		. += "[magtype]-magazine"
+
+/obj/item/gun/ballistic/automatic/flechette/update_icon_state()
 	icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
 
 ///unique variant///
@@ -185,12 +189,7 @@
 	w_class = WEIGHT_CLASS_SMALL
 	spread = 15
 	recoil = 0.1
-
-/obj/item/gun/ballistic/automatic/flechette/shredder/update_icon()
-	cut_overlays()
-	if(magazine)
-		add_overlay("shreddergun-magazine")
-	icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
+	magtype = "shreddergun"
 
 /*/////////////////////////////////////////////////////////////
 //////////////////////// Zero's Meme //////////////////////////
@@ -218,17 +217,19 @@
 	burst_size = 4	//Shh.
 	fire_delay = 1
 	var/body_color = "#3333aa"
+	automatic_burst_overlay = FALSE
 
-/obj/item/gun/ballistic/automatic/AM4B/update_icon()
-	..()
+/obj/item/gun/ballistic/automatic/AM4B/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/update_icon_updates_onmob)
+
+/obj/item/gun/ballistic/automatic/AM4B/update_overlays()
+	. = ..()
 	var/mutable_appearance/body_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "AM4-Body")
 	if(body_color)
 		body_overlay.color = body_color
-	cut_overlays()		//So that it doesn't keep stacking overlays non-stop on top of each other
-	add_overlay(body_overlay)
-	if(ismob(loc))
-		var/mob/M = loc
-		M.update_inv_hands()
+	. += body_overlay
+
 /obj/item/gun/ballistic/automatic/AM4B/AltClick(mob/living/user)
 	. = ..()
 	if(!in_range(src, user))	//Basic checks to prevent abuse

modular_citadel/code/modules/projectiles/guns/ballistic/spinfusor.dm

@@ -55,8 +55,7 @@
 /obj/item/gun/ballistic/automatic/spinfusor/attack_self(mob/living/user)
 	return //caseless rounds are too glitchy to unload properly. Best to make it so that you cannot remove disks from the spinfusor
 
-/obj/item/gun/ballistic/automatic/spinfusor/update_icon()
-	..()
+/obj/item/gun/ballistic/automatic/spinfusor/update_icon_state()
 	icon_state = "spinfusor[magazine ? "-[get_ammo(1)]" : ""]"
 
 /obj/item/ammo_box/aspinfusor

modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm

@@ -14,16 +14,16 @@ obj/item/gun/energy/e_gun/cx
 	flight_y_offset = 10
 	var/body_color = "#252528"
 
-obj/item/gun/energy/e_gun/cx/update_icon()
-	..()
+obj/item/gun/energy/e_gun/cx/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/update_icon_updates_onmob)
+
+obj/item/gun/energy/e_gun/cx/update_overlays()
+	. = ..()
 	var/mutable_appearance/body_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "cxegun_body")
 	if(body_color)
 		body_overlay.color = body_color
-	add_overlay(body_overlay)
-
-	if(ismob(loc))
-		var/mob/M = loc
-		M.update_inv_hands()
+	. += body_overlay
 
 obj/item/gun/energy/e_gun/cx/AltClick(mob/living/user)
 	. = ..()

modular_citadel/code/modules/projectiles/guns/pumpenergy.dm

@@ -12,7 +12,7 @@
 
 /obj/item/gun/energy/pumpaction/emp_act(severity)	//makes it not rack itself when emp'd
 	cell.use(round(cell.charge / severity))
-	chambered = 0 //we empty the chamber
+	chambered = null //we empty the chamber
 	update_icon()
 
 /obj/item/gun/energy/pumpaction/process()	//makes it not rack itself when self-charging
@@ -20,7 +20,7 @@
 		charge_tick++
 		if(charge_tick < charge_delay)
 			return
-		charge_tick = 0
+		charge_tick = null
 		if(selfcharge == EGUN_SELFCHARGE_BORG)
 			var/atom/owner = loc
 			if(istype(owner, /obj/item/robot_module))
@@ -44,7 +44,7 @@
 	if(chambered && !chambered.BB) //if BB is null, i.e the shot has been fired...
 		var/obj/item/ammo_casing/energy/shot = chambered
 		cell.use(shot.e_cost)//... drain the cell cell
-	chambered = 0 //either way, released the prepared shot
+	chambered = null //either way, released the prepared shot
 
 /obj/item/gun/energy/pumpaction/post_set_firemode()
 	var/has_shot = chambered
@@ -52,13 +52,13 @@
 	if(has_shot)
 		recharge_newshot(TRUE)
 
-/obj/item/gun/energy/pumpaction/update_icon()	//adds racked indicators
+/obj/item/gun/energy/pumpaction/update_overlays()	//adds racked indicators
 	..()
 	var/obj/item/ammo_casing/energy/shot = ammo_type[current_firemode_index]
 	if(chambered)
-		add_overlay("[icon_state]_rack_[shot.select_name]")
+		. += "[icon_state]_rack_[shot.select_name]"
 	else
-		add_overlay("[icon_state]_rack_empty")
+		. += "[icon_state]_rack_empty"
 
 /obj/item/gun/energy/pumpaction/proc/pump(mob/M)	//pumping proc. Checks if the gun is empty and plays a different sound if it is.
 	var/obj/item/ammo_casing/energy/shot = ammo_type[current_firemode_index]

modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm

@@ -178,7 +178,7 @@
 	name = "Sucubus milk"
 	id = /datum/reagent/fermi/breast_enlarger
 	results = list(/datum/reagent/fermi/breast_enlarger = 8)
-	required_reagents = list(/datum/reagent/medicine/salglu_solution = 1, /datum/reagent/consumable/milk = 1, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/silicon = 3, /datum/reagent/drug/aphrodisiac = 3)
+	required_reagents = list(/datum/reagent/medicine/salglu_solution = 2, /datum/reagent/consumable/milk = 1, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/silicon = 5)
 	mix_message = "the reaction gives off a mist of milk."
 	//FermiChem vars:
 	OptimalTempMin 			= 200
@@ -218,7 +218,7 @@
 	name = "Incubus draft"
 	id = /datum/reagent/fermi/penis_enlarger
 	results = list(/datum/reagent/fermi/penis_enlarger = 8)
-	required_reagents = list(/datum/reagent/blood = 5, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/carbon = 2, /datum/reagent/drug/aphrodisiac = 2, /datum/reagent/medicine/salglu_solution = 1)
+	required_reagents = list(/datum/reagent/blood = 5, /datum/reagent/medicine/synthflesh = 2, /datum/reagent/carbon = 5, /datum/reagent/medicine/salglu_solution = 2)
 	mix_message = "the reaction gives off a spicy mist."
 	//FermiChem vars:
 	OptimalTempMin 			= 200
@@ -253,6 +253,7 @@
 		holder.remove_reagent(type, cached_volume)
 		holder.add_reagent(/datum/reagent/fermi/PEsmaller, cached_volume)
 
+/*
 /datum/chemical_reaction/fermi/astral
 	name = "Astrogen"
 	id = /datum/reagent/fermi/astral
@@ -274,7 +275,7 @@
 	FermiChem				= TRUE
 	FermiExplode 			= TRUE
 	PurityMin 				= 0.25
-
+*/
 
 /datum/chemical_reaction/fermi/enthrall //check this
 	name = "MKUltra"
@@ -384,7 +385,7 @@
 	name = "Furranium"
 	id = /datum/reagent/fermi/furranium
 	results = list(/datum/reagent/fermi/furranium = 5)
-	required_reagents = list(/datum/reagent/drug/aphrodisiac = 1, /datum/reagent/moonsugar = 1, /datum/reagent/silver = 2, /datum/reagent/medicine/salglu_solution = 1)
+	required_reagents = list(/datum/reagent/pax/catnip = 1, /datum/reagent/silver = 2, /datum/reagent/medicine/salglu_solution = 2)
 	mix_message = "You think you can hear a howl come from the beaker."
 	//FermiChem vars:
 	OptimalTempMin 	= 350
@@ -402,10 +403,6 @@
 	FermiChem 		= TRUE
 	PurityMin		= 0.3
 
-/datum/chemical_reaction/fermi/furranium/organic
-	id = "furranium_organic"
-	required_reagents = list(/datum/reagent/drug/aphrodisiac = 1, /datum/reagent/pax/catnip = 1, /datum/reagent/silver = 2, /datum/reagent/medicine/salglu_solution = 1)
-
 //FOR INSTANT REACTIONS - DO NOT MULTIPLY LIMIT BY 10.
 //There's a weird rounding error or something ugh.
 
@@ -504,7 +501,10 @@
 	PurityMin		= 0.6
 
 /datum/chemical_reaction/fermi/plushmium/FermiExplode(datum/reagents, var/atom/my_atom, volume, temp, pH)
-	new /obj/item/toy/plush/random(get_turf(my_atom))
+	if(volume < 20) //It creates a normal plush at low volume.. at higher amounts, things get slightly more interesting.
+		new /obj/item/toy/plush/random(get_turf(my_atom))
+	else
+		new /obj/item/toy/plush/plushling(get_turf(my_atom))
 	my_atom.visible_message("<span class='warning'>The reaction suddenly zaps, creating a plushie!</b></span>")
 	my_atom.reagents.clear_reagents()
 
@@ -607,4 +607,4 @@
 	ThermicConstant = 0
 	HIonRelease 	= 0.01
 	RateUpLim 		= 15
-	FermiChem 		= TRUE
+	FermiChem 		= TRUE