[MDB Ignore]Hats DMI split (#70060)

Splits head dmi into separate files for both mob and obj icons. Kept similar to suit split categorization + some more. New files include beanie, bio, chaplain, costume, cowboy, default, hats(softcaps, fedoras, head caps, generic hats), helmet(helmets and other armored headgear/hoods), spacehelm, utility(hardhats, mostly work related hats), wizard. Moves animal/pet head sitting icons to 1 folder, pets_head.dmi Renames PAI head sitting icon file to pai_head.dmi
2026-08-25 22:19:30 +01:00 · 2022-10-06 21:37:06 -07:00
parent 81f03f2cba
commit c7dde06668
235 changed files with 1041 additions and 841 deletions
@@ -945,7 +945,7 @@
 				if(!(sprite.worn_icon_state in icon_states(actual_file_name)))
 					to_chat(src, span_warning("ERROR sprites for [sprite.type]. Back slot."), confidential = TRUE)
 			if(sprite.slot_flags & ITEM_SLOT_HEAD)
-				actual_file_name = 'icons/mob/clothing/head.dmi'
+				actual_file_name = 'icons/mob/clothing/head/default.dmi'
 				if(!(sprite.worn_icon_state in icon_states(actual_file_name)))
 					to_chat(src, span_warning("ERROR sprites for [sprite.type]. Head slot."), confidential = TRUE)
 			if(sprite.slot_flags & ITEM_SLOT_BELT)
@@ -970,7 +970,7 @@
 				if(!(sprite.icon_state in icon_states(actual_file_name)))
 					to_chat(src, span_warning("ERROR sprites for [sprite.type]. Back slot."), confidential = TRUE)
 			if(sprite.slot_flags & ITEM_SLOT_HEAD)
-				actual_file_name = 'icons/mob/clothing/head.dmi'
+				actual_file_name = 'icons/mob/clothing/head/default.dmi'
 				if(!(sprite.icon_state in icon_states(actual_file_name)))
 					to_chat(src, span_warning("ERROR sprites for [sprite.type]. Head slot."), confidential = TRUE)
 			if(sprite.slot_flags & ITEM_SLOT_BELT)
@@ -501,6 +501,8 @@

 /obj/item/clothing/head/helmet/space/changeling
 	name = "flesh mass"
+	icon = 'icons/obj/clothing/head/costume.dmi'
+	worn_icon = 'icons/mob/clothing/head/costume.dmi'
 	icon_state = "lingspacehelmet"
 	inhand_icon_state = null
 	desc = "A covering of pressure and temperature-resistant organic tissue with a glass-like chitin front."
@@ -173,6 +173,8 @@ Striking a noncultist, however, will tear their flesh."}

 /obj/item/clothing/head/hooded/cult_hoodie
 	name = "ancient cultist hood"
+	icon = 'icons/obj/clothing/head/helmet.dmi'
+	worn_icon = 'icons/mob/clothing/head/helmet.dmi'
 	icon_state = "culthood"
 	inhand_icon_state = "culthood"
 	desc = "A torn, dust-caked hood. Strange letters line the inside."
@@ -222,8 +224,7 @@ Striking a noncultist, however, will tear their flesh."}
 	. = ..()
 	ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT)

-
-/obj/item/clothing/head/magus
+/obj/item/clothing/head/wizard/magus
 	name = "magus helm"
 	icon_state = "magus"
 	inhand_icon_state = null
@@ -74,7 +74,7 @@
 	uniform = /obj/item/clothing/under/rank/security/officer/spacepol
 	suit = /obj/item/clothing/suit/armor/vest/blueshirt
 	belt = /obj/item/gun/ballistic/automatic/pistol/m1911
-	head = /obj/item/clothing/head/warden/police
+	head = /obj/item/clothing/head/hats/warden/police
 	gloves = /obj/item/clothing/gloves/tackler/combat
 	shoes = /obj/item/clothing/shoes/jackboots
 	mask = /obj/item/clothing/mask/gas/sechailer/swat/spacepol
@@ -122,8 +122,8 @@
 		/obj/item/clothing/suit/armor/vest/russian_coat,
 	)
 	var/static/list/alt_helmets = list(
-		/obj/item/clothing/head/bearpelt,
-		/obj/item/clothing/head/ushanka,
+		/obj/item/clothing/head/costume/bearpelt,
+		/obj/item/clothing/head/costume/ushanka,
 		/obj/item/clothing/head/helmet/rus_helmet,
 	)

@@ -152,7 +152,7 @@

 /datum/outfit/russian_hunter/leader
 	name = "Russian Hunter Leader"
-	head = /obj/item/clothing/head/ushanka
+	head = /obj/item/clothing/head/costume/ushanka
 	shoes = /obj/item/clothing/shoes/combat

 /datum/outfit/russian_hunter/leader/pre_equip(mob/living/carbon/human/equip_to)
@@ -162,7 +162,7 @@
 	name = "Bounty Hunter - Armored"
 	uniform = /obj/item/clothing/under/rank/prisoner
 	back = /obj/item/storage/backpack
-	head = /obj/item/clothing/head/hunter
+	head = /obj/item/clothing/head/cowboy
 	suit = /obj/item/clothing/suit/space/hunter
 	belt = /obj/item/gun/ballistic/automatic/pistol/fire_mag
 	gloves = /obj/item/clothing/gloves/tackler/combat
@@ -192,7 +192,7 @@
 	name = "Bounty Hunter - Hook"
 	uniform = /obj/item/clothing/under/rank/prisoner
 	back = /obj/item/storage/backpack
-	head = /obj/item/clothing/head/scarecrow_hat
+	head = /obj/item/clothing/head/costume/scarecrow_hat
 	gloves = /obj/item/clothing/gloves/botanic_leather
 	ears = /obj/item/radio/headset
 	shoes = /obj/item/clothing/shoes/jackboots
@@ -1,6 +1,8 @@
 // Eldritch armor. Looks cool, hood lets you cast heretic spells.
 /obj/item/clothing/head/hooded/cult_hoodie/eldritch
 	name = "ominous hood"
+	icon = 'icons/obj/clothing/head/helmet.dmi'
+	worn_icon = 'icons/mob/clothing/head/helmet.dmi'
 	icon_state = "eldritch"
 	desc = "A torn, dust-caked hood. Strange eyes line the inside."
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
@@ -36,6 +38,8 @@
 // Void cloak. Turns invisible with the hood up, lets you hide stuff.
 /obj/item/clothing/head/hooded/cult_hoodie/void
 	name = "void hood"
+	icon = 'icons/obj/clothing/head/helmet.dmi'
+	worn_icon = 'icons/mob/clothing/head/helmet.dmi'
 	desc = "Black like tar, doesn't reflect any light. Runic symbols line the outside, \
 		with each flash you loose comprehension of what you are seeing."
 	icon_state = "void_cloak"
@@ -97,7 +97,7 @@
 /datum/outfit/syndicate/reinforcement/donk
 	name = "Syndicate Operative - Donk Reinforcement"
 	suit = /obj/item/clothing/suit/hazardvest
-	head = /obj/item/clothing/head/hardhat/orange
+	head = /obj/item/clothing/head/utility/hardhat/orange
 	shoes = /obj/item/clothing/shoes/workboots
 	glasses = /obj/item/clothing/glasses/meson
 	faction = "the Donk Corporation"
@@ -643,7 +643,7 @@
 	name = "Revolutionary (Preview only)"

 	uniform = /obj/item/clothing/under/costume/soviet
-	head = /obj/item/clothing/head/ushanka
+	head = /obj/item/clothing/head/costume/ushanka
 	gloves = /obj/item/clothing/gloves/color/black
 	l_hand = /obj/item/spear
 	r_hand = /obj/item/assembly/flash
@@ -55,7 +55,7 @@
 /datum/export/gear/radhelmet
 	cost = CARGO_CRATE_VALUE * 0.1
 	unit_name = "radsuit hood"
-	export_types = list(/obj/item/clothing/head/radiation)
+	export_types = list(/obj/item/clothing/head/utility/radiation)

 /datum/export/gear/radsuit
 	cost = CARGO_CRATE_VALUE * 0.2
@@ -75,7 +75,7 @@
 /datum/export/gear/bombhelmet
 	cost = CARGO_CRATE_VALUE * 0.1
 	unit_name = "bomb suit hood"
-	export_types = list(/obj/item/clothing/head/bomb_hood)
+	export_types = list(/obj/item/clothing/head/utility/bomb_hood)

 /datum/export/gear/bombsuit
 	cost = CARGO_CRATE_VALUE * 0.2
@@ -128,7 +128,7 @@
 	name = "Explosive Emergency Crate"
 	desc = "Science gone bonkers? Beeping behind the airlock? Buy now and be the hero the station des... I mean needs! (time not included)"
 	cost = CARGO_CRATE_VALUE * 2
-	contains = list(/obj/item/clothing/head/bomb_hood,
+	contains = list(/obj/item/clothing/head/utility/bomb_hood,
 					/obj/item/clothing/suit/utility/bomb_suit,
 					/obj/item/clothing/mask/gas,
 					/obj/item/screwdriver,
@@ -145,7 +145,7 @@
 					/obj/item/flashlight = 2,
 					/obj/item/tank/internals/oxygen/red = 2,
 					/obj/item/extinguisher/advanced = 2,
-					/obj/item/clothing/head/hardhat/red = 2)
+					/obj/item/clothing/head/utility/hardhat/red = 2)
 	crate_name = "firefighting crate"

 /datum/supply_pack/emergency/atmostank
@@ -199,7 +199,7 @@
 	name = "Radiation Protection Crate"
 	desc = "Survive the Nuclear Apocalypse and Supermatter Engine alike with two sets of Radiation suits. Each set contains a helmet, suit, and Geiger counter. We'll even throw in a bottle of vodka and some glasses too, considering the life-expectancy of people who order this."
 	cost = CARGO_CRATE_VALUE * 2
-	contains = list(/obj/item/clothing/head/radiation = 2,
+	contains = list(/obj/item/clothing/head/utility/radiation = 2,
 					/obj/item/clothing/suit/utility/radiation = 2,
 					/obj/item/geiger_counter = 2,
 					/obj/item/clothing/suit/utility/radiation,
@@ -406,7 +406,7 @@
 	cost = CARGO_CRATE_VALUE * 2.2
 	contraband = TRUE
 	contains = list(/obj/item/clothing/under/rank/security/constable,
-					/obj/item/clothing/head/constable,
+					/obj/item/clothing/head/costume/constable,
 					/obj/item/clothing/gloves/color/white,
 					/obj/item/clothing/mask/whistle,
 					/obj/item/conversion_kit)
@@ -624,7 +624,7 @@
 	contains = list(/obj/item/storage/belt/utility = 3,
 					/obj/item/clothing/suit/hazardvest = 3,
 					/obj/item/clothing/head/welding = 3,
-					/obj/item/clothing/head/hardhat = 3,
+					/obj/item/clothing/head/utility/hardhat = 3,
 					/obj/item/clothing/glasses/meson/engine = 2)
 	crate_name = "engineering gear crate"

@@ -1262,7 +1262,7 @@
 	access_view = ACCESS_ROBOTICS
 	contains = list(/obj/item/assembly/prox_sensor = 5,
 					/obj/item/healthanalyzer = 2,
-					/obj/item/clothing/head/hardhat/red = 2,
+					/obj/item/clothing/head/utility/hardhat/red = 2,
 					/obj/item/storage/medkit = 2)
 	crate_name = "robotics assembly crate"
 	crate_type = /obj/structure/closet/crate/secure/science
@@ -1485,7 +1485,7 @@
 	contains = list(/obj/item/clothing/under/dress/wedding_dress,
 					/obj/item/clothing/under/suit/tuxedo,
 					/obj/item/storage/belt/cummerbund,
-					/obj/item/clothing/head/weddingveil,
+					/obj/item/clothing/head/costume/weddingveil,
 					/obj/item/bouquet,
 					/obj/item/bouquet/sunflower,
 					/obj/item/bouquet/poppy,
@@ -1560,9 +1560,9 @@
 	name = "Beekeeper Suit Crate"
 	desc = "Bee business booming? Better be benevolent and boost botany by bestowing bi-Beekeeper-suits! Contains two beekeeper suits and matching headwear."
 	cost = CARGO_CRATE_VALUE * 2
-	contains = list(/obj/item/clothing/head/beekeeper_head,
+	contains = list(/obj/item/clothing/head/utility/beekeeper_head,
 					/obj/item/clothing/suit/utility/beekeeper_suit,
-					/obj/item/clothing/head/beekeeper_head,
+					/obj/item/clothing/head/utility/beekeeper_head,
 					/obj/item/clothing/suit/utility/beekeeper_suit)
 	crate_name = "beekeeper suits"
 	crate_type = /obj/structure/closet/crate/hydroponics
@@ -1574,7 +1574,7 @@
 	contains = list(/obj/structure/beebox/unwrenched,
 					/obj/item/honey_frame = 3,
 					/obj/item/queen_bee/bought,
-					/obj/item/clothing/head/beekeeper_head,
+					/obj/item/clothing/head/utility/beekeeper_head,
 					/obj/item/clothing/suit/utility/beekeeper_suit,
 					/obj/item/melee/flyswatter)
 	crate_name = "beekeeping starter crate"
@@ -2135,11 +2135,11 @@
 					/obj/item/clothing/neck/tie/blue,
 					/obj/item/clothing/neck/tie/red,
 					/obj/item/clothing/neck/tie/black,
-					/obj/item/clothing/head/bowler,
+					/obj/item/clothing/head/hats/bowler,
 					/obj/item/clothing/head/fedora,
 					/obj/item/clothing/head/flatcap,
 					/obj/item/clothing/head/beret,
-					/obj/item/clothing/head/that,
+					/obj/item/clothing/head/hats/tophat,
 					/obj/item/clothing/shoes/laceup = 3,
 					/obj/item/clothing/under/suit/charcoal,
 					/obj/item/clothing/under/suit/navy,
@@ -2201,15 +2201,15 @@
 	name = "Original Costume Crate"
 	desc = "Reenact Shakespearean plays with this assortment of outfits. Contains eight different costumes!"
 	cost = CARGO_CRATE_VALUE * 2
-	contains = list(/obj/item/clothing/head/snowman,
+	contains = list(/obj/item/clothing/head/costume/snowman,
 					/obj/item/clothing/suit/costume/snowman,
-					/obj/item/clothing/head/chicken,
+					/obj/item/clothing/head/costume/chicken,
 					/obj/item/clothing/suit/costume/chickensuit,
 					/obj/item/clothing/mask/gas/monkeymask,
 					/obj/item/clothing/suit/costume/monkeysuit,
-					/obj/item/clothing/head/cardborg,
+					/obj/item/clothing/head/costume/cardborg,
 					/obj/item/clothing/suit/costume/cardborg,
-					/obj/item/clothing/head/xenos,
+					/obj/item/clothing/head/costume/xenos,
 					/obj/item/clothing/suit/costume/xenos,
 					/obj/item/clothing/suit/hooded/ian_costume,
 					/obj/item/clothing/suit/hooded/carp_costume,
@@ -497,8 +497,9 @@
 /obj/item/clothing/head/chameleon
 	name = "grey cap"
 	desc = "It's a baseball hat in a tasteful grey colour."
+	icon = 'icons/obj/clothing/head/hats.dmi'
+	worn_icon = 'icons/mob/clothing/head/hats.dmi'
 	icon_state = "greysoft"
-
 	resistance_flags = NONE
 	armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 50, ACID = 50)

@@ -1,6 +1,7 @@
 /obj/item/clothing/head
 	name = BODY_ZONE_HEAD
-	icon = 'icons/obj/clothing/hats.dmi'
+	icon = 'icons/obj/clothing/head/default.dmi'
+	worn_icon = 'icons/mob/clothing/head/default.dmi'
 	lefthand_file = 'icons/mob/inhands/clothing/hats_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/clothing/hats_righthand.dmi'
 	body_parts_covered = HEAD
@@ -1,4 +1,4 @@
-/obj/item/clothing/head/kitty
+/obj/item/clothing/head/costume/kitty
 	name = "kitty ears"
 	desc = "A pair of kitty ears. Meow!"
 	icon_state = "kitty"
@@ -6,21 +6,21 @@

 	dog_fashion = /datum/dog_fashion/head/kitty

-/obj/item/clothing/head/kitty/visual_equipped(mob/living/carbon/human/user, slot)
+/obj/item/clothing/head/costume/kitty/visual_equipped(mob/living/carbon/human/user, slot)
 	if(ishuman(user) && (slot & ITEM_SLOT_HEAD))
 		update_icon(ALL, user)
 		user.update_worn_head() //Color might have been changed by update_appearance.
 	..()

-/obj/item/clothing/head/kitty/update_icon(updates=ALL, mob/living/carbon/human/user)
+/obj/item/clothing/head/costume/kitty/update_icon(updates=ALL, mob/living/carbon/human/user)
 	. = ..()
 	if(ishuman(user))
 		add_atom_colour(user.hair_color, FIXED_COLOUR_PRIORITY)

-/obj/item/clothing/head/kitty/genuine
+/obj/item/clothing/head/costume/kitty/genuine
 	desc = "A pair of kitty ears. A tag on the inside says \"Hand made from real cats.\""

-/obj/item/clothing/head/rabbitears
+/obj/item/clothing/head/costume/rabbitears
 	name = "rabbit ears"
 	desc = "Wearing these makes you look useless, and only good for your sex appeal."
 	icon_state = "bunny"
@@ -6,6 +6,8 @@
 /obj/item/clothing/head/beanie
 	name = "beanie"
 	desc = "A stylish beanie. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their heads."
+	icon = 'icons/obj/clothing/head/beanie.dmi'
+	worn_icon = 'icons/mob/clothing/head/beanie.dmi'
 	icon_state = "beanie"
 	custom_price = PAYCHECK_CREW * 1.2
 	greyscale_colors = "#EEEEEE#EEEEEE"
@@ -46,11 +48,15 @@
 /obj/item/clothing/head/rasta
 	name = "rastacap"
 	desc = "Perfect for tucking in those dreadlocks."
+	icon = 'icons/obj/clothing/head/beanie.dmi'
+	worn_icon = 'icons/mob/clothing/head/beanie.dmi'
 	icon_state = "beanierasta"

 /obj/item/clothing/head/waldo
 	name = "red striped bobble hat"
 	desc = "If you're going on a worldwide hike, you'll need some cold protection."
+	icon = 'icons/obj/clothing/head/beanie.dmi'
+	worn_icon = 'icons/mob/clothing/head/beanie.dmi'
 	icon_state = "waldo_hat"

 //No dog fashion sprites yet :(  poor Ian can't be dope like the rest of us yet
@@ -1,6 +1,8 @@
-/obj/item/clothing/head/hardhat/cakehat
+/obj/item/clothing/head/utility/hardhat/cakehat
 	name = "cakehat"
 	desc = "You put the cake on your head. Brilliant."
+	icon = 'icons/obj/clothing/head/costume.dmi'
+	worn_icon = 'icons/mob/clothing/head/costume.dmi'
 	icon_state = "hardhat0_cakehat"
 	inhand_icon_state = "hardhat0_cakehat"
 	hat_type = "cakehat"
@@ -21,7 +23,7 @@
 	var/throwforce_on = 15
 	var/damtype_on = BURN

-/obj/item/clothing/head/hardhat/cakehat/process()
+/obj/item/clothing/head/utility/hardhat/cakehat/process()
 	var/turf/location = loc
 	if(ishuman(location))
 		var/mob/living/carbon/human/wearer = location
@@ -31,7 +33,7 @@
 	if(isturf(location))
 		location.hotspot_expose(700, 1)

-/obj/item/clothing/head/hardhat/cakehat/turn_on(mob/living/user)
+/obj/item/clothing/head/utility/hardhat/cakehat/turn_on(mob/living/user)
 	..()
 	force = force_on
 	throwforce = throwforce_on
@@ -39,7 +41,7 @@
 	hitsound = hitsound_on
 	START_PROCESSING(SSobj, src)

-/obj/item/clothing/head/hardhat/cakehat/turn_off(mob/living/user)
+/obj/item/clothing/head/utility/hardhat/cakehat/turn_off(mob/living/user)
 	..()
 	force = 0
 	throwforce = 0
@@ -47,10 +49,10 @@
 	hitsound = hitsound_off
 	STOP_PROCESSING(SSobj, src)

-/obj/item/clothing/head/hardhat/cakehat/get_temperature()
+/obj/item/clothing/head/utility/hardhat/cakehat/get_temperature()
 	return on * heat

-/obj/item/clothing/head/hardhat/cakehat/energycake
+/obj/item/clothing/head/utility/hardhat/cakehat/energycake
 	name = "energy cake"
 	desc = "You put the energy sword on your cake. Brilliant."
 	icon_state = "hardhat0_energycake"
@@ -64,12 +66,12 @@
 	light_range = 3 //ditto
 	heat = 0

-/obj/item/clothing/head/hardhat/cakehat/energycake/turn_on(mob/living/user)
+/obj/item/clothing/head/utility/hardhat/cakehat/energycake/turn_on(mob/living/user)
 	playsound(src, 'sound/weapons/saberon.ogg', 5, TRUE)
 	to_chat(user, span_warning("You turn on \the [src]."))
 	return ..()

-/obj/item/clothing/head/hardhat/cakehat/energycake/turn_off(mob/living/user)
+/obj/item/clothing/head/utility/hardhat/cakehat/energycake/turn_off(mob/living/user)
 	playsound(src, 'sound/weapons/saberoff.ogg', 5, TRUE)
 	to_chat(user, span_warning("You turn off \the [src]."))
 	return ..()
@@ -4,6 +4,8 @@
 /obj/item/clothing/head/collectable
 	name = "collectable hat"
 	desc = "A rare collectable hat."
+	icon = 'icons/obj/clothing/head/costume.dmi'
+	worn_icon = 'icons/mob/clothing/head/costume.dmi'
 	icon_state = null

 /obj/item/clothing/head/collectable/Initialize(mapload)
@@ -24,37 +26,42 @@
 /obj/item/clothing/head/collectable/chef
 	name = "collectable chef's hat"
 	desc = "A rare chef's hat meant for hat collectors!"
+	icon = 'icons/obj/clothing/head/utility.dmi'
+	worn_icon = 'icons/mob/clothing/head/utility.dmi'
 	icon_state = "chef"
 	inhand_icon_state = "chefhat"
-
 	dog_fashion = /datum/dog_fashion/head/chef

 /obj/item/clothing/head/collectable/paper
 	name = "collectable paper hat"
 	desc = "What looks like an ordinary paper hat is actually a rare and valuable collector's edition paper hat. Keep away from water, fire, and Curators."
+	worn_icon = 'icons/mob/clothing/head/costume.dmi'
 	icon_state = "paper"
-
 	dog_fashion = /datum/dog_fashion/head

 /obj/item/clothing/head/collectable/tophat
 	name = "collectable top hat"
 	desc = "A top hat worn by only the most prestigious hat collectors."
+	icon = 'icons/obj/clothing/head/hats.dmi'
+	worn_icon = 'icons/mob/clothing/head/hats.dmi'
 	icon_state = "tophat"
 	inhand_icon_state = "that"

 /obj/item/clothing/head/collectable/captain
 	name = "collectable captain's hat"
 	desc = "A collectable hat that'll make you look just like a real comdom!"
+	icon = 'icons/obj/clothing/head/hats.dmi'
+	worn_icon = 'icons/mob/clothing/head/hats.dmi'
 	icon_state = "captain"
 	inhand_icon_state = null
-
 	dog_fashion = /datum/dog_fashion/head/captain

 /obj/item/clothing/head/collectable/police
 	name = "collectable police officer's hat"
 	desc = "A collectable police officer's Hat. This hat emphasizes that you are THE LAW."
+	icon = 'icons/obj/clothing/head/hats.dmi'
+	worn_icon = 'icons/mob/clothing/head/hats.dmi'
 	icon_state = "policehelm"
-
 	dog_fashion = /datum/dog_fashion/head/warden

 /obj/item/clothing/head/collectable/beret
@@ -64,12 +71,13 @@
 	greyscale_config = /datum/greyscale_config/beret
 	greyscale_config_worn = /datum/greyscale_config/beret/worn
 	greyscale_colors = "#972A2A"
-
 	dog_fashion = /datum/dog_fashion/head/beret

 /obj/item/clothing/head/collectable/welding
 	name = "collectable welding helmet"
 	desc = "A collectable welding helmet. Now with 80% less lead! Not for actual welding. Any welding done while wearing this helmet is done so at the owner's own risk!"
+	icon = 'icons/obj/clothing/head/utility.dmi'
+	worn_icon = 'icons/mob/clothing/head/utility.dmi'
 	icon_state = "welding"
 	inhand_icon_state = "welding"
 	lefthand_file = 'icons/mob/inhands/clothing/masks_lefthand.dmi'
@@ -83,7 +91,6 @@
 	inhand_icon_state = null
 	clothing_flags = SNUG_FIT

-
 /obj/item/clothing/head/collectable/flatcap
 	name = "collectable flat cap"
 	desc = "A collectible farmer's flat cap!"
@@ -98,7 +105,6 @@
 	desc = "You'd make a great Dread Syndie Roberts!"
 	icon_state = "pirate"
 	inhand_icon_state = null
-
 	dog_fashion = /datum/dog_fashion/head/pirate

 /obj/item/clothing/head/collectable/kitty
@@ -106,8 +112,6 @@
 	desc = "The fur feels... a bit too realistic."
 	icon_state = "kitty"
 	inhand_icon_state = null
-
-
 	dog_fashion = /datum/dog_fashion/head/kitty

 /obj/item/clothing/head/collectable/rabbitears
@@ -115,41 +119,46 @@
 	desc = "Not as lucky as the feet!"
 	icon_state = "bunny"
 	inhand_icon_state = null
-
-
 	dog_fashion = /datum/dog_fashion/head/rabbit

 /obj/item/clothing/head/collectable/wizard
 	name = "collectable wizard's hat"
 	desc = "NOTE: Any magical powers gained from wearing this hat are purely coincidental."
+	icon = 'icons/obj/clothing/head/wizard.dmi'
+	worn_icon = 'icons/mob/clothing/head/wizard.dmi'
 	icon_state = "wizard"
-
 	dog_fashion = /datum/dog_fashion/head/blue_wizard

 /obj/item/clothing/head/collectable/hardhat
 	name = "collectable hard hat"
 	desc = "WARNING! Offers no real protection, or luminosity, but damn, is it fancy!"
+	icon = 'icons/obj/clothing/head/utility.dmi'
+	worn_icon = 'icons/mob/clothing/head/utility.dmi'
 	clothing_flags = SNUG_FIT
 	icon_state = "hardhat0_yellow"
 	inhand_icon_state = null
-
 	dog_fashion = /datum/dog_fashion/head

 /obj/item/clothing/head/collectable/hos
 	name = "collectable HoS hat"
 	desc = "Now you too can beat prisoners, set silly sentences, and arrest for no reason!"
+	icon = 'icons/obj/clothing/head/hats.dmi'
+	worn_icon = 'icons/mob/clothing/head/hats.dmi'
 	icon_state = "hoscap"

-
 /obj/item/clothing/head/collectable/hop
 	name = "collectable HoP hat"
 	desc = "It's your turn to demand excessive paperwork, signatures, stamps, and hire more clowns! Papers, please!"
+	icon = 'icons/obj/clothing/head/hats.dmi'
+	worn_icon = 'icons/mob/clothing/head/hats.dmi'
 	icon_state = "hopcap"
 	dog_fashion = /datum/dog_fashion/head/hop

 /obj/item/clothing/head/collectable/thunderdome
 	name = "collectable Thunderdome helmet"
 	desc = "Go Red! I mean Green! I mean Red! No Green!"
+	icon = 'icons/obj/clothing/head/helmet.dmi'
+	worn_icon = 'icons/mob/clothing/head/helmet.dmi'
 	icon_state = "thunderdome"
 	inhand_icon_state = "thunderdome_helmet"
 	clothing_flags = SNUG_FIT
@@ -158,6 +167,8 @@
 /obj/item/clothing/head/collectable/swat
 	name = "collectable SWAT helmet"
 	desc = "That's not real blood. That's red paint." //Reference to the actual description
+	icon = 'icons/obj/clothing/head/helmet.dmi'
+	worn_icon = 'icons/mob/clothing/head/helmet.dmi'
 	icon_state = "swatsyndie"
 	inhand_icon_state = "swatsyndie_helmet"
 	clothing_flags = SNUG_FIT
@@ -2,6 +2,7 @@
 	desc = "This cone is trying to warn you of something!"
 	name = "warning cone"
 	icon = 'icons/obj/janitor.dmi'
+	worn_icon = 'icons/mob/clothing/head/utility.dmi'
 	icon_state = "cone"
 	inhand_icon_state = null
 	force = 1
@@ -1,10 +1,14 @@
-/obj/item/clothing/head/powdered_wig
+/obj/item/clothing/head/costume
+	icon = 'icons/obj/clothing/head/costume.dmi'
+	worn_icon = 'icons/mob/clothing/head/costume.dmi'
+
+/obj/item/clothing/head/costume/powdered_wig
 	name = "powdered wig"
 	desc = "A powdered wig."
 	icon_state = "pwig"
 	inhand_icon_state = "pwig"

-/obj/item/clothing/head/hasturhood
+/obj/item/clothing/head/costume/hasturhood
 	name = "hastur's hood"
 	desc = "It's <i>unspeakably</i> stylish."
 	icon_state = "hasturhood"
@@ -13,13 +17,15 @@

 /obj/item/clothing/head/syndicatefake
 	name = "black space-helmet replica"
+	icon = 'icons/obj/clothing/head/spacehelm.dmi'
+	worn_icon = 'icons/mob/clothing/head/spacehelm.dmi'
 	icon_state = "syndicate-helm-black-red"
 	inhand_icon_state = "syndicate-helm-black-red"
 	desc = "A plastic replica of a Syndicate agent's space helmet. You'll look just like a real murderous Syndicate agent in this! This is a toy, it is not made for use in space!"
 	clothing_flags = SNUG_FIT
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT

-/obj/item/clothing/head/cueball
+/obj/item/clothing/head/costume/cueball
 	name = "cueball helmet"
 	desc = "A large, featureless white orb meant to be worn on your head. How do you even see out of this thing?"
 	icon_state = "cueball"
@@ -28,7 +34,7 @@
 	flags_cover = HEADCOVERSEYES|HEADCOVERSMOUTH
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT

-/obj/item/clothing/head/snowman
+/obj/item/clothing/head/costume/snowman
 	name = "snowman head"
 	desc = "A ball of white styrofoam. So festive."
 	icon_state = "snowman_h"
@@ -37,19 +43,19 @@
 	flags_cover = HEADCOVERSEYES
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT

-/obj/item/clothing/head/witchwig
+/obj/item/clothing/head/costume/witchwig
 	name = "witch costume wig"
 	desc = "Eeeee~heheheheheheh!"
 	icon_state = "witch"
 	inhand_icon_state = null
 	flags_inv = HIDEHAIR

-/obj/item/clothing/head/maidheadband
+/obj/item/clothing/head/costume/maidheadband
 	name = "maid headband"
 	desc = "Just like from one of those chinese cartoons!"
 	icon_state = "maid_headband"

-/obj/item/clothing/head/chicken
+/obj/item/clothing/head/costume/chicken
 	name = "chicken suit head"
 	desc = "Bkaw!"
 	icon_state = "chickenhead"
@@ -57,7 +63,7 @@
 	clothing_flags = SNUG_FIT
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT

-/obj/item/clothing/head/griffin
+/obj/item/clothing/head/costume/griffin
 	name = "griffon head"
 	desc = "Why not 'eagle head'? Who knows."
 	icon_state = "griffinhat"
@@ -65,7 +71,7 @@
 	clothing_flags = SNUG_FIT
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT

-/obj/item/clothing/head/xenos
+/obj/item/clothing/head/costume/xenos
 	name = "xenos helmet"
 	icon_state = "xenos"
 	inhand_icon_state = "xenos_helm"
@@ -74,29 +80,28 @@
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH

-/obj/item/clothing/head/lobsterhat
+/obj/item/clothing/head/costume/lobsterhat
 	name = "foam lobster head"
 	desc = "When everything's going to crab, protecting your head is the best choice."
 	icon_state = "lobster_hat"
 	clothing_flags = SNUG_FIT
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT

-/obj/item/clothing/head/drfreezehat
+/obj/item/clothing/head/costume/drfreezehat
 	name = "doctor freeze's wig"
 	desc = "A cool wig for cool people."
 	icon_state = "drfreeze_hat"
 	flags_inv = HIDEHAIR

-/obj/item/clothing/head/shrine_wig
+/obj/item/clothing/head/costume/shrine_wig
 	name = "shrine maiden's wig"
 	desc = "Purify in style!"
 	flags_inv = HIDEHAIR //bald
 	icon_state = "shrine_wig"
 	inhand_icon_state = null
-
 	worn_y_offset = 1

-/obj/item/clothing/head/cardborg
+/obj/item/clothing/head/costume/cardborg
 	name = "cardborg helmet"
 	desc = "A helmet made out of a box."
 	icon_state = "cardborg_h"
@@ -107,7 +112,7 @@

 	dog_fashion = /datum/dog_fashion/head/cardborg

-/obj/item/clothing/head/cardborg/equipped(mob/living/user, slot)
+/obj/item/clothing/head/costume/cardborg/equipped(mob/living/user, slot)
 	..()
 	if(ishuman(user) && (slot & ITEM_SLOT_HEAD))
 		var/mob/living/carbon/human/H = user
@@ -115,20 +120,19 @@
 			var/obj/item/clothing/suit/costume/cardborg/CB = H.wear_suit
 			CB.disguise(user, src)

-/obj/item/clothing/head/cardborg/dropped(mob/living/user)
+/obj/item/clothing/head/costume/cardborg/dropped(mob/living/user)
 	..()
 	user.remove_alt_appearance("standard_borg_disguise")

-/obj/item/clothing/head/bronze
+/obj/item/clothing/head/costume/bronze
 	name = "bronze hat"
 	desc = "A crude helmet made out of bronze plates. It offers very little in the way of protection."
-	icon = 'icons/obj/clothing/hats.dmi'
 	icon_state = "clockwork_helmet_old"
 	clothing_flags = SNUG_FIT
 	flags_inv = HIDEEARS|HIDEHAIR
 	armor = list(MELEE = 5, BULLET = 0, LASER = -5, ENERGY = -15, BOMB = 10, BIO = 0, FIRE = 20, ACID = 20)

-/obj/item/clothing/head/fancy
+/obj/item/clothing/head/costume/fancy
 	name = "fancy hat"
 	icon_state = "fancy_hat"
 	greyscale_colors = "#E3C937#782A81"
@@ -136,7 +140,7 @@
 	greyscale_config_worn = /datum/greyscale_config/fancy_hat_worn
 	flags_1 = IS_PLAYER_COLORABLE_1

-/obj/item/clothing/head/football_helmet
+/obj/item/clothing/head/costume/football_helmet
 	name = "football helmet"
 	icon_state = "football_helmet"
 	greyscale_colors = "#D74722"
@@ -144,7 +148,7 @@
 	greyscale_config_worn = /datum/greyscale_config/football_helmet_worn
 	flags_1 = IS_PLAYER_COLORABLE_1

-/obj/item/clothing/head/tv_head
+/obj/item/clothing/head/costume/tv_head
 	name = "television helmet"
 	desc = "A mysterious headgear made from the hollowed out remains of a status display. How very retro-retro-futuristic of you."
 	icon_state = "IPC_helmet"
@@ -157,38 +161,38 @@
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
 	var/has_fov = TRUE

-/obj/item/clothing/head/tv_head/Initialize(mapload)
+/obj/item/clothing/head/costume/tv_head/Initialize(mapload)
 	. = ..()
 	if(has_fov)
 		AddComponent(/datum/component/clothing_fov_visor, FOV_90_DEGREES)

-/obj/item/clothing/head/tv_head/fov_less
+/obj/item/clothing/head/costume/tv_head/fov_less
 	desc = "A mysterious headgear made from the hollowed out remains of a status display. How very retro-retro-futuristic of you. It's very easy to see out of this one."
 	has_fov = FALSE

-/obj/item/clothing/head/irs
+/obj/item/clothing/head/costume/irs
 	name = "internal revenue service cap"
 	icon_state = "irs_hat"
 	inhand_icon_state = null

-/obj/item/clothing/head/tmc
+/obj/item/clothing/head/costume/tmc
 	name = "Lost M.C. bandana"
 	icon_state = "tmc_hat"
 	inhand_icon_state = null

-/obj/item/clothing/head/deckers
+/obj/item/clothing/head/costume/deckers
 	name = "Decker headphones"
 	icon_state = "decker_hat"
 	inhand_icon_state = null

-/obj/item/clothing/head/yuri
+/obj/item/clothing/head/costume/yuri
 	name = "yuri initiate helmet"
 	icon_state = "yuri_helmet"
 	inhand_icon_state = null
 	clothing_flags = SNUG_FIT
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT

-/obj/item/clothing/head/allies
+/obj/item/clothing/head/costume/allies
 	name = "allies helmet"
 	icon_state = "allies_helmet"
 	inhand_icon_state = null
@@ -1,12 +1,11 @@
-/obj/item/clothing/head/crown
+/obj/item/clothing/head/costume/crown
 	name = "crown"
 	desc = "A crown fit for a king, a petty king maybe."
 	icon_state = "crown"
 	armor = list(MELEE = 15, BULLET = 0, LASER = 0,ENERGY = 10, BOMB = 0, BIO = 0, FIRE = 100, ACID = 50, WOUND = 5)
 	resistance_flags = FIRE_PROOF

-
-/obj/item/clothing/head/crown/fancy
+/obj/item/clothing/head/costume/crown/fancy
 	name = "magnificent crown"
 	desc = "A crown worn by only the highest emperors of the <s>land</s> space."
 	icon_state = "fancycrown"
@@ -1,5 +1,7 @@
 /obj/item/clothing/head/fedora
 	name = "fedora"
+	icon = 'icons/obj/clothing/head/hats.dmi'
+	worn_icon = 'icons/mob/clothing/head/hats.dmi'
 	icon_state = "fedora"
 	inhand_icon_state = "fedora"
 	desc = "A really cool hat if you're a mobster. A really lame hat if you're not."
@@ -1,14 +1,14 @@
-/obj/item/clothing/head/garland
+/obj/item/clothing/head/costume/garland
 	name = "floral garland"
 	desc = "Someone, somewhere, is starving while wearing this. And it's definitely not you."
 	icon_state = "garland"
 	worn_icon_state = "garland"

-/obj/item/clothing/head/garland/equipped(mob/living/user, slot)
+/obj/item/clothing/head/costume/garland/equipped(mob/living/user, slot)
 	. = ..()
 	if(slot_flags & slot)
 		user.add_mood_event("garland", /datum/mood_event/garland)

-/obj/item/clothing/head/garland/dropped(mob/living/user)
+/obj/item/clothing/head/costume/garland/dropped(mob/living/user)
 	. = ..()
 	user.clear_mood_event("garland")
@@ -1,4 +1,8 @@
-/obj/item/clothing/head/hardhat
+/obj/item/clothing/head/utility
+	icon = 'icons/obj/clothing/head/utility.dmi'
+	worn_icon = 'icons/mob/clothing/head/utility.dmi'
+
+/obj/item/clothing/head/utility/hardhat
 	name = "hard hat"
 	desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight."
 	icon_state = "hardhat0_yellow"
@@ -21,14 +25,14 @@
 	var/on = FALSE


-/obj/item/clothing/head/hardhat/Initialize(mapload)
+/obj/item/clothing/head/utility/hardhat/Initialize(mapload)
 	. = ..()
 	AddElement(/datum/element/update_icon_updates_onmob, ITEM_SLOT_HEAD)

-/obj/item/clothing/head/hardhat/attack_self(mob/living/user)
+/obj/item/clothing/head/utility/hardhat/attack_self(mob/living/user)
 	toggle_helmet_light(user)

-/obj/item/clothing/head/hardhat/proc/toggle_helmet_light(mob/living/user)
+/obj/item/clothing/head/utility/hardhat/proc/toggle_helmet_light(mob/living/user)
 	on = !on
 	if(on)
 		turn_on(user)
@@ -36,23 +40,23 @@
 		turn_off(user)
 	update_appearance()

-/obj/item/clothing/head/hardhat/update_icon_state()
+/obj/item/clothing/head/utility/hardhat/update_icon_state()
 	icon_state = inhand_icon_state = "hardhat[on]_[hat_type]"
 	return ..()

-/obj/item/clothing/head/hardhat/proc/turn_on(mob/user)
+/obj/item/clothing/head/utility/hardhat/proc/turn_on(mob/user)
 	set_light_on(TRUE)

-/obj/item/clothing/head/hardhat/proc/turn_off(mob/user)
+/obj/item/clothing/head/utility/hardhat/proc/turn_off(mob/user)
 	set_light_on(FALSE)

-/obj/item/clothing/head/hardhat/orange
+/obj/item/clothing/head/utility/hardhat/orange
 	icon_state = "hardhat0_orange"
 	inhand_icon_state = null
 	hat_type = "orange"
 	dog_fashion = null

-/obj/item/clothing/head/hardhat/red
+/obj/item/clothing/head/utility/hardhat/red
 	icon_state = "hardhat0_red"
 	inhand_icon_state = null
 	hat_type = "red"
@@ -64,7 +68,7 @@
 	cold_protection = HEAD
 	min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT

-/obj/item/clothing/head/hardhat/red/upgraded
+/obj/item/clothing/head/utility/hardhat/red/upgraded
 	name = "workplace-ready firefighter helmet"
 	desc = "By applying state of the art lighting technology to a fire helmet, and using photo-chemical hardening methods, this hardhat will protect you from robust workplace hazards."
 	icon_state = "hardhat0_purple"
@@ -74,7 +78,7 @@
 	custom_materials = list(/datum/material/iron = 4000, /datum/material/glass = 1000, /datum/material/plastic = 3000, /datum/material/silver = 500)
 	hat_type = "purple"

-/obj/item/clothing/head/hardhat/white
+/obj/item/clothing/head/utility/hardhat/white
 	icon_state = "hardhat0_white"
 	inhand_icon_state = null
 	hat_type = "white"
@@ -85,13 +89,13 @@
 	min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
 	dog_fashion = /datum/dog_fashion/head

-/obj/item/clothing/head/hardhat/dblue
+/obj/item/clothing/head/utility/hardhat/dblue
 	icon_state = "hardhat0_dblue"
 	inhand_icon_state = null
 	hat_type = "dblue"
 	dog_fashion = null

-/obj/item/clothing/head/hardhat/atmos
+/obj/item/clothing/head/utility/hardhat/atmos
 	icon_state = "hardhat0_atmos"
 	inhand_icon_state = null
 	hat_type = "atmos"
@@ -106,12 +110,12 @@
 	min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF

-/obj/item/clothing/head/hardhat/atmos/worn_overlays(mutable_appearance/standing, isinhands, icon_file)
+/obj/item/clothing/head/utility/hardhat/atmos/worn_overlays(mutable_appearance/standing, isinhands, icon_file)
 	. = ..()
 	if(!isinhands)
 		. += emissive_appearance(icon_file, "[icon_state]-emissive", src, alpha = src.alpha)

-/obj/item/clothing/head/hardhat/weldhat
+/obj/item/clothing/head/utility/hardhat/weldhat
 	name = "welding hard hat"
 	desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight AND welding shield! The bulb seems a little smaller though."
 	light_range = 3 //Needs a little bit of tradeoff
@@ -125,49 +129,49 @@
 	visor_flags_inv = HIDEEYES | HIDEFACE | HIDESNOUT
 	visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF

-/obj/item/clothing/head/hardhat/weldhat/Initialize(mapload)
+/obj/item/clothing/head/utility/hardhat/weldhat/Initialize(mapload)
 	. = ..()
 	update_appearance()

-/obj/item/clothing/head/hardhat/weldhat/attack_self(mob/living/user)
+/obj/item/clothing/head/utility/hardhat/weldhat/attack_self(mob/living/user)
 	toggle_helmet_light(user)

-/obj/item/clothing/head/hardhat/weldhat/AltClick(mob/user)
+/obj/item/clothing/head/utility/hardhat/weldhat/AltClick(mob/user)
 	if(user.canUseTopic(src, be_close = TRUE))
 		toggle_welding_screen(user)

-/obj/item/clothing/head/hardhat/weldhat/ui_action_click(mob/user, actiontype)
+/obj/item/clothing/head/utility/hardhat/weldhat/ui_action_click(mob/user, actiontype)
 	if(istype(actiontype, /datum/action/item_action/toggle_welding_screen))
 		toggle_welding_screen(user)
 		return

 	return ..()

-/obj/item/clothing/head/hardhat/weldhat/proc/toggle_welding_screen(mob/living/user)
+/obj/item/clothing/head/utility/hardhat/weldhat/proc/toggle_welding_screen(mob/living/user)
 	if(weldingvisortoggle(user))
 		playsound(src, 'sound/mecha/mechmove03.ogg', 50, TRUE) //Visors don't just come from nothing
 	update_appearance()

-/obj/item/clothing/head/hardhat/weldhat/worn_overlays(mutable_appearance/standing, isinhands)
+/obj/item/clothing/head/utility/hardhat/weldhat/worn_overlays(mutable_appearance/standing, isinhands)
 	. = ..()
 	if(isinhands)
 		return

-	. += mutable_appearance('icons/mob/clothing/head.dmi', "weldhelmet")
+	. += mutable_appearance('icons/mob/clothing/head/utility.dmi', "weldhelmet")
 	if(!up)
-		. += mutable_appearance('icons/mob/clothing/head.dmi', "weldvisor")
+		. += mutable_appearance('icons/mob/clothing/head/utility.dmi', "weldvisor")

-/obj/item/clothing/head/hardhat/weldhat/update_overlays()
+/obj/item/clothing/head/utility/hardhat/weldhat/update_overlays()
 	. = ..()
 	if(!up)
 		. += "weldvisor"

-/obj/item/clothing/head/hardhat/weldhat/orange
+/obj/item/clothing/head/utility/hardhat/weldhat/orange
 	icon_state = "hardhat0_orange"
 	inhand_icon_state = null
 	hat_type = "orange"

-/obj/item/clothing/head/hardhat/weldhat/white
+/obj/item/clothing/head/utility/hardhat/weldhat/white
 	desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight AND welding shield!" //This bulb is not smaller
 	icon_state = "hardhat0_white"
 	inhand_icon_state = null
@@ -179,14 +183,16 @@
 	cold_protection = HEAD
 	min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT

-/obj/item/clothing/head/hardhat/weldhat/dblue
+/obj/item/clothing/head/utility/hardhat/weldhat/dblue
 	icon_state = "hardhat0_dblue"
 	inhand_icon_state = null
 	hat_type = "dblue"

-/obj/item/clothing/head/hardhat/pumpkinhead
+/obj/item/clothing/head/utility/hardhat/pumpkinhead
 	name = "carved pumpkin"
 	desc = "A jack o' lantern! Believed to ward off evil spirits."
+	icon = 'icons/obj/clothing/head/costume.dmi'
+	worn_icon = 'icons/mob/clothing/head/costume.dmi'
 	icon_state = "hardhat0_pumpkin"
 	inhand_icon_state = null
 	hat_type = "pumpkin"
@@ -199,31 +205,31 @@
 	worn_y_offset = 1
 	dog_fashion = /datum/dog_fashion/head/pumpkin/unlit

-/obj/item/clothing/head/hardhat/pumpkinhead/set_light_on(new_value)
+/obj/item/clothing/head/utility/hardhat/pumpkinhead/set_light_on(new_value)
 	. = ..()
 	if(isnull(.))
 		return
 	update_icon(UPDATE_OVERLAYS)

-/obj/item/clothing/head/hardhat/pumpkinhead/update_overlays()
+/obj/item/clothing/head/utility/hardhat/pumpkinhead/update_overlays()
 	. = ..()
 	if(light_on)
 		. += emissive_appearance(icon, "carved_pumpkin-emissive", src, alpha = src.alpha)

-/obj/item/clothing/head/hardhat/pumpkinhead/worn_overlays(mutable_appearance/standing, isinhands, icon_file)
+/obj/item/clothing/head/utility/hardhat/pumpkinhead/worn_overlays(mutable_appearance/standing, isinhands, icon_file)
 	. = ..()
 	if(light_on && !isinhands)
 		. += emissive_appearance(icon_file, "carved_pumpkin-emissive", src, alpha = src.alpha)

-/obj/item/clothing/head/hardhat/pumpkinhead/turn_on(mob/user)
+/obj/item/clothing/head/utility/hardhat/pumpkinhead/turn_on(mob/user)
 	. = ..()
 	dog_fashion = /datum/dog_fashion/head/pumpkin/lit

-/obj/item/clothing/head/hardhat/pumpkinhead/turn_off(mob/user)
+/obj/item/clothing/head/utility/hardhat/pumpkinhead/turn_off(mob/user)
 	. = ..()
 	dog_fashion = /datum/dog_fashion/head/pumpkin/unlit

-/obj/item/clothing/head/hardhat/pumpkinhead/blumpkin
+/obj/item/clothing/head/utility/hardhat/pumpkinhead/blumpkin
 	name = "carved blumpkin"
 	desc = "A very blue jack o' lantern! Believed to ward off vengeful chemists."
 	icon_state = "hardhat0_blumpkin"
@@ -232,17 +238,19 @@
 	light_color = "#76ff8e"
 	dog_fashion = /datum/dog_fashion/head/blumpkin/unlit

-/obj/item/clothing/head/hardhat/pumpkinhead/blumpkin/turn_on(mob/user)
+/obj/item/clothing/head/utility/hardhat/pumpkinhead/blumpkin/turn_on(mob/user)
 	. = ..()
 	dog_fashion = /datum/dog_fashion/head/blumpkin/lit

-/obj/item/clothing/head/hardhat/pumpkinhead/blumpkin/turn_off(mob/user)
+/obj/item/clothing/head/utility/hardhat/pumpkinhead/blumpkin/turn_off(mob/user)
 	. = ..()
 	dog_fashion = /datum/dog_fashion/head/blumpkin/unlit

-/obj/item/clothing/head/hardhat/reindeer
+/obj/item/clothing/head/utility/hardhat/reindeer
 	name = "novelty reindeer hat"
 	desc = "Some fake antlers and a very fake red nose."
+	icon = 'icons/obj/clothing/head/costume.dmi'
+	worn_icon = 'icons/mob/clothing/head/costume.dmi'
 	icon_state = "hardhat0_reindeer"
 	inhand_icon_state = null
 	hat_type = "reindeer"
@@ -1,4 +1,8 @@
-/obj/item/clothing/head/centhat
+/obj/item/clothing/head/hats
+	icon = 'icons/obj/clothing/head/hats.dmi'
+	worn_icon = 'icons/mob/clothing/head/hats.dmi'
+
+/obj/item/clothing/head/hats/centhat
 	name = "\improper CentCom hat"
 	icon_state = "centcom"
 	desc = "It's good to be emperor."
@@ -7,7 +11,7 @@
 	armor = list(MELEE = 30, BULLET = 15, LASER = 30, ENERGY = 40, BOMB = 25, BIO = 0, FIRE = 50, ACID = 50)
 	strip_delay = 80

-/obj/item/clothing/head/constable
+/obj/item/clothing/head/costume/constable
 	name = "constable helmet"
 	desc = "A british looking helmet."
 	icon_state = "constable"
@@ -15,47 +19,47 @@
 	custom_price = PAYCHECK_COMMAND * 1.5
 	worn_y_offset = 4

-/obj/item/clothing/head/spacepolice
+/obj/item/clothing/head/costume/spacepolice
 	name = "space police cap"
 	desc = "A blue cap for patrolling the daily beat."
 	icon_state = "policecap_families"
 	inhand_icon_state = null

-/obj/item/clothing/head/canada
+/obj/item/clothing/head/costume/canada
 	name = "striped red tophat"
 	desc = "It smells like fresh donut holes. / <i>Il sent comme des trous de beignets frais.</i>"
 	icon_state = "canada"
 	inhand_icon_state = null

-/obj/item/clothing/head/redcoat
+/obj/item/clothing/head/costume/redcoat
 	name = "redcoat's hat"
 	icon_state = "redcoat"
 	desc = "<i>'I guess it's a redhead.'</i>"

-/obj/item/clothing/head/mailman
+/obj/item/clothing/head/costume/mailman
 	name = "mailman's hat"
 	icon_state = "mailman"
 	desc = "<i>'Right-on-time'</i> mail service head wear."

-/obj/item/clothing/head/plaguedoctorhat
+/obj/item/clothing/head/bio_hood/plague
 	name = "plague doctor's hat"
 	desc = "These were once used by plague doctors. They're pretty much useless."
 	icon_state = "plaguedoctor"
 	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 100, FIRE = 0, ACID = 0)

-/obj/item/clothing/head/nursehat
+/obj/item/clothing/head/costume/nursehat
 	name = "nurse's hat"
 	desc = "It allows quick identification of trained medical personnel."
 	icon_state = "nursehat"
 	dog_fashion = /datum/dog_fashion/head/nurse

-/obj/item/clothing/head/bowler
+/obj/item/clothing/head/hats/bowler
 	name = "bowler-hat"
 	desc = "Gentleman, elite aboard!"
 	icon_state = "bowler"
 	inhand_icon_state = null

-/obj/item/clothing/head/bearpelt
+/obj/item/clothing/head/costume/bearpelt
 	name = "bear pelt hat"
 	desc = "Fuzzy."
 	icon_state = "bearpelt"
@@ -70,46 +74,53 @@
 	greyscale_colors = "#8F7654"
 	inhand_icon_state = null

-/obj/item/clothing/head/hunter
+/obj/item/clothing/head/cowboy
 	name = "bounty hunting hat"
 	desc = "Ain't nobody gonna cheat the hangman in my town."
+	icon = 'icons/obj/clothing/head/cowboy.dmi'
+	worn_icon = 'icons/mob/clothing/head/cowboy.dmi'
 	icon_state = "cowboy"
 	worn_icon_state = "hunter"
 	inhand_icon_state = null
 	armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 15, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0)
 	resistance_flags = FIRE_PROOF | ACID_PROOF

-/obj/item/clothing/head/cowboy_hat_black
+/obj/item/clothing/head/cowboy/black
 	name = "desperado hat"
 	desc = "People with ropes around their necks don't always hang."
 	icon_state = "cowboy_hat_black"
+	worn_icon_state = "cowboy_hat_black"
 	inhand_icon_state = "cowboy_hat_black"

-/obj/item/clothing/head/cowboy_hat_white
+/obj/item/clothing/head/cowboy/white
 	name = "ten-gallon hat"
 	desc = "There are two kinds of people in the world: those with guns and those that dig. You dig?"
 	icon_state = "cowboy_hat_white"
+	worn_icon_state = "cowboy_hat_white"
 	inhand_icon_state = "cowboy_hat_white"

-/obj/item/clothing/head/cowboy_hat_grey
+/obj/item/clothing/head/cowboy/grey
 	name = "drifter hat"
 	desc = "The hat for an assistant with no name."
 	icon_state = "cowboy_hat_grey"
+	worn_icon_state = "cowboy_hat_grey"
 	inhand_icon_state = "cowboy_hat_grey"

-/obj/item/clothing/head/cowboy_hat_red
+/obj/item/clothing/head/cowboy/red
 	name = "deputy hat"
 	desc = "Don't let the garish coloration fool you. This hat has seen some terrible things."
 	icon_state = "cowboy_hat_red"
+	worn_icon_state = "cowboy_hat_red"
 	inhand_icon_state = "cowboy_hat_red"

-/obj/item/clothing/head/cowboy_hat_brown
+/obj/item/clothing/head/cowboy/brown
 	name = "sheriff hat"
 	desc = "Reach for the skies, pardner."
 	icon_state = "cowboy_hat_brown"
+	worn_icon_state = "cowboy_hat_brown"
 	inhand_icon_state = "cowboy_hat_brown"

-/obj/item/clothing/head/santa
+/obj/item/clothing/head/costume/santa
 	name = "santa hat"
 	desc = "On the first day of christmas my employer gave to me!"
 	icon_state = "santahatnorm"
@@ -118,72 +129,71 @@
 	min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
 	dog_fashion = /datum/dog_fashion/head/santa

-/obj/item/clothing/head/jester
+/obj/item/clothing/head/costume/jester
 	name = "jester hat"
 	desc = "A hat with bells, to add some merriness to the suit."
 	icon_state = "jester_hat"

-
-/obj/item/clothing/head/jester/alt
+/obj/item/clothing/head/costume/jester/alt
 	icon_state = "jester2"

-/obj/item/clothing/head/rice_hat
+/obj/item/clothing/head/costume/rice_hat
 	name = "rice hat"
 	desc = "Welcome to the rice fields, motherfucker."
 	icon_state = "rice_hat"

-/obj/item/clothing/head/lizard
+/obj/item/clothing/head/costume/lizard
 	name = "lizardskin cloche hat"
 	desc = "How many lizards died to make this hat? Not enough."
 	icon_state = "lizard"

-/obj/item/clothing/head/scarecrow_hat
+/obj/item/clothing/head/costume/scarecrow_hat
 	name = "scarecrow hat"
 	desc = "A simple straw hat."
 	icon_state = "scarecrow_hat"

-/obj/item/clothing/head/pharaoh
+/obj/item/clothing/head/costume/pharaoh
 	name = "pharaoh hat"
 	desc = "Walk like an Egyptian."
 	icon_state = "pharoah_hat"
 	inhand_icon_state = null

-/obj/item/clothing/head/nemes
+/obj/item/clothing/head/costume/nemes
 	name = "headdress of Nemes"
 	desc = "Lavish space tomb not included."
 	icon_state = "nemes_headdress"

-/obj/item/clothing/head/delinquent
+/obj/item/clothing/head/costume/delinquent
 	name = "delinquent hat"
 	desc = "Good grief."
 	icon_state = "delinquent"

-/obj/item/clothing/head/intern
+/obj/item/clothing/head/hats/intern
 	name = "\improper CentCom Head Intern beancap"
 	desc = "A horrifying mix of beanie and softcap in CentCom green. You'd have to be pretty desperate for power over your peers to agree to wear this."
 	icon_state = "intern_hat"
 	inhand_icon_state = null

-/obj/item/clothing/head/coordinator
+/obj/item/clothing/head/hats/coordinator
 	name = "coordinator cap"
 	desc = "A cap for a party coordinator, stylish!."
 	icon_state = "capcap"
 	inhand_icon_state = "that"
 	armor = list(MELEE = 25, BULLET = 15, LASER = 25, ENERGY = 35, BOMB = 25, BIO = 0, FIRE = 50, ACID = 50)

-/obj/item/clothing/head/jackbros
+/obj/item/clothing/head/costume/jackbros
 	name = "frosty hat"
 	desc = "Hee-ho!"
 	icon_state = "JackFrostHat"
 	inhand_icon_state = null

-/obj/item/clothing/head/weddingveil
+/obj/item/clothing/head/costume/weddingveil
 	name = "wedding veil"
 	desc = "A gauzy white veil."
 	icon_state = "weddingveil"
 	inhand_icon_state = null

-/obj/item/clothing/head/centcom_cap
+/obj/item/clothing/head/hats/centcom_cap
 	name = "\improper CentCom commander cap"
 	icon_state = "centcom_cap"
 	desc = "Worn by the finest of CentCom commanders. Inside the lining of the cap, lies two faint initials."
@@ -192,13 +202,13 @@
 	armor = list(MELEE = 30, BULLET = 15, LASER = 30, ENERGY = 40, BOMB = 25, BIO = 0, FIRE = 50, ACID = 50)
 	strip_delay = (8 SECONDS)

-/obj/item/clothing/head/human_leather
+/obj/item/clothing/head/fedora/human_leather
 	name = "human skin hat"
 	desc = "This will scare them. All will know my power."
 	icon_state = "human_leather"
 	inhand_icon_state = null

-/obj/item/clothing/head/ushanka
+/obj/item/clothing/head/costume/ushanka
 	name = "ushanka"
 	desc = "Perfect for winter in Siberia, da?"
 	icon_state = "ushankadown"
@@ -213,7 +223,7 @@
 	///Sprite visible when the ushanka flaps are folded down.
 	var/downsprite = "ushankadown"

-/obj/item/clothing/head/ushanka/attack_self(mob/user)
+/obj/item/clothing/head/costume/ushanka/attack_self(mob/user)
 	if(earflaps)
 		icon_state = upsprite
 		inhand_icon_state = upsprite
@@ -224,12 +234,12 @@
 		to_chat(user, span_notice("You lower the ear flaps on the ushanka."))
 	earflaps = !earflaps

-/obj/item/clothing/head/nightcap/blue
+/obj/item/clothing/head/costume/nightcap/blue
 	name = "blue nightcap"
 	desc = "A blue nightcap for all the dreamers and snoozers out there."
 	icon_state = "sleep_blue"

-/obj/item/clothing/head/nightcap/red
+/obj/item/clothing/head/costume/nightcap/red
 	name = "red nightcap"
 	desc = "A red nightcap for all the sleepyheads and dozers out there."
 	icon_state = "sleep_red"
@@ -1,6 +1,8 @@
 /obj/item/clothing/head/helmet
 	name = "helmet"
 	desc = "Standard Security gear. Protects the head from impacts."
+	icon = 'icons/obj/clothing/head/helmet.dmi'
+	worn_icon = 'icons/mob/clothing/head/helmet.dmi'
 	icon_state = "helmet"
 	inhand_icon_state = "helmet"
 	armor = list(MELEE = 35, BULLET = 30, LASER = 30,ENERGY = 40, BOMB = 25, BIO = 0, FIRE = 50, ACID = 50, WOUND = 10)
@@ -5,7 +5,7 @@
 #define DRILL_CANADIAN "canadian"

 //Chef
-/obj/item/clothing/head/chefhat
+/obj/item/clothing/head/utility/chefhat
 	name = "chef's hat"
 	inhand_icon_state = "chefhat"
 	icon_state = "chef"
@@ -17,16 +17,16 @@
 	///the chance that the movements of a mouse inside of this hat get relayed to the human wearing the hat
 	var/mouse_control_probability = 20

-/obj/item/clothing/head/chefhat/Initialize(mapload)
+/obj/item/clothing/head/utility/chefhat/Initialize(mapload)
 	. = ..()

 	create_storage(type = /datum/storage/pockets/chefhat)

-/obj/item/clothing/head/chefhat/i_am_assuming_direct_control
+/obj/item/clothing/head/utility/chefhat/i_am_assuming_direct_control
 	desc = "The commander in chef's head wear. Upon closer inspection, there seem to be dozens of tiny levers, buttons, dials, and screens inside of this hat. What the hell...?"
 	mouse_control_probability = 100

-/obj/item/clothing/head/chefhat/suicide_act(mob/user)
+/obj/item/clothing/head/utility/chefhat/suicide_act(mob/user)
 	user.visible_message(span_suicide("[user] is donning [src]! It looks like [user.p_theyre()] trying to become a chef."))
 	user.say("Bork Bork Bork!", forced = "chef hat suicide")
 	sleep(20)
@@ -35,7 +35,7 @@
 	playsound(user, 'sound/machines/ding.ogg', 50, TRUE)
 	return(FIRELOSS)

-/obj/item/clothing/head/chefhat/relaymove(mob/living/user, direction)
+/obj/item/clothing/head/utility/chefhat/relaymove(mob/living/user, direction)
 	if(!ismouse(user) || !isliving(loc) || !prob(mouse_control_probability))
 		return
 	var/mob/living/L = loc
@@ -44,7 +44,7 @@
 	step_towards(L, get_step(L, direction))

 //Captain
-/obj/item/clothing/head/caphat
+/obj/item/clothing/head/hats/caphat
 	name = "captain's hat"
 	desc = "It's good being the king."
 	icon_state = "captain"
@@ -55,11 +55,10 @@
 	dog_fashion = /datum/dog_fashion/head/captain

 //Captain: This is no longer space-worthy
-/obj/item/clothing/head/caphat/parade
+/obj/item/clothing/head/hats/caphat/parade
 	name = "captain's parade cap"
 	desc = "Worn only by Captains with an abundance of class."
 	icon_state = "capcap"
-
 	dog_fashion = null

 /obj/item/clothing/head/caphat/beret
@@ -71,7 +70,7 @@
 	greyscale_colors = "#0070B7#FFCE5B"

 //Head of Personnel
-/obj/item/clothing/head/hopcap
+/obj/item/clothing/head/hats/hopcap
 	name = "head of personnel's cap"
 	icon_state = "hopcap"
 	desc = "The symbol of true bureaucratic micromanagement."
@@ -79,14 +78,14 @@
 	dog_fashion = /datum/dog_fashion/head/hop

 //Chaplain
-/obj/item/clothing/head/nun_hood
+/obj/item/clothing/head/chaplain/nun_hood
 	name = "nun hood"
 	desc = "Maximum piety in this star system."
 	icon_state = "nun_hood"
 	flags_inv = HIDEHAIR
 	flags_cover = HEADCOVERSEYES

-/obj/item/clothing/head/bishopmitre
+/obj/item/clothing/head/chaplain/bishopmitre
 	name = "bishop mitre"
 	desc = "An opulent hat that functions as a radio to God. Or as a lightning rod, depending on who you ask."
 	icon_state = "bishopmitre"
@@ -124,32 +123,26 @@
 	else
 		to_chat(user, span_warning("You just took a candy corn! You should wait a couple minutes, lest you burn through your stash."))

-
 //Mime
-
 /obj/item/clothing/head/beret
 	name = "beret"
 	desc = "A beret, a mime's favorite headwear."
 	icon_state = "beret"
 	dog_fashion = /datum/dog_fashion/head/beret
-
 	greyscale_config = /datum/greyscale_config/beret
 	greyscale_config_worn = /datum/greyscale_config/beret/worn
 	greyscale_colors = "#972A2A"
 	flags_1 = IS_PLAYER_COLORABLE_1

-
 //Security
-
-/obj/item/clothing/head/hos
+/obj/item/clothing/head/hats/hos
 	name = "head of security cap"
 	desc = "The robust standard-issue cap of the Head of Security. For showing the officers who's in charge."
 	armor = list(MELEE = 40, BULLET = 30, LASER = 25, ENERGY = 35, BOMB = 25, BIO = 10, FIRE = 50, ACID = 60, WOUND = 10)
 	icon_state = "hoscap"
 	strip_delay = 80

-
-/obj/item/clothing/head/hos/syndicate
+/obj/item/clothing/head/hats/hos/syndicate
 	name = "syndicate cap"
 	desc = "A black cap fit for a high ranking syndicate officer."

@@ -170,7 +163,7 @@
 	name = "syndicate beret"
 	desc = "A black beret with thick armor padding inside. Stylish and robust."

-/obj/item/clothing/head/warden
+/obj/item/clothing/head/hats/warden
 	name = "warden's police hat"
 	desc = "It's a special armored hat issued to the Warden of a security force. Protects the head from impacts."
 	icon_state = "policehelm"
@@ -178,11 +171,11 @@
 	strip_delay = 60
 	dog_fashion = /datum/dog_fashion/head/warden

-/obj/item/clothing/head/warden/police
+/obj/item/clothing/head/hats/warden/police
 	name = "police officer's hat"
 	desc = "A police officer's hat. This hat emphasizes that you are THE LAW."

-/obj/item/clothing/head/warden/red
+/obj/item/clothing/head/hats/warden/red
 	name = "warden's hat"
 	desc = "A warden's red hat. Looking at it gives you the feeling of wanting to keep people in cells for as long as possible."
 	icon_state = "wardenhat"
@@ -190,7 +183,7 @@
 	strip_delay = 60
 	dog_fashion = /datum/dog_fashion/head/warden_red

-/obj/item/clothing/head/warden/drill
+/obj/item/clothing/head/hats/warden/drill
 	name = "warden's campaign hat"
 	desc = "A special armored campaign hat with the security insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."
 	icon_state = "wardendrill"
@@ -198,7 +191,7 @@
 	dog_fashion = null
 	var/mode = DRILL_DEFAULT

-/obj/item/clothing/head/warden/drill/screwdriver_act(mob/living/carbon/human/user, obj/item/I)
+/obj/item/clothing/head/hats/warden/drill/screwdriver_act(mob/living/carbon/human/user, obj/item/I)
 	if(..())
 		return TRUE
 	switch(mode)
@@ -215,25 +208,25 @@
 			to_chat(user, span_danger("You adjust voice circuit but nothing happens, probably because it's broken."))
 	return TRUE

-/obj/item/clothing/head/warden/drill/wirecutter_act(mob/living/user, obj/item/I)
+/obj/item/clothing/head/hats/warden/drill/wirecutter_act(mob/living/user, obj/item/I)
 	..()
 	if(mode != DRILL_CANADIAN)
 		to_chat(user, span_danger("You broke the voice circuit!"))
 		mode = DRILL_CANADIAN
 	return TRUE

-/obj/item/clothing/head/warden/drill/equipped(mob/M, slot)
+/obj/item/clothing/head/hats/warden/drill/equipped(mob/M, slot)
 	. = ..()
 	if (slot & ITEM_SLOT_HEAD)
 		RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech)
 	else
 		UnregisterSignal(M, COMSIG_MOB_SAY)

-/obj/item/clothing/head/warden/drill/dropped(mob/M)
+/obj/item/clothing/head/hats/warden/drill/dropped(mob/M)
 	. = ..()
 	UnregisterSignal(M, COMSIG_MOB_SAY)

-/obj/item/clothing/head/warden/drill/proc/handle_speech(datum/source, list/speech_args)
+/obj/item/clothing/head/hats/warden/drill/proc/handle_speech(datum/source, list/speech_args)
 	SIGNAL_HANDLER
 	var/message = speech_args[SPEECH_MESSAGE]
 	if(message[1] != "*")
@@ -271,7 +264,6 @@
 	dog_fashion = null
 	flags_1 = NONE

-
 /obj/item/clothing/head/beret/sec/navywarden
 	name = "warden's beret"
 	desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class."
@@ -282,9 +274,7 @@
 	desc = "A special beret with the security insignia emblazoned on it. For officers with class."
 	greyscale_colors = "#3C485A#FF0000"

-
 //Science
-
 /obj/item/clothing/head/beret/science
 	name = "science beret"
 	desc = "A science-themed beret for our hardworking scientists."
@@ -298,9 +288,7 @@
 	greyscale_config_worn = /datum/greyscale_config/beret_badge/worn
 	greyscale_colors = "#8D008F#FFFFFF"

-
 //Medical
-
 /obj/item/clothing/head/beret/medical
 	name = "medical beret"
 	desc = "A medical-flavored beret for the doctor in you!"
@@ -317,29 +305,27 @@
 	desc = "A beret in a distinct surgical turquoise!"
 	greyscale_colors = "#5EB8B8"

-/obj/item/clothing/head/surgerycap
+/obj/item/clothing/head/utility/surgerycap
 	name = "blue surgery cap"
 	icon_state = "surgicalcap"
 	desc = "A blue medical surgery cap to prevent the surgeon's hair from entering the insides of the patient!"

-/obj/item/clothing/head/surgerycap/purple
+/obj/item/clothing/head/utility/surgerycap/purple
 	name = "burgundy surgery cap"
 	icon_state = "surgicalcapwine"
 	desc = "A burgundy medical surgery cap to prevent the surgeon's hair from entering the insides of the patient!"

-/obj/item/clothing/head/surgerycap/green
+/obj/item/clothing/head/utility/surgerycap/green
 	name = "green surgery cap"
 	icon_state = "surgicalcapgreen"
 	desc = "A green medical surgery cap to prevent the surgeon's hair from entering the insides of the patient!"

-/obj/item/clothing/head/surgerycap/cmo
+/obj/item/clothing/head/utility/surgerycap/cmo
 	name = "turquoise surgery cap"
 	icon_state = "surgicalcapcmo"
 	desc = "The CMO's medical surgery cap to prevent their hair from entering the insides of the patient!"

-
 //Engineering
-
 /obj/item/clothing/head/beret/engi
 	name = "engineering beret"
 	desc = "Might not protect you from radiation, but definitely will protect you from looking unfashionable!"
@@ -352,26 +338,20 @@
 	greyscale_colors = "#FFDE15"
 	flags_1 = NONE

-
 //Cargo
-
 /obj/item/clothing/head/beret/cargo
 	name = "cargo beret"
 	desc = "No need to compensate when you can wear this beret!"
 	greyscale_colors = "#c99840"
 	flags_1 = NONE

-
 //Curator
-
 /obj/item/clothing/head/fedora/curator
 	name = "treasure hunter's fedora"
 	desc = "You got red text today kid, but it doesn't mean you have to like it."
 	icon_state = "curator"

-
 //Miscellaneous
-
 /obj/item/clothing/head/beret/black
 	name = "black beret"
 	desc = "A black beret, perfect for war veterans and dark, brooding, anti-hero mimes."
@@ -397,9 +377,7 @@
 	. = ..()
 	ADD_TRAIT(src, TRAIT_NODROP, HIGHLANDER)

-
 //CentCom
-
 /obj/item/clothing/head/beret/centcom_formal
 	name = "\improper CentCom Formal Beret"
 	desc = "Sometimes, a compromise between fashion and defense needs to be made. Thanks to Nanotrasen's most recent nano-fabric durability enhancements, this time, it's not the case."
@@ -1,4 +1,4 @@
-/obj/item/clothing/head/justice
+/obj/item/clothing/head/costume/justice
 	name = "justice hat"
 	desc = "Fight for what's righteous!"
 	icon_state = "justicered"
@@ -7,18 +7,18 @@
 	flags_inv = HIDEHAIR|HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDESNOUT
 	flags_cover = HEADCOVERSEYES

-/obj/item/clothing/head/justice/blue
+/obj/item/clothing/head/costume/justice/blue
 	icon_state = "justiceblue"
 	inhand_icon_state = null

-/obj/item/clothing/head/justice/yellow
+/obj/item/clothing/head/costume/justice/yellow
 	icon_state = "justiceyellow"
 	inhand_icon_state = null

-/obj/item/clothing/head/justice/green
+/obj/item/clothing/head/costume/justice/green
 	icon_state = "justicegreen"
 	inhand_icon_state = null

-/obj/item/clothing/head/justice/pink
+/obj/item/clothing/head/costume/justice/pink
 	icon_state = "justicepink"
 	inhand_icon_state = null
@@ -4,7 +4,6 @@
 /obj/item/clothing/head/helmet/monkey_sentience
 	name = "monkey mind magnification helmet"
 	desc = "A fragile, circuitry embedded helmet for boosting the intelligence of a monkey to a higher level. You see several warning labels..."
-
 	icon_state = "monkeymind"
 	inhand_icon_state = null
 	strip_delay = 100
@@ -1,10 +1,10 @@
-/obj/item/clothing/head/papersack
+/obj/item/clothing/head/costume/papersack
 	name = "paper sack hat"
 	desc = "A paper sack with crude holes cut out for eyes. Useful for hiding one's identity or ugliness."
 	icon_state = "papersack"
 	flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS|HIDESNOUT

-/obj/item/clothing/head/papersack/smiley
+/obj/item/clothing/head/costume/papersack/smiley
 	name = "paper sack hat"
 	desc = "A paper sack with crude holes cut out for eyes and a sketchy smile drawn on the front. Not creepy at all."
 	icon_state = "papersack_smile"
@@ -1,14 +1,14 @@
-/obj/item/clothing/head/pirate
+/obj/item/clothing/head/costume/pirate
 	name = "pirate hat"
 	desc = "Yarr."
 	icon_state = "pirate"
 	inhand_icon_state = null
 	dog_fashion = /datum/dog_fashion/head/pirate

-/obj/item/clothing/head/pirate
+/obj/item/clothing/head/costume/pirate
 	var/datum/language/piratespeak/L = new

-/obj/item/clothing/head/pirate/equipped(mob/user, slot)
+/obj/item/clothing/head/costume/pirate/equipped(mob/user, slot)
 	. = ..()
 	if(!ishuman(user))
 		return
@@ -16,7 +16,7 @@
 		user.grant_language(/datum/language/piratespeak/, TRUE, TRUE, LANGUAGE_HAT)
 		to_chat(user, span_boldnotice("You suddenly know how to speak like a pirate!"))

-/obj/item/clothing/head/pirate/dropped(mob/user)
+/obj/item/clothing/head/costume/pirate/dropped(mob/user)
 	. = ..()
 	if(!ishuman(user))
 		return
@@ -25,24 +25,23 @@
 		user.remove_language(/datum/language/piratespeak/, TRUE, TRUE, LANGUAGE_HAT)
 		to_chat(user, span_boldnotice("You can no longer speak like a pirate."))

-/obj/item/clothing/head/pirate/armored
+/obj/item/clothing/head/costume/pirate/armored
 	armor = list(MELEE = 30, BULLET = 50, LASER = 30,ENERGY = 40, BOMB = 30, BIO = 30, FIRE = 60, ACID = 75)
 	strip_delay = 40
 	equip_delay_other = 20

-/obj/item/clothing/head/pirate/captain
+/obj/item/clothing/head/costume/pirate/captain
 	name = "pirate captain hat"
 	icon_state = "hgpiratecap"
 	inhand_icon_state = null

-/obj/item/clothing/head/bandana
+/obj/item/clothing/head/costume/pirate/bandana
 	name = "pirate bandana"
 	desc = "Yarr."
 	icon_state = "bandana"
 	inhand_icon_state = null

-
-/obj/item/clothing/head/bandana/armored
+/obj/item/clothing/head/costume/pirate/bandana/armored
 	armor = list(MELEE = 30, BULLET = 50, LASER = 30,ENERGY = 40, BOMB = 30, BIO = 30, FIRE = 60, ACID = 75)
 	strip_delay = 40
 	equip_delay_other = 20
@@ -1,34 +1,38 @@
-/obj/item/clothing/head/clownmitre
+/obj/item/clothing/head/chaplain/
+	icon = 'icons/obj/clothing/head/chaplain.dmi'
+	worn_icon = 'icons/mob/clothing/head/chaplain.dmi'
+
+/obj/item/clothing/head/chaplain/clownmitre
 	name = "Hat of the Honkmother"
 	desc = "It's hard for parishoners to see a banana peel on the floor when they're looking up at your glorious chapeau."
 	icon_state = "clownmitre"

-/obj/item/clothing/head/kippah
+/obj/item/clothing/head/chaplain/kippah
 	name = "kippah"
 	desc = "Signals that you follow the Jewish Halakha. Keeps the head covered and the soul extra-Orthodox."
 	icon_state = "kippah"

-/obj/item/clothing/head/medievaljewhat
+/obj/item/clothing/head/chaplain/medievaljewhat
 	name = "medieval Jewish hat"
 	desc = "A silly looking hat, intended to be placed on the heads of the station's oppressed religious minorities."
 	icon_state = "medievaljewhat"

-/obj/item/clothing/head/taqiyahwhite
+/obj/item/clothing/head/chaplain/taqiyah/white
 	name = "white taqiyah"
 	desc = "An extra-mustahabb way of showing your devotion to Allah."
 	icon_state = "taqiyahwhite"

-/obj/item/clothing/head/taqiyahwhite/Initialize(mapload)
+/obj/item/clothing/head/chaplain/taqiyah/white/Initialize(mapload)
 	. = ..()
-	
+
 	create_storage(type = /datum/storage/pockets/small)

-/obj/item/clothing/head/taqiyahred
+/obj/item/clothing/head/chaplain/taqiyah/red
 	name = "red taqiyah"
 	desc = "An extra-mustahabb way of showing your devotion to Allah."
 	icon_state = "taqiyahred"

-/obj/item/clothing/head/taqiyahred/Initialize(mapload)
+/obj/item/clothing/head/chaplain/taqiyah/red/Initialize(mapload)
 	. = ..()
-	
+
 	create_storage(type = /datum/storage/pockets/small)
@@ -1,6 +1,8 @@
 /obj/item/clothing/head/soft
 	name = "cargo cap"
 	desc = "It's a baseball hat in a tasteful brown colour."
+	icon = 'icons/obj/clothing/head/hats.dmi'
+	worn_icon = 'icons/mob/clothing/head/hats.dmi'
 	icon_state = "cargosoft"
 	inhand_icon_state = "greyscale_softcap" //todo wip
 	var/soft_type = "cargo"
@@ -1,5 +1,6 @@
-/obj/item/clothing/head/sombrero
+/obj/item/clothing/head/costume/sombrero
 	name = "sombrero"
+	icon = 'icons/obj/clothing/head/sombrero.dmi'
 	icon_state = "sombrero"
 	inhand_icon_state = "sombrero"
 	desc = "You can practically taste the fiesta."
@@ -12,7 +13,7 @@
 	greyscale_config_inhand_left = /datum/greyscale_config/sombrero/lefthand
 	greyscale_config_inhand_right = /datum/greyscale_config/sombrero/righthand

-/obj/item/clothing/head/sombrero/green
+/obj/item/clothing/head/costume/sombrero/green
 	name = "green sombrero"
 	desc = "As elegant as a dancing cactus."
 	flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
@@ -20,7 +21,7 @@
 	greyscale_colors = "#13d968#ffffff"
 	flags_1 = IS_PLAYER_COLORABLE_1

-/obj/item/clothing/head/sombrero/shamebrero
+/obj/item/clothing/head/costume/sombrero/shamebrero
 	name = "shamebrero"
 	icon_state = "shamebrero"
 	desc = "Once it's on, it never comes off."
@@ -28,6 +29,6 @@
 	greyscale_colors = "#d565d3#f8db18"
 	flags_1 = IS_PLAYER_COLORABLE_1

-/obj/item/clothing/head/sombrero/shamebrero/Initialize(mapload)
+/obj/item/clothing/head/costume/sombrero/shamebrero/Initialize(mapload)
 	. = ..()
 	ADD_TRAIT(src, TRAIT_NODROP, SHAMEBRERO_TRAIT)
@@ -1,4 +1,4 @@
-/obj/item/clothing/head/foilhat
+/obj/item/clothing/head/costume/foilhat
 	name = "tinfoil hat"
 	desc = "Thought control rays, psychotronic scanning. Don't mind that, I'm protected cause I made this hat."
 	icon_state = "foilhat"
@@ -9,7 +9,7 @@
 	var/datum/brain_trauma/mild/phobia/conspiracies/paranoia
 	var/warped = FALSE

-/obj/item/clothing/head/foilhat/Initialize(mapload)
+/obj/item/clothing/head/costume/foilhat/Initialize(mapload)
 	. = ..()
 	if(!warped)
 		AddComponent(/datum/component/anti_magic, \
@@ -22,7 +22,7 @@
 	else
 		warp_up()

-/obj/item/clothing/head/foilhat/equipped(mob/living/carbon/human/user, slot)
+/obj/item/clothing/head/costume/foilhat/equipped(mob/living/carbon/human/user, slot)
 	. = ..()
 	if(!(slot & ITEM_SLOT_HEAD) || warped)
 		return
@@ -35,7 +35,7 @@
 	user.gain_trauma(paranoia, TRAUMA_RESILIENCE_MAGIC)
 	to_chat(user, span_warning("As you don the foiled hat, an entire world of conspiracy theories and seemingly insane ideas suddenly rush into your mind. What you once thought unbelievable suddenly seems.. undeniable. Everything is connected and nothing happens just by accident. You know too much and now they're out to get you. "))

-/obj/item/clothing/head/foilhat/MouseDrop(atom/over_object)
+/obj/item/clothing/head/costume/foilhat/MouseDrop(atom/over_object)
 	//God Im sorry
 	if(!warped && iscarbon(usr))
 		var/mob/living/carbon/C = usr
@@ -44,17 +44,17 @@
 			return
 	return ..()

-/obj/item/clothing/head/foilhat/dropped(mob/user)
+/obj/item/clothing/head/costume/foilhat/dropped(mob/user)
 	. = ..()
 	if(paranoia)
 		QDEL_NULL(paranoia)
 	UnregisterSignal(user, COMSIG_HUMAN_SUICIDE_ACT)

 /// When the foilhat is drained an anti-magic charge.
-/obj/item/clothing/head/foilhat/proc/drain_antimagic(mob/user)
+/obj/item/clothing/head/costume/foilhat/proc/drain_antimagic(mob/user)
 	to_chat(user, span_warning("[src] crumples slightly. Something is trying to get inside your mind!"))

-/obj/item/clothing/head/foilhat/proc/warp_up()
+/obj/item/clothing/head/costume/foilhat/proc/warp_up()
 	name = "scorched tinfoil hat"
 	desc = "A badly warped up hat. Quite unprobable this will still work against any of fictional and contemporary dangers it used to."
 	warped = TRUE
@@ -69,7 +69,7 @@
 	if(target.stat < UNCONSCIOUS)
 		to_chat(target, span_warning("Your zealous conspirationism rapidly dissipates as the donned hat warps up into a ruined mess. All those theories starting to sound like nothing but a ridicolous fanfare."))

-/obj/item/clothing/head/foilhat/attack_hand(mob/user, list/modifiers)
+/obj/item/clothing/head/costume/foilhat/attack_hand(mob/user, list/modifiers)
 	if(!warped && iscarbon(user))
 		var/mob/living/carbon/wearer = user
 		if(src == wearer.head)
@@ -77,17 +77,17 @@
 			return
 	return ..()

-/obj/item/clothing/head/foilhat/microwave_act(obj/machinery/microwave/M)
+/obj/item/clothing/head/costume/foilhat/microwave_act(obj/machinery/microwave/M)
 	. = ..()
 	if(!warped)
 		warp_up()

-/obj/item/clothing/head/foilhat/proc/call_suicide(datum/source)
+/obj/item/clothing/head/costume/foilhat/proc/call_suicide(datum/source)
 	SIGNAL_HANDLER
 	INVOKE_ASYNC(src, .proc/suicide_act, source) //SIGNAL_HANDLER doesn't like things waiting; INVOKE_ASYNC bypasses that
 	return OXYLOSS

-/obj/item/clothing/head/foilhat/suicide_act(mob/living/user)
+/obj/item/clothing/head/costume/foilhat/suicide_act(mob/living/user)
 	user.visible_message(span_suicide("[user] gets a crazed look in [user.p_their()] eyes! [capitalize(user.p_they())] [user.p_have()] witnessed the truth, and try to commit suicide!"))
 	var/static/list/conspiracy_line = list(
 		";THEY'RE HIDING CAMERAS IN THE CEILINGS! THEY WITNESS EVERYTHING WE DO!!",
@@ -1,6 +1,6 @@
 #define RABBIT_CD_TIME 30 SECONDS

-/obj/item/clothing/head/that
+/obj/item/clothing/head/hats/tophat
 	name = "top-hat"
 	desc = "It's an amish looking hat."
 	icon_state = "tophat"
@@ -10,12 +10,12 @@
 	/// Cooldown for how often we can pull rabbits out of here
 	COOLDOWN_DECLARE(rabbit_cooldown)

-/obj/item/clothing/head/that/attackby(obj/item/hitby_item, mob/user, params)
+/obj/item/clothing/head/hats/tophat/attackby(obj/item/hitby_item, mob/user, params)
 	. = ..()
 	if(istype(hitby_item, /obj/item/gun/magic/wand))
 		abracadabra(hitby_item, user)

-/obj/item/clothing/head/that/proc/abracadabra(obj/item/hitby_wand, mob/magician)
+/obj/item/clothing/head/hats/tophat/proc/abracadabra(obj/item/hitby_wand, mob/magician)
 	if(!COOLDOWN_FINISHED(src, rabbit_cooldown))
 		to_chat(magician, span_warning("You can't find another rabbit in [src]! Seems another hasn't gotten lost in there yet..."))
 		return
@@ -1,4 +1,4 @@
-/obj/item/clothing/head/welding
+/obj/item/clothing/head/utility/welding
 	name = "welding helmet"
 	desc = "A head-mounted face cover designed to protect the wearer completely from space-arc eye."
 	icon_state = "welding"
@@ -17,7 +17,7 @@
 	resistance_flags = FIRE_PROOF
 	clothing_flags = SNUG_FIT | PLASMAMAN_HELMET_EXEMPT

-/obj/item/clothing/head/welding/attack_self(mob/user)
+/obj/item/clothing/head/utility/welding/attack_self(mob/user)
 	weldingvisortoggle(user)

 /obj/item/clothing/head/welding/visor_toggling()
@@ -2,6 +2,7 @@
 	name = "wig"
 	desc = "A bunch of hair without a head attached."
 	icon = 'icons/mob/species/human/human_face.dmi'   // default icon for all hairs
+	worn_icon = 'icons/mob/clothing/head/costume.dmi'
 	icon_state = "hair_vlong"
 	inhand_icon_state = "pwig"
 	worn_icon_state = "wig"
@@ -332,7 +332,7 @@
 	suit = /obj/item/clothing/suit/armor/vest
 	suit_store = /obj/item/gun/ballistic/rifle/boltaction/brand_new
 	belt = /obj/item/melee/baton/security/loaded
-	head = /obj/item/clothing/head/intern
+	head = /obj/item/clothing/head/hats/intern
 	l_hand = /obj/item/megaphone

 /datum/outfit/centcom/centcom_intern/leader/unarmed // i'll be nice and let the leader keep their baton and vest
@@ -369,7 +369,7 @@
 	suit_store = null
 	back = /obj/item/storage/backpack/ert/security
 	backpack_contents = list(
-		/obj/item/clothing/head/warden/police = 1,
+		/obj/item/clothing/head/hats/warden/police = 1,
 		/obj/item/storage/box/handcuffs = 1,
 	)
 	belt = /obj/item/melee/baton/telescopic
@@ -391,7 +391,7 @@
 		/obj/item/stack/sheet/iron/fifty = 1,
 		/obj/item/stack/sheet/plasteel/twenty = 1,
 	)
-	head = /obj/item/clothing/head/hardhat/weldhat
+	head = /obj/item/clothing/head/utility/hardhat/weldhat
 	mask = /obj/item/clothing/mask/gas/atmos
 	l_hand = /obj/item/areaeditor/blueprints

@@ -421,7 +421,7 @@
 		/obj/item/storage/box/fireworks = 3,
 	)
 	belt = /obj/item/storage/belt/sabre
-	head = /obj/item/clothing/head/coordinator
+	head = /obj/item/clothing/head/hats/coordinator
 	l_pocket = /obj/item/knife/kitchen
 	l_hand = /obj/item/toy/balloon

@@ -8,7 +8,7 @@
 		/obj/item/a_gift/anything = 5,
 )
 	gloves = /obj/item/clothing/gloves/color/red
-	head = /obj/item/clothing/head/santa
+	head = /obj/item/clothing/head/costume/santa
 	shoes = /obj/item/clothing/shoes/sneakers/red
 	r_pocket = /obj/item/flashlight

@@ -122,7 +122,7 @@
 	suit = /obj/item/clothing/suit/costume/pirate/armored
 	ears = /obj/item/radio/headset/syndicate
 	glasses = /obj/item/clothing/glasses/eyepatch
-	head = /obj/item/clothing/head/bandana/armored
+	head = /obj/item/clothing/head/costume/pirate/bandana/armored
 	shoes = /obj/item/clothing/shoes/sneakers/brown

 /datum/outfit/pirate/post_equip(mob/living/carbon/human/equipped)
@@ -138,7 +138,7 @@
 		outfit_id.registered_name = equipped.real_name
 		outfit_id.update_label()
 		outfit_id.update_icon()
-	
+
 	var/obj/item/clothing/under/pirate_uniform = equipped.w_uniform
 	if(pirate_uniform)
 		pirate_uniform.has_sensor = NO_SENSORS
@@ -149,7 +149,7 @@
 	name = "Space Pirate Captain"

 	id_trim = /datum/id_trim/pirate/captain
-	head = /obj/item/clothing/head/pirate/armored
+	head = /obj/item/clothing/head/costume/pirate/armored

 /datum/outfit/pirate/space
 	name = "Space Pirate (EVA)"
@@ -180,7 +180,7 @@
 	name = "Silver Scale Captain"

 	id_trim = /datum/id_trim/pirate/captain/silverscale
-	head = /obj/item/clothing/head/crown
+	head = /obj/item/clothing/head/costume/crown
 	mask = /obj/item/clothing/mask/cigarette/cigar/havana
 	l_pocket = /obj/item/lighter

@@ -218,7 +218,7 @@
 	ears = /obj/item/radio/headset
 	glasses = /obj/item/clothing/glasses/thermal/monocle
 	gloves = /obj/item/clothing/gloves/color/latex
-	head = /obj/item/clothing/head/welding
+	head = /obj/item/clothing/head/utility/welding
 	mask = /obj/item/clothing/mask/surgical
 	l_pocket = /obj/item/knife/kitchen
 	r_pocket = /obj/item/scalpel
@@ -285,7 +285,7 @@
 	ears = /obj/item/radio/headset/headset_cent/commander
 	glasses = /obj/item/clothing/glasses/sunglasses
 	gloves = /obj/item/clothing/gloves/tackler/combat/insulated
-	head = /obj/item/clothing/head/centhat
+	head = /obj/item/clothing/head/hats/centhat
 	mask = /obj/item/clothing/mask/cigarette/cigar/cohiba
 	shoes = /obj/item/clothing/shoes/combat/swat
 	l_pocket = /obj/item/ammo_box/a357
@@ -384,7 +384,7 @@
 	ears = /obj/item/radio/headset/headset_cent
 	glasses = /obj/item/clothing/glasses/thermal/eyepatch
 	gloves = /obj/item/clothing/gloves/tackler/combat/insulated
-	head = /obj/item/clothing/head/pirate/captain
+	head = /obj/item/clothing/head/costume/pirate/captain
 	shoes = /obj/item/clothing/shoes/combat

 /datum/outfit/centcom/soviet/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -4,6 +4,8 @@
 //      Meaning the the suit is defined directly after the corrisponding helmet. Just like below!
 /obj/item/clothing/head/helmet/space
 	name = "space helmet"
+	icon = 'icons/obj/clothing/head/spacehelm.dmi'
+	worn_icon = 'icons/mob/clothing/head/spacehelm.dmi'
 	icon_state = "spaceold"
 	inhand_icon_state = "space_helmet"
 	desc = "A special helmet with solar UV shielding to protect your eyes from harmful rays."
@@ -1,6 +1,8 @@
 /obj/item/clothing/head/helmet/space/freedom
 	name = "eagle helmet"
 	desc = "An advanced, space-proof helmet. It appears to be modeled after an old-world eagle."
+	icon = 'icons/obj/clothing/head/costume.dmi'
+	worn_icon = 'icons/mob/clothing/head/costume.dmi'
 	icon_state = "griffinhat"
 	inhand_icon_state = null
 	armor = list(MELEE = 20, BULLET = 40, LASER = 30, ENERGY = 40, BOMB = 100, BIO = 100, FIRE = 80, ACID = 80)
@@ -134,7 +134,7 @@
 		M.color = smile_color
 		. += M
 	if(!isinhands && attached_hat)
-		. += attached_hat.build_worn_icon(default_layer = HEAD_LAYER, default_icon_file = 'icons/mob/clothing/head.dmi')
+		. += attached_hat.build_worn_icon(default_layer = HEAD_LAYER, default_icon_file = 'icons/mob/clothing/head/default.dmi')
 	if(!isinhands && !up)
 		. += mutable_appearance('icons/mob/clothing/head/plasmaman_head.dmi', visor_icon)
 	else
@@ -1,10 +1,11 @@
 /obj/item/clothing/head/helmet/space/santahat
 	name = "Santa's hat"
 	desc = "Ho ho ho. Merrry X-mas!"
+	icon = 'icons/obj/clothing/head/wizard.dmi'
+	worn_icon = 'icons/mob/clothing/head/wizard.dmi'
 	icon_state = "santahat"
 	inhand_icon_state = "santahat"
 	flags_cover = HEADCOVERSEYES
-
 	dog_fashion = /datum/dog_fashion/head/santa

 /obj/item/clothing/suit/space/santa
@@ -1,5 +1,7 @@
 /obj/item/clothing/head/hooded/ablative
 	name = "ablative hood"
+	icon = 'icons/obj/clothing/head/helmet.dmi'
+	worn_icon = 'icons/mob/clothing/head/helmet.dmi'
 	desc = "Hood hopefully belonging to an ablative trenchcoat. Includes a visor for cool-o-vision."
 	icon_state = "ablativehood"
 	armor = list(MELEE = 10, BULLET = 10, LASER = 60, ENERGY = 60, BOMB = 0, BIO = 0, FIRE = 100, ACID = 100)
@@ -1,9 +1,11 @@
 //Biosuit complete with shoes (in the item sprite)
 /obj/item/clothing/head/bio_hood
 	name = "bio hood"
+	desc = "A hood that protects the head and face from biological contaminants."
+	icon = 'icons/obj/clothing/head/bio.dmi'
+	worn_icon = 'icons/mob/clothing/head/bio.dmi'
 	icon_state = "bio"
 	inhand_icon_state = "bio_hood"
-	desc = "A hood that protects the head and face from biological contaminants."
 	clothing_flags = THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT | SNUG_FIT | PLASMAMAN_HELMET_EXEMPT
 	armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 100, FIRE = 30, ACID = 100)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE|HIDESNOUT
@@ -69,6 +69,8 @@
 /obj/item/clothing/head/hooded/monkhabit
 	name = "monk's hood"
 	desc = "For when a man wants to cover up his tonsure."
+	icon = 'icons/obj/clothing/head/chaplain.dmi'
+	worn_icon = 'icons/mob/clothing/head/chaplain.dmi'
 	icon_state = "monkhood"
 	inhand_icon_state = null
 	body_parts_covered = HEAD
@@ -122,6 +124,8 @@
 /obj/item/clothing/head/helmet/chaplain
 	name = "crusader helmet"
 	desc = "Deus Vult."
+	icon = 'icons/obj/clothing/head/chaplain.dmi'
+	worn_icon = 'icons/mob/clothing/head/chaplain.dmi'
 	icon_state = "knight_templar"
 	inhand_icon_state = null
 	armor = list(MELEE = 50, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, FIRE = 80, ACID = 80)
@@ -210,6 +214,8 @@
 /obj/item/clothing/head/hooded/chaplain_hood
 	name = "follower hood"
 	desc = "Hood made for acolytes of the chaplain."
+	icon = 'icons/obj/clothing/head/chaplain.dmi'
+	worn_icon = 'icons/mob/clothing/head/chaplain.dmi'
 	icon_state = "chaplain_hood"
 	body_parts_covered = HEAD
 	flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
@@ -15,6 +15,8 @@
 /obj/item/clothing/head/hooded/flashsuit
 	name = "flash button"
 	desc = "You will learn to fear the flash."
+	icon = 'icons/obj/clothing/head/costume.dmi'
+	worn_icon = 'icons/mob/clothing/head/costume.dmi'
 	icon_state = "flashsuit"
 	body_parts_covered = HEAD
 	flags_inv = HIDEHAIR|HIDEEARS|HIDEFACIALHAIR|HIDEFACE|HIDEMASK|HIDESNOUT
@@ -173,11 +175,11 @@
 	..()
 	user.remove_alt_appearance("standard_borg_disguise")

-/obj/item/clothing/suit/costume/cardborg/proc/disguise(mob/living/carbon/human/H, obj/item/clothing/head/cardborg/borghead)
+/obj/item/clothing/suit/costume/cardborg/proc/disguise(mob/living/carbon/human/H, obj/item/clothing/head/costume/cardborg/borghead)
 	if(istype(H))
 		if(!borghead)
 			borghead = H.head
-		if(istype(borghead, /obj/item/clothing/head/cardborg)) //why is this done this way? because equipped() is called BEFORE THE ITEM IS IN THE SLOT WHYYYY
+		if(istype(borghead, /obj/item/clothing/head/costume/cardborg)) //why is this done this way? because equipped() is called BEFORE THE ITEM IS IN THE SLOT WHYYYY
 			var/image/I = image(icon = 'icons/mob/silicon/robots.dmi' , icon_state = "robot", loc = H)
 			I.override = 1
 			I.add_overlay(mutable_appearance('icons/mob/silicon/robots.dmi', "robot_e")) //gotta look realistic
@@ -244,6 +246,8 @@
 /obj/item/clothing/head/hooded/carp_hood
 	name = "carp hood"
 	desc = "A hood attached to a carp costume."
+	icon = 'icons/obj/clothing/head/costume.dmi'
+	worn_icon = 'icons/mob/clothing/head/costume.dmi'
 	icon_state = "carp_casual"
 	body_parts_covered = HEAD
 	cold_protection = HEAD
@@ -318,6 +322,8 @@
 /obj/item/clothing/head/hooded/ian_hood
 	name = "corgi hood"
 	desc = "A hood that looks just like a corgi's head, it won't guarantee dog biscuits."
+	icon = 'icons/obj/clothing/head/costume.dmi'
+	worn_icon = 'icons/mob/clothing/head/costume.dmi'
 	icon_state = "ian"
 	body_parts_covered = HEAD
 	//cold_protection = HEAD
@@ -338,12 +344,13 @@
 /obj/item/clothing/head/hooded/bee_hood
 	name = "bee hood"
 	desc = "A hood attached to a bee costume."
+	icon = 'icons/obj/clothing/head/costume.dmi'
+	worn_icon = 'icons/mob/clothing/head/costume.dmi'
 	icon_state = "bee"
 	body_parts_covered = HEAD
 	clothing_flags = THICKMATERIAL
 	flags_inv = HIDEHAIR|HIDEEARS

-
 /obj/item/clothing/suit/hooded/bloated_human //OH MY GOD WHAT HAVE YOU DONE!?!?!?
 	name = "bloated human suit"
 	desc = "A horribly bloated suit made from human skins."
@@ -357,10 +364,11 @@
 	hoodtype = /obj/item/clothing/head/hooded/human_head
 	species_exception = list(/datum/species/golem) //Finally, flesh

-
 /obj/item/clothing/head/hooded/human_head
 	name = "bloated human head"
 	desc = "A horribly bloated and mismatched human head."
+	icon = 'icons/obj/clothing/head/costume.dmi'
+	worn_icon = 'icons/mob/clothing/head/costume.dmi'
 	icon_state = "lingspacehelmet"
 	body_parts_covered = HEAD
 	flags_cover = HEADCOVERSEYES
@@ -463,6 +471,8 @@
 /obj/item/clothing/head/hooded/mysticrobe
 	name = "mystic's hood"
 	desc = "The balance of reality tips towards order."
+	icon = 'icons/obj/clothing/head/costume.dmi'
+	worn_icon = 'icons/mob/clothing/head/costume.dmi'
 	icon_state = "mystichood"
 	inhand_icon_state = null
 	body_parts_covered = HEAD
@@ -293,6 +293,8 @@

 /obj/item/clothing/head/hooded/techpriest
 	name = "techpriest's hood"
+	icon = 'icons/obj/clothing/head/costume.dmi'
+	worn_icon = 'icons/mob/clothing/head/costume.dmi'
 	desc = "A hood for those who REALLY love their toasters."
 	icon_state = "techpriesthood"
 	inhand_icon_state = null
@@ -65,7 +65,7 @@
 /*
 * Bomb protection
 */
-/obj/item/clothing/head/bomb_hood
+/obj/item/clothing/head/utility/bomb_hood
 	name = "bomb hood"
 	desc = "Use in case of bomb."
 	icon_state = "bombsuit"
@@ -82,7 +82,6 @@
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
 	resistance_flags = NONE

-
 /obj/item/clothing/suit/utility/bomb_suit
 	name = "bomb suit"
 	desc = "A suit designed for safety when handling explosives."
@@ -102,8 +101,7 @@
 	equip_delay_other = 70
 	resistance_flags = NONE

-
-/obj/item/clothing/head/bomb_hood/security
+/obj/item/clothing/head/utility/bomb_hood/security
 	icon_state = "bombsuit_sec"
 	inhand_icon_state = null

@@ -112,8 +110,7 @@
 	inhand_icon_state = null
 	allowed = list(/obj/item/gun/energy, /obj/item/melee/baton, /obj/item/restraints/handcuffs)

-
-/obj/item/clothing/head/bomb_hood/white
+/obj/item/clothing/head/utility/bomb_hood/white
 	icon_state = "bombsuit_white"
 	inhand_icon_state = null

@@ -125,7 +122,7 @@
 * Radiation protection
 */

-/obj/item/clothing/head/radiation
+/obj/item/clothing/head/utility/radiation
 	name = "radiation hood"
 	icon_state = "rad"
 	desc = "A hood with radiation protective properties. The label reads, 'Made with lead. Please do not consume insulation.'"
@@ -137,7 +134,7 @@
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
 	resistance_flags = NONE

-/obj/item/clothing/head/radiation/Initialize(mapload)
+/obj/item/clothing/head/utility/radiation/Initialize(mapload)
 	. = ..()
 	AddElement(/datum/element/radiation_protected_clothing)

@@ -1,6 +1,8 @@
 /obj/item/clothing/head/wizard
 	name = "wizard hat"
 	desc = "Strange-looking hat-wear that most certainly belongs to a real magic user."
+	icon = 'icons/obj/clothing/head/wizard.dmi'
+	worn_icon = 'icons/mob/clothing/head/wizard.dmi'
 	icon_state = "wizard"
 	inhand_icon_state = "wizhat"
 	armor = list(MELEE = 30, BULLET = 20, LASER = 20, ENERGY = 30, BOMB = 20, BIO = 100, FIRE = 100, ACID = 100,  WOUND = 20)
@@ -109,7 +111,6 @@
 	icon_state = "magusred"
 	inhand_icon_state = null

-
 /obj/item/clothing/suit/wizrobe/santa
 	name = "Santa's suit"
 	desc = "Festive!"
@@ -56,7 +56,7 @@
 	countEggs()

 //Bunny Suit
-/obj/item/clothing/head/bunnyhead
+/obj/item/clothing/head/costume/bunnyhead
 	name = "Easter Bunny Head"
 	icon_state = "bunnyhead"
 	inhand_icon_state = null
@@ -102,7 +102,7 @@
 	icon_state = "egg-[eggcolor]"

 /obj/item/surprise_egg/proc/dispensePrize(turf/where)
-	var/static/list/prize_list = list(/obj/item/clothing/head/bunnyhead,
+	var/static/list/prize_list = list(/obj/item/clothing/head/costume/bunnyhead,
 		/obj/item/clothing/suit/costume/bunnysuit,
 		/obj/item/storage/backpack/satchel/bunnysatchel,
 		/obj/item/food/grown/carrot,
@@ -22,7 +22,7 @@
 			"Why is Christmas just like life on ss13?\n\n<i>You do all the work and the fat guy gets all the credit.</i>",
 			"Why doesn't Santa have any children?\n\n<i>Because he only comes down the chimney.</i>"))
 		joke_paper.update_appearance()
-		new /obj/item/clothing/head/festive(target.loc)
+		new /obj/item/clothing/head/costume/festive(target.loc)
 		user.update_icons()
 		cracked = TRUE
 		icon_state = "cracker1"
@@ -34,7 +34,7 @@
 		return TRUE
 	return ..()

-/obj/item/clothing/head/festive
+/obj/item/clothing/head/costume/festive
 	name = "festive paper hat"
 	icon_state = "xmashat"
 	desc = "A crappy paper hat that you are REQUIRED to wear."
@@ -34,7 +34,7 @@
 		if("voicemodulators")
 			loadout[ITEM_SLOT_MASK] = /obj/item/clothing/mask/chameleon
 		if("catgirls2015")
-			loadout[ITEM_SLOT_HEAD] = /obj/item/clothing/head/kitty
+			loadout[ITEM_SLOT_HEAD] = /obj/item/clothing/head/costume/kitty
 			ruins_spaceworthiness = 1
 			ruins_wizard_loadout = 1

@@ -187,7 +187,7 @@
 	name = "Royal Cheese"
 	reqs = list(
 		/obj/item/food/cheese/wheel = 1,
-		/obj/item/clothing/head/crown = 1,
+		/obj/item/clothing/head/costume/crown = 1,
 		/datum/reagent/medicine/strange_reagent = 5,
 		/datum/reagent/toxin/mutagen = 5
 	)
@@ -36,7 +36,7 @@
 	var/mob/living/carbon/buffet = our_venue.restaurant_portal?.turned_on_portal?.resolve()
 	if (!istype(buffet)) // Always asks for the clothes that you have on, but this is a fallback.
 		wanted_clothing_type = pick_weight(list(
-			/obj/item/clothing/head/chefhat = 3,
+			/obj/item/clothing/head/utility/chefhat = 3,
 			/obj/item/clothing/shoes/sneakers/black = 3,
 			/obj/item/clothing/gloves/color/black = 1,
 		))
@@ -124,7 +124,7 @@
 	name = "Birthday of Space Station 13"
 	begin_day = 16
 	begin_month = FEBRUARY
-	drone_hat = /obj/item/clothing/head/festive
+	drone_hat = /obj/item/clothing/head/costume/festive

 /datum/holiday/birthday/greet()
 	var/game_age = text2num(time2text(world.timeofday, "YYYY")) - 2003
@@ -251,7 +251,7 @@
 	name = "Labor Day"
 	begin_day = 1
 	begin_month = MAY
-	drone_hat = /obj/item/clothing/head/hardhat
+	drone_hat = /obj/item/clothing/head/utility/hardhat
 	mail_holiday = TRUE

 //Draconic Day is celebrated on May 3rd, the date on which the Draconic language was merged (#26780)
@@ -270,7 +270,7 @@
 	name = "Firefighter's Day"
 	begin_day = 4
 	begin_month = MAY
-	drone_hat = /obj/item/clothing/head/hardhat/red
+	drone_hat = /obj/item/clothing/head/utility/hardhat/red

 /datum/holiday/firefighter/getStationPrefix()
 	return pick("Burning","Blazing","Plasma","Fire")
@@ -339,7 +339,7 @@
 	name = "Doctor's Day"
 	begin_day = 1
 	begin_month = JULY
-	drone_hat = /obj/item/clothing/head/nursehat
+	drone_hat = /obj/item/clothing/head/costume/nursehat

 /datum/holiday/ufo
 	name = "UFO Day"
@@ -455,7 +455,7 @@
 	name = "Talk-Like-a-Pirate Day"
 	begin_day = 19
 	begin_month = SEPTEMBER
-	drone_hat = /obj/item/clothing/head/pirate
+	drone_hat = /obj/item/clothing/head/costume/pirate

 /datum/holiday/pirate/greet()
 	return "Ye be talkin' like a pirate today or else ye'r walkin' tha plank, matey!"
@@ -485,13 +485,13 @@
 	name = "Smiling Day"
 	begin_day = 7
 	begin_month = OCTOBER
-	drone_hat = /obj/item/clothing/head/papersack/smiley
+	drone_hat = /obj/item/clothing/head/costume/papersack/smiley

 /datum/holiday/boss
 	name = "Boss' Day"
 	begin_day = 16
 	begin_month = OCTOBER
-	drone_hat = /obj/item/clothing/head/that
+	drone_hat = /obj/item/clothing/head/hats/tophat

 /datum/holiday/un_day
 	name = "Anniversary of the Foundation of the United Nations"
@@ -591,7 +591,7 @@
 	begin_day = 1
 	begin_month = DECEMBER
 	end_day = 31
-	drone_hat = /obj/item/clothing/head/santa
+	drone_hat = /obj/item/clothing/head/costume/santa

 /datum/holiday/festive_season/greet()
 	return "Have a nice festive season!"
@@ -618,7 +618,7 @@
 	begin_day = 23
 	begin_month = DECEMBER
 	end_day = 27
-	drone_hat = /obj/item/clothing/head/santa
+	drone_hat = /obj/item/clothing/head/costume/santa
 	mail_holiday = TRUE

 /datum/holiday/xmas/greet()
@@ -635,7 +635,7 @@
 	begin_month = DECEMBER
 	end_day = 2
 	end_month = JANUARY
-	drone_hat = /obj/item/clothing/head/festive
+	drone_hat = /obj/item/clothing/head/costume/festive
 	mail_holiday = TRUE

 /datum/holiday/new_year/getStationPrefix()
@@ -734,7 +734,7 @@
 	GLOB.maintenance_loot += list(
 		list(
 			/obj/item/toy/xmas_cracker = 3,
-			/obj/item/clothing/head/santa = 1,
+			/obj/item/clothing/head/costume/santa = 1,
 			/obj/item/a_gift/anything = 1
 		) = maint_holiday_weight,
 	)
@@ -751,7 +751,7 @@

 /datum/holiday/easter
 	name = EASTER
-	drone_hat = /obj/item/clothing/head/rabbitears
+	drone_hat = /obj/item/clothing/head/costume/rabbitears
 	var/const/days_early = 1 //to make editing the holiday easier
 	var/const/days_extra = 1

@@ -35,7 +35,7 @@
 	begin_week = 4
 	begin_month = NOVEMBER
 	begin_weekday = THURSDAY
-	drone_hat = /obj/item/clothing/head/that //This is the closest we can get to a pilgrim's hat
+	drone_hat = /obj/item/clothing/head/hats/tophat //This is the closest we can get to a pilgrim's hat

 /datum/holiday/nth_week/thanksgiving/canada
 	name = "Thanksgiving in Canada"
@@ -1,12 +1,11 @@

-/obj/item/clothing/head/beekeeper_head
+/obj/item/clothing/head/utility/beekeeper_head
 	name = "beekeeper hat"
 	desc = "Keeps the lil buzzing buggers out of your eyes."
 	icon_state = "beekeeper"
 	inhand_icon_state = null
 	clothing_flags = THICKMATERIAL | SNUG_FIT

-
 /obj/item/clothing/suit/utility/beekeeper_suit
 	name = "beekeeper suit"
 	desc = "Keeps the lil buzzing buggers away from your squishy bits."
@@ -26,7 +26,7 @@
 	juice_results = list(/datum/reagent/consumable/pumpkinjuice = 0)
 	wine_power = 20
 	///Which type of lantern this gourd produces when carved.
-	var/carved_type = /obj/item/clothing/head/hardhat/pumpkinhead
+	var/carved_type = /obj/item/clothing/head/utility/hardhat/pumpkinhead

 /obj/item/food/grown/pumpkin/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(W.get_sharpness())
@@ -58,4 +58,4 @@
 	foodtypes = FRUIT
 	juice_results = list(/datum/reagent/consumable/blumpkinjuice = 0)
 	wine_power = 50
-	carved_type = /obj/item/clothing/head/hardhat/pumpkinhead/blumpkin
+	carved_type = /obj/item/clothing/head/utility/hardhat/pumpkinhead/blumpkin
@@ -17,6 +17,7 @@
 	name = "headphones"
 	desc = "Unce unce unce unce. Boop!"
 	icon = 'icons/obj/clothing/accessories.dmi'
+	worn_icon = 'icons/mob/clothing/head/costume.dmi'
 	lefthand_file = 'icons/mob/inhands/clothing/ears_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/clothing/ears_righthand.dmi'
 	icon_state = "headphones"
@@ -20,7 +20,7 @@
 		/datum/job_department/service,
 		)

-	family_heirlooms = list(/obj/item/reagent_containers/cup/rag, /obj/item/clothing/head/that, /obj/item/reagent_containers/cup/glass/shaker)
+	family_heirlooms = list(/obj/item/reagent_containers/cup/rag, /obj/item/clothing/head/hats/tophat, /obj/item/reagent_containers/cup/glass/shaker)

 	mail_goodies = list(
 		/obj/item/storage/box/rubbershot = 30,
@@ -66,7 +66,7 @@
 	ears = /obj/item/radio/headset/heads/captain/alt
 	glasses = /obj/item/clothing/glasses/sunglasses
 	gloves = /obj/item/clothing/gloves/color/captain
-	head = /obj/item/clothing/head/caphat
+	head = /obj/item/clothing/head/hats/caphat
 	shoes = /obj/item/clothing/shoes/laceup


@@ -32,7 +32,7 @@
 	display_order = JOB_DISPLAY_ORDER_CHIEF_ENGINEER
 	bounty_types = CIV_JOB_ENG

-	family_heirlooms = list(/obj/item/clothing/head/hardhat/white, /obj/item/screwdriver, /obj/item/wrench, /obj/item/weldingtool, /obj/item/crowbar, /obj/item/wirecutters)
+	family_heirlooms = list(/obj/item/clothing/head/utility/hardhat/white, /obj/item/screwdriver, /obj/item/wrench, /obj/item/weldingtool, /obj/item/crowbar, /obj/item/wirecutters)

 	mail_goodies = list(
 		/obj/item/food/cracker = 25, //you know. for poly
@@ -65,7 +65,7 @@
 	belt = /obj/item/storage/belt/utility/chief/full
 	ears = /obj/item/radio/headset/heads/ce
 	gloves = /obj/item/clothing/gloves/color/black
-	head = /obj/item/clothing/head/hardhat/white
+	head = /obj/item/clothing/head/utility/hardhat/white
 	shoes = /obj/item/clothing/shoes/sneakers/brown
 	l_pocket = /obj/item/modular_computer/tablet/pda/heads/ce

@@ -63,7 +63,7 @@
 		)
 	belt = /obj/item/modular_computer/tablet/pda/heads/cmo
 	ears = /obj/item/radio/headset/heads/cmo
-	head = /obj/item/clothing/head/surgerycap/cmo
+	head = /obj/item/clothing/head/utility/surgerycap/cmo
 	shoes = /obj/item/clothing/shoes/sneakers/blue
 	l_pocket = /obj/item/pinpointer/crew
 	l_hand = /obj/item/storage/medkit/surgery
@@ -27,7 +27,7 @@
 	family_heirlooms = list(
 		/obj/item/reagent_containers/condiment/saltshaker,
 		/obj/item/kitchen/rollingpin,
-		/obj/item/clothing/head/chefhat,
+		/obj/item/clothing/head/utility/chefhat,
 	)

 	mail_goodies = list(
@@ -68,7 +68,7 @@
 	)
 	belt = /obj/item/modular_computer/tablet/pda/cook
 	ears = /obj/item/radio/headset/headset_srv
-	head = /obj/item/clothing/head/chefhat
+	head = /obj/item/clothing/head/utility/chefhat
 	mask = /obj/item/clothing/mask/fakemoustache/italian

 	skillchips = list(/obj/item/skillchip/job/chef)
@@ -61,7 +61,7 @@
 		)
 	belt = /obj/item/modular_computer/tablet/pda/heads/hop
 	ears = /obj/item/radio/headset/heads/hop
-	head = /obj/item/clothing/head/hopcap
+	head = /obj/item/clothing/head/hats/hopcap
 	shoes = /obj/item/clothing/shoes/laceup
 	suit = /obj/item/clothing/suit/armor/vest/hop

@@ -49,7 +49,7 @@
 	suit_store = /obj/item/flashlight/pen
 	belt = /obj/item/modular_computer/tablet/pda/medical
 	ears = /obj/item/radio/headset/headset_med
-	head = /obj/item/clothing/head/surgerycap
+	head = /obj/item/clothing/head/utility/surgerycap
 	shoes = /obj/item/clothing/shoes/sneakers/white
 	l_hand = /obj/item/storage/medkit/surgery

@@ -26,13 +26,13 @@
 		/datum/job_department/engineering,
 		)

-	family_heirlooms = list(/obj/item/clothing/head/hardhat, /obj/item/screwdriver, /obj/item/wrench, /obj/item/weldingtool, /obj/item/crowbar, /obj/item/wirecutters)
+	family_heirlooms = list(/obj/item/clothing/head/utility/hardhat, /obj/item/screwdriver, /obj/item/wrench, /obj/item/weldingtool, /obj/item/crowbar, /obj/item/wirecutters)

 	mail_goodies = list(
 		/obj/item/storage/box/lights/mixed = 20,
 		/obj/item/lightreplacer = 10,
 		/obj/item/holosign_creator/engineering = 8,
-		/obj/item/clothing/head/hardhat/red/upgraded = 1
+		/obj/item/clothing/head/utility/hardhat/red/upgraded = 1
 	)
 	rpg_title = "Crystallomancer"
 	job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN
@@ -46,7 +46,7 @@
 	uniform = /obj/item/clothing/under/rank/engineering/engineer
 	belt = /obj/item/storage/belt/utility/full/engi
 	ears = /obj/item/radio/headset/headset_eng
-	head = /obj/item/clothing/head/hardhat
+	head = /obj/item/clothing/head/utility/hardhat
 	shoes = /obj/item/clothing/shoes/workboots
 	l_pocket = /obj/item/modular_computer/tablet/pda/engineering
 	r_pocket = /obj/item/t_scanner
@@ -59,7 +59,7 @@
 	ears = /obj/item/radio/headset/headset_sec/alt
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
 	gloves = /obj/item/clothing/gloves/color/black
-	head = /obj/item/clothing/head/warden/red
+	head = /obj/item/clothing/head/hats/warden/red
 	shoes = /obj/item/clothing/shoes/jackboots/sec
 	l_pocket = /obj/item/restraints/handcuffs
 	r_pocket = /obj/item/assembly/flash/handheld
@@ -65,7 +65,7 @@
 	uniform = /obj/item/clothing/under/rank/civilian/head_of_personnel
 	suit = /obj/item/clothing/suit/armor/vest/alt
 	shoes = /obj/item/clothing/shoes/sneakers/brown
-	head = /obj/item/clothing/head/hopcap
+	head = /obj/item/clothing/head/hats/hopcap
 	glasses = /obj/item/clothing/glasses/sunglasses

 /datum/outfit/mafia/hos
@@ -85,7 +85,7 @@
 	shoes = /obj/item/clothing/shoes/jackboots
 	suit = /obj/item/clothing/suit/armor/vest/warden/alt
 	gloves = /obj/item/clothing/gloves/color/black
-	head = /obj/item/clothing/head/warden
+	head = /obj/item/clothing/head/hats/warden
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses

 //mafia
@@ -33,7 +33,7 @@
 	uniform = /obj/item/clothing/under/misc/overalls
 	shoes = /obj/item/clothing/shoes/workboots
 	gloves = /obj/item/clothing/gloves/color/fyellow
-	head = /obj/item/clothing/head/hardhat
+	head = /obj/item/clothing/head/utility/hardhat
 	r_pocket = /obj/item/paper/fluff/ruins/crashedship/old_diary
 	l_pocket = /obj/item/stack/spacecash/c200
 	mask = /obj/item/clothing/mask/breath
@@ -630,7 +630,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
 			table += thing
 		else if(isopenturf(thing))
 			if(locate(/obj/structure/bed/dogbed/ian) in thing)
-				new /obj/item/clothing/head/festive(thing)
+				new /obj/item/clothing/head/costume/festive(thing)
 				var/obj/item/reagent_containers/cup/glass/bottle/champagne/iandrink = new(thing)
 				iandrink.name = "dog champagne"
 				iandrink.pixel_y += 8
@@ -503,7 +503,7 @@ GLOBAL_LIST_INIT(meteorsSPOOKY, list(/obj/effect/meteor/pumpkin))
 	hits = 10
 	heavy = TRUE
 	dropamt = 1
-	meteordrop = list(/obj/item/clothing/head/hardhat/pumpkinhead, /obj/item/food/grown/pumpkin)
+	meteordrop = list(/obj/item/clothing/head/utility/hardhat/pumpkinhead, /obj/item/food/grown/pumpkin)
 	threat = 100

 /obj/effect/meteor/pumpkin/Initialize(mapload)
@@ -175,7 +175,7 @@
 			new /obj/item/clothing/head/helmet/space(src)
 		if(61 to 62)
 			for(var/i in 1 to 5)
-				new /obj/item/clothing/head/kitty(src)
+				new /obj/item/clothing/head/costume/kitty(src)
 				new /obj/item/clothing/neck/petcollar(src)
 		if(63 to 64)
 			new /obj/item/clothing/shoes/kindle_kicks(src)
@@ -28,6 +28,8 @@
 /obj/item/clothing/head/hooded/explorer
 	name = "explorer hood"
 	desc = "An armoured hood for exploring harsh environments."
+	icon = 'icons/obj/clothing/head/utility.dmi'
+	worn_icon = 'icons/mob/clothing/head/utility.dmi'
 	icon_state = "explorer"
 	body_parts_covered = HEAD
 	flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
@@ -108,6 +110,8 @@

 /obj/item/clothing/head/hooded/cloakhood/goliath
 	name = "goliath cloak hood"
+	icon = 'icons/obj/clothing/head/helmet.dmi'
+	worn_icon = 'icons/mob/clothing/head/helmet.dmi'
 	icon_state = "golhood"
 	desc = "A protective & concealing hood."
 	armor = list(MELEE = 35, BULLET = 10, LASER = 25, ENERGY = 35, BOMB = 25, BIO = 0, FIRE = 60, ACID = 60)
@@ -141,6 +145,8 @@

 /obj/item/clothing/head/hooded/cloakhood/drake
 	name = "drake helm"
+	icon = 'icons/obj/clothing/head/helmet.dmi'
+	worn_icon = 'icons/mob/clothing/head/helmet.dmi'
 	icon_state = "dragon"
 	desc = "The skull of a dragon."
 	armor = list(MELEE = 65, BULLET = 15, LASER = 40, ENERGY = 40, BOMB = 70, BIO = 60, FIRE = 100, ACID = 100)
@@ -185,6 +191,8 @@

 /obj/item/clothing/head/hooded/cloakhood/godslayer
 	name = "godslayer helm"
+	icon = 'icons/obj/clothing/head/helmet.dmi'
+	worn_icon = 'icons/mob/clothing/head/helmet.dmi'
 	icon_state = "godslayer"
 	desc = "The horns and skull of a wendigo, held together by the remaining icey energy of a demonic miner."
 	armor = list(MELEE = 50, BULLET = 25, LASER = 25, ENERGY = 25, BOMB = 50, BIO = 50, FIRE = 100, ACID = 100)
@@ -284,6 +284,8 @@

 /obj/item/clothing/head/hooded/hostile_environment
 	name = "H.E.C.K. helmet"
+	icon = 'icons/obj/clothing/head/helmet.dmi'
+	worn_icon = 'icons/mob/clothing/head/helmet.dmi'
 	desc = "Hostile Environiment Cross-Kinetic Helmet: A helmet designed to withstand the wide variety of hazards from Lavaland. It wasn't enough for its last owner."
 	icon_state = "hostile_env"
 	w_class = WEIGHT_CLASS_NORMAL
@@ -64,7 +64,7 @@
 	set_items = list(
 		/mob/living/simple_animal/hostile/mining_drone,
 		/obj/item/weldingtool/hugetank,
-		/obj/item/clothing/head/welding,
+		/obj/item/clothing/head/utility/welding,
 		/obj/item/borg/upgrade/modkit/minebot_passthrough,
 		)

@@ -7,7 +7,7 @@
 	held_state = "mothroach"
 	held_lh = 'icons/mob/inhands/animal_item_lefthand.dmi'
 	held_rh = 'icons/mob/inhands/animal_item_righthand.dmi'
-	head_icon = 'icons/mob/clothing/head/animal_item_head.dmi'
+	head_icon = 'icons/mob/clothing/head/pets_head.dmi'
 	butcher_results = list(/obj/item/food/meat/slab/mothroach = 3, /obj/item/stack/sheet/animalhide/mothroach = 1)
 	mob_biotypes = MOB_ORGANIC|MOB_BUG
 	mob_size = MOB_SIZE_SMALL
@@ -402,7 +402,7 @@
 		inv.update_appearance()

 	if(head)
-		overlays_standing[HEAD_LAYER] = head.build_worn_icon(default_layer = HEAD_LAYER, default_icon_file = 'icons/mob/clothing/head.dmi')
+		overlays_standing[HEAD_LAYER] = head.build_worn_icon(default_layer = HEAD_LAYER, default_icon_file = 'icons/mob/clothing/head/default.dmi')
 		update_hud_head(head)

 	apply_overlay(HEAD_LAYER)
@@ -371,7 +371,7 @@ There are several things that need to be remembered:
 		var/icon_file

 		if(!(icon_exists(icon_file, RESOLVE_ICON_STATE(worn_item))))
-			icon_file = 'icons/mob/clothing/head.dmi'
+			icon_file = 'icons/mob/clothing/head/default.dmi'

 		head_overlay = head.build_worn_icon(default_layer = HEAD_LAYER, default_icon_file = icon_file)

@@ -189,7 +189,7 @@
 	///right hand icon for holding mobs
 	var/icon/held_rh = 'icons/mob/inhands/pets_held_rh.dmi'
 	///what it looks like when the mob is held on your head
-	var/icon/head_icon = 'icons/mob/clothing/head/pets_held.dmi'
+	var/icon/head_icon = 'icons/mob/clothing/head/pets_head.dmi'
 	/// icon_state for holding mobs.
 	var/held_state = ""

@@ -368,7 +368,7 @@
 		else
 			add_overlay("ov-opencover -c")
 	if(hat)
-		var/mutable_appearance/head_overlay = hat.build_worn_icon(default_layer = 20, default_icon_file = 'icons/mob/clothing/head.dmi')
+		var/mutable_appearance/head_overlay = hat.build_worn_icon(default_layer = 20, default_icon_file = 'icons/mob/clothing/head/default.dmi')
 		head_overlay.pixel_y += hat_offset
 		add_overlay(head_overlay)
 	update_fire()
@@ -1,6 +1,6 @@
 GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't really work on borgos
 	/obj/item/clothing/head/helmet/space,
-	/obj/item/clothing/head/welding,
+	/obj/item/clothing/head/utility/welding,
 	/obj/item/clothing/head/chameleon/broken \
 	)))

@@ -455,7 +455,7 @@
 	..()
 	switch(build_step)
 		if(ASSEMBLY_FIRST_STEP)
-			if(istype(I, /obj/item/clothing/head/hardhat/red))
+			if(istype(I, /obj/item/clothing/head/utility/hardhat/red))
 				if(!user.temporarilyRemoveItemFromInventory(I))
 					return
 				to_chat(user,span_notice("You add the [I] to [src]!"))
@@ -290,7 +290,7 @@
 	var/atom/Tsec = drop_location()

 	new /obj/item/assembly/prox_sensor(Tsec)
-	new /obj/item/clothing/head/hardhat/red(Tsec)
+	new /obj/item/clothing/head/utility/hardhat/red(Tsec)

 	var/turf/T = get_turf(Tsec)

@@ -25,7 +25,7 @@
 	worn_slot_flags = ITEM_SLOT_HEAD
 	held_lh = 'icons/mob/inhands/animal_item_lefthand.dmi'
 	held_rh = 'icons/mob/inhands/animal_item_righthand.dmi'
-	head_icon = 'icons/mob/clothing/head/animal_item_head.dmi'
+	head_icon = 'icons/mob/clothing/head/pets_head.dmi'

 /mob/living/simple_animal/axolotl/Initialize(mapload)
 	. = ..()
@@ -717,7 +717,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
 	icon_state = "breaddog"
 	icon_living = "breaddog"
 	icon_dead = "breaddog_dead"
-	head_icon = 'icons/mob/clothing/head/pets_held_head.dmi'
+	head_icon = 'icons/mob/clothing/head/pets_head.dmi'
 	health = 50
 	maxHealth = 50
 	gender = NEUTER
@@ -124,7 +124,7 @@

 /mob/living/simple_animal/drone/derelict
 	name = "derelict drone"
-	default_hatmask = /obj/item/clothing/head/ushanka
+	default_hatmask = /obj/item/clothing/head/costume/ushanka
 	laws = \
 	"1. You may not involve yourself in the matters of another sentient being outside the station that housed your activation, even if such matters conflict with Law Two or Law Three, unless the other being is another Drone.\n"+\
 	"2. You may not harm any sentient being, regardless of intent or circumstance.\n"+\
@@ -70,7 +70,7 @@
 		if(client && hud_used?.hud_shown)
 			head.screen_loc = ui_drone_head
 			client.screen += head
-		var/used_head_icon = 'icons/mob/clothing/head.dmi'
+		var/used_head_icon = 'icons/mob/clothing/head/utility.dmi'
 		if(istype(head, /obj/item/clothing/mask))
 			used_head_icon = 'icons/mob/clothing/mask.dmi'
 		var/mutable_appearance/head_overlay = head.build_worn_icon(default_layer = DRONE_HEAD_LAYER, default_icon_file = used_head_icon)
@@ -15,7 +15,7 @@
 	taunt_chance = 25
 	turns_per_move = 5
 	see_in_dark = 6
-	butcher_results = list(/obj/item/food/meat/slab/bear = 5, /obj/item/clothing/head/bearpelt = 1)
+	butcher_results = list(/obj/item/food/meat/slab/bear = 5, /obj/item/clothing/head/costume/bearpelt = 1)
 	response_help_continuous = "pets"
 	response_help_simple = "pet"
 	response_disarm_continuous = "gently pushes aside"
@@ -91,7 +91,7 @@
 	icon_living = "combatbear"
 	icon_dead = "combatbear_dead"
 	faction = list("russian")
-	butcher_results = list(/obj/item/food/meat/slab/bear = 5, /obj/item/clothing/head/bearpelt = 1, /obj/item/bear_armor = 1)
+	butcher_results = list(/obj/item/food/meat/slab/bear = 5, /obj/item/clothing/head/costume/bearpelt = 1, /obj/item/bear_armor = 1)
 	melee_damage_lower = 18
 	melee_damage_upper = 20
 	wound_bonus = 0
@@ -12,7 +12,7 @@
 	see_in_dark = 15
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
 	obj_damage = 10
-	butcher_results = list(/obj/item/clothing/head/crown = 1,)
+	butcher_results = list(/obj/item/clothing/head/costume/crown = 1,)
 	response_help_continuous = "glares at"
 	response_help_simple = "glare at"
 	response_disarm_continuous = "skoffs at"
@@ -31,7 +31,7 @@
 	can_be_held = TRUE
 	held_w_class = WEIGHT_CLASS_TINY
 	worn_slot_flags = ITEM_SLOT_HEAD
-	head_icon = 'icons/mob/clothing/head/animal_item_head.dmi'
+	head_icon = 'icons/mob/clothing/head/pets_head.dmi'
 	var/stepped_sound = 'sound/effects/huuu.ogg'
 	///How much of a reagent the mob injects on attack
 	var/poison_per_bite = 3
@@ -77,7 +77,7 @@
 	uniform = /obj/item/clothing/under/costume/pirate
 	shoes = /obj/item/clothing/shoes/jackboots
 	glasses = /obj/item/clothing/glasses/eyepatch
-	head = /obj/item/clothing/head/bandana
+	head = /obj/item/clothing/head/costume/pirate/bandana


 /obj/effect/mob_spawn/corpse/human/pirate/ranged
@@ -87,7 +87,7 @@
 /datum/outfit/piratecorpse/ranged
 	name = "Pirate Gunner Corpse"
 	suit = /obj/item/clothing/suit/costume/pirate
-	head = /obj/item/clothing/head/pirate
+	head = /obj/item/clothing/head/costume/pirate


 /obj/effect/mob_spawn/corpse/human/russian
@@ -100,7 +100,7 @@
 	name = "Russian Corpse"
 	uniform = /obj/item/clothing/under/costume/soviet
 	shoes = /obj/item/clothing/shoes/jackboots
-	head = /obj/item/clothing/head/bearpelt
+	head = /obj/item/clothing/head/costume/bearpelt
 	gloves = /obj/item/clothing/gloves/color/black
 	mask = /obj/item/clothing/mask/gas

@@ -111,7 +111,7 @@

 /datum/outfit/russiancorpse/ranged
 	name = "Ranged Russian Corpse"
-	head = /obj/item/clothing/head/ushanka
+	head = /obj/item/clothing/head/costume/ushanka


 /obj/effect/mob_spawn/corpse/human/russian/ranged/trooper
@@ -138,7 +138,7 @@
 	suit = /obj/item/clothing/suit/jacket/officer/tan
 	shoes = /obj/item/clothing/shoes/combat
 	ears = /obj/item/radio/headset
-	head = /obj/item/clothing/head/ushanka
+	head = /obj/item/clothing/head/costume/ushanka


 /obj/effect/mob_spawn/corpse/human/wizard
@@ -26,7 +26,7 @@
 	ears = /obj/item/radio/headset/heads/captain
 	glasses = /obj/item/clothing/glasses/eyepatch
 	mask = /obj/item/clothing/mask/cigarette/cigar/cohiba
-	head = /obj/item/clothing/head/centhat
+	head = /obj/item/clothing/head/hats/centhat
 	gloves = /obj/item/clothing/gloves/tackler/combat
 	shoes = /obj/item/clothing/shoes/combat/swat
 	r_pocket = /obj/item/lighter
@@ -236,7 +236,7 @@
 	suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
 	suit_store = /obj/item/gun/ballistic/revolver/mateba
 	back = /obj/item/storage/backpack/satchel/leather
-	head = /obj/item/clothing/head/hos/syndicate
+	head = /obj/item/clothing/head/hats/hos/syndicate
 	mask = /obj/item/clothing/mask/cigarette/cigar/havana
 	ears = /obj/item/radio/headset/syndicate/alt/leader
 	glasses = /obj/item/clothing/glasses/thermal/eyepatch
@@ -490,23 +490,23 @@
 	//This list should also be gimmicky, so captains can have fun. I.E. the Santahat, Pirate hat, Tophat, Chefhat...
 	//Yes, I said it, the captain should have fun.
 		list(
-			/obj/item/clothing/head/caphat,
-			/obj/item/clothing/head/crown,
-			/obj/item/clothing/head/centhat,
-			/obj/item/clothing/head/centcom_cap,
-			/obj/item/clothing/head/pirate,
-			/obj/item/clothing/head/santa,
-			/obj/item/clothing/head/hardhat/reindeer,
-			/obj/item/clothing/head/sombrero,
-			/obj/item/clothing/head/kitty,
-			/obj/item/clothing/head/rabbitears,
-			/obj/item/clothing/head/festive,
-			/obj/item/clothing/head/powdered_wig,
-			/obj/item/clothing/head/weddingveil,
-			/obj/item/clothing/head/that,
-			/obj/item/clothing/head/nursehat,
-			/obj/item/clothing/head/chefhat,
-			/obj/item/clothing/head/papersack,
+			/obj/item/clothing/head/hats/caphat,
+			/obj/item/clothing/head/costume/crown,
+			/obj/item/clothing/head/hats/centhat,
+			/obj/item/clothing/head/hats/centcom_cap,
+			/obj/item/clothing/head/costume/pirate,
+			/obj/item/clothing/head/costume/santa,
+			/obj/item/clothing/head/utility/hardhat/reindeer,
+			/obj/item/clothing/head/costume/sombrero/green,
+			/obj/item/clothing/head/costume/kitty,
+			/obj/item/clothing/head/costume/rabbitears,
+			/obj/item/clothing/head/costume/festive,
+			/obj/item/clothing/head/costume/powdered_wig,
+			/obj/item/clothing/head/costume/weddingveil,
+			/obj/item/clothing/head/hats/tophat,
+			/obj/item/clothing/head/costume/nursehat,
+			/obj/item/clothing/head/utility/chefhat,
+			/obj/item/clothing/head/costume/papersack,
 			/obj/item/clothing/head/caphat/beret,
 			))

@@ -552,7 +552,7 @@
 /obj/item/mod/module/hat_stabilizer/generate_worn_overlay()
 	. = ..()
 	if(attached_hat)
-		. += attached_hat.build_worn_icon(default_layer = ABOVE_BODY_FRONT_HEAD_LAYER-0.1, default_icon_file = 'icons/mob/clothing/head.dmi')
+		. += attached_hat.build_worn_icon(default_layer = ABOVE_BODY_FRONT_HEAD_LAYER-0.1, default_icon_file = 'icons/mob/clothing/head/default.dmi')

 /obj/item/mod/module/hat_stabilizer/proc/remove_hat(datum/source, mob/user)
 	SIGNAL_HANDLER
@@ -6,7 +6,7 @@
 	health = 500
 	held_lh = 'icons/mob/inhands/pai_item_lh.dmi'
 	held_rh = 'icons/mob/inhands/pai_item_rh.dmi'
-	head_icon = 'icons/mob/clothing/head/pai_item_head.dmi'
+	head_icon = 'icons/mob/clothing/head/pai_head.dmi'
 	hud_type = /datum/hud/pai
 	icon = 'icons/mob/silicon/pai.dmi'
 	icon_state = "repairbot"
@@ -306,6 +306,7 @@
 	name = "bucket"
 	desc = "It's a bucket."
 	icon = 'icons/obj/janitor.dmi'
+	worn_icon = 'icons/mob/clothing/head/utility.dmi'
 	icon_state = "bucket"
 	inhand_icon_state = "bucket"
 	lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
@@ -210,7 +210,7 @@
 	id = "welding_helmet"
 	build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
 	materials = list(/datum/material/iron = 1750, /datum/material/glass = 400)
-	build_path = /obj/item/clothing/head/welding
+	build_path = /obj/item/clothing/head/utility/welding
 	category = list(
 		RND_CATEGORY_INITIAL,
 		RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING
@@ -834,7 +834,7 @@
 	id = "tinfoil_hat"
 	build_type = AUTOLATHE
 	materials = list(/datum/material/iron = 5500)
-	build_path = /obj/item/clothing/head/foilhat
+	build_path = /obj/item/clothing/head/costume/foilhat
 	category = list(
 		RND_CATEGORY_HACKED,
 		RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_JOKE
@@ -223,5 +223,5 @@
 	id = "rice_hat"
 	build_type = BIOGENERATOR
 	materials = list(/datum/material/biomass= 300)
-	build_path = /obj/item/clothing/head/rice_hat
+	build_path = /obj/item/clothing/head/costume/rice_hat
 	category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_ORGANIC_MATERIALS)
@@ -109,7 +109,7 @@
 	id = "bright_helmet"
 	build_type = PROTOLATHE | AWAY_LATHE
 	materials = list(/datum/material/iron = 4000, /datum/material/glass = 1000, /datum/material/plastic = 3000, /datum/material/silver = 500)
-	build_path = /obj/item/clothing/head/hardhat/red/upgraded
+	build_path = /obj/item/clothing/head/utility/hardhat/red/upgraded
 	category = list(
 		RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING
 	)
--- a/Show More
+++ b/Show More