diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm
index 46a0effdd3b..7b793ef3480 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm
@@ -10,7 +10,7 @@
/obj/effect/mob_spawn/corpse/human/skeleton,
/obj/item/clothing/suit/costume/bronze,
/obj/item/clothing/shoes/bronze,
-/obj/item/clothing/head/bronze,
+/obj/item/clothing/head/costume/bronze,
/turf/open/floor/bronze{
initial_gas_mix = "TEMP=2.7"
},
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
index 6fd1fabd3f9..772b2f1cda9 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
@@ -499,7 +499,7 @@
/obj/structure/rack,
/obj/machinery/light/small/broken/directional/east,
/obj/item/pickaxe,
-/obj/item/clothing/head/hardhat/weldhat/orange,
+/obj/item/clothing/head/utility/hardhat/weldhat/orange,
/turf/open/floor/iron/smooth{
initial_gas_mix = "ICEMOON_ATMOS"
},
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
index d7127ca9294..6fc5d847a04 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
@@ -76,7 +76,7 @@
/turf/open/floor/wood,
/area/ruin/powered)
"jH" = (
-/obj/item/clothing/head/bearpelt,
+/obj/item/clothing/head/costume/bearpelt,
/obj/structure/table/wood,
/obj/item/food/burger/fish,
/obj/item/reagent_containers/cup/glass/bottle/beer{
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm
index c0c580833b6..da7d24193ec 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm
@@ -147,7 +147,7 @@
/area/ruin/unpowered/buried_library)
"aI" = (
/obj/effect/mob_spawn/corpse/human/skeleton,
-/obj/item/clothing/head/rice_hat,
+/obj/item/clothing/head/costume/rice_hat,
/turf/open/floor/cult,
/area/ruin/unpowered/buried_library)
"aJ" = (
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
index de106c87bb8..77e7e0c00b8 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
@@ -955,7 +955,7 @@
/obj/structure/table/wood,
/obj/item/book/manual/wiki/cooking_to_serve_man,
/obj/item/clothing/suit/apron/chef,
-/obj/item/clothing/head/chefhat,
+/obj/item/clothing/head/utility/chefhat,
/turf/open/floor/wood,
/area/ruin/powered/beach)
"Gf" = (
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
index ba0c6f9a672..8283d96e1dd 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
@@ -111,7 +111,7 @@
"r" = (
/obj/structure/chair/wood/wings,
/obj/effect/decal/remains/human,
-/obj/item/clothing/head/festive{
+/obj/item/clothing/head/costume/festive{
desc = "A festive party hat with the name 'timmy' scribbled on the front.";
name = "party hat"
},
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
index 7f66d1c6a86..e34ef54351c 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
@@ -201,7 +201,7 @@
/obj/item/honey_frame,
/obj/item/honey_frame,
/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/machinery/light/directional/west,
/turf/open/floor/vault,
@@ -341,7 +341,7 @@
/obj/item/honey_frame,
/obj/item/honey_frame,
/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/effect/decal/cleanable/cobweb,
/turf/open/floor/vault,
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
index 4575acc7690..afc2bd7ce69 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -1763,7 +1763,7 @@
/obj/item/stack/rods{
amount = 50
},
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/item/stock_parts/cell/high,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -2073,7 +2073,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/item/weldingtool/largetank,
/obj/item/analyzer,
/turf/open/floor/iron,
diff --git a/_maps/RandomRuins/SpaceRuins/DJstation.dmm b/_maps/RandomRuins/SpaceRuins/DJstation.dmm
index 483173c630e..89aa0534e1b 100644
--- a/_maps/RandomRuins/SpaceRuins/DJstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/DJstation.dmm
@@ -93,7 +93,7 @@
/obj/structure/cable,
/obj/machinery/light/small/directional/south,
/obj/structure/closet/crate,
-/obj/item/clothing/head/ushanka,
+/obj/item/clothing/head/costume/ushanka,
/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating,
/area/ruin/space/djstation/service)
diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
index 54a335b23b0..dde9ffa53b2 100644
--- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
+++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
@@ -172,7 +172,7 @@
/area/ruin/space/ks13/hallway/central)
"cg" = (
/obj/structure/table,
-/obj/item/clothing/head/chefhat,
+/obj/item/clothing/head/utility/chefhat,
/obj/structure/cable,
/turf/open/floor/iron/airless,
/area/ruin/space/ks13/service/kitchen)
@@ -1638,7 +1638,7 @@
/area/ruin/space/ks13/science/ordnance)
"sa" = (
/obj/structure/table/wood,
-/obj/item/clothing/head/caphat{
+/obj/item/clothing/head/hats/caphat{
armor = null;
desc = "A worn captains hat. This probably won't protect your noggin too well.";
pixel_x = 7;
@@ -5140,7 +5140,7 @@
/area/ruin/space/ks13/dorms)
"KJ" = (
/obj/structure/table,
-/obj/item/clothing/head/powdered_wig,
+/obj/item/clothing/head/costume/powdered_wig,
/turf/open/floor/iron,
/area/ruin/space/ks13/security/court)
"KL" = (
@@ -7324,25 +7324,25 @@
/obj/item/clothing/head/beanie/darkblue,
/obj/item/clothing/head/beanie/red,
/obj/item/clothing/head/waldo,
-/obj/item/clothing/head/bearpelt,
+/obj/item/clothing/head/costume/bearpelt,
/obj/item/clothing/head/beret,
-/obj/item/clothing/head/bomb_hood,
-/obj/item/clothing/head/bunnyhead,
-/obj/item/clothing/head/cardborg,
+/obj/item/clothing/head/utility/bomb_hood,
+/obj/item/clothing/head/costume/bunnyhead,
+/obj/item/clothing/head/costume/cardborg,
/obj/item/clothing/head/cone,
-/obj/item/clothing/head/festive,
+/obj/item/clothing/head/costume/festive,
/obj/item/clothing/head/helmet/riot,
/obj/item/clothing/head/helmet/sec,
-/obj/item/clothing/head/jester,
-/obj/item/clothing/head/nun_hood,
-/obj/item/clothing/head/papersack,
-/obj/item/clothing/head/rabbitears,
-/obj/item/clothing/head/snowman,
-/obj/item/clothing/head/sombrero,
+/obj/item/clothing/head/costume/jester,
+/obj/item/clothing/head/chaplain/nun_hood,
+/obj/item/clothing/head/costume/papersack,
+/obj/item/clothing/head/costume/rabbitears,
+/obj/item/clothing/head/costume/snowman,
+/obj/item/clothing/head/costume/sombrero/green,
/obj/item/clothing/head/wig,
/obj/item/clothing/head/wizard/fake,
/obj/item/clothing/head/wizard/santa,
-/obj/item/clothing/head/xenos,
+/obj/item/clothing/head/costume/xenos,
/turf/open/floor/iron/airless,
/area/ruin/space/ks13/ai/vault)
"VH" = (
diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
index 17a4809c7c4..56cc5fa2fc0 100644
--- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
+++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
@@ -195,7 +195,7 @@
/area/ruin/space/has_grav/derelictoutpost/dockedship)
"aQ" = (
/obj/structure/closet/crate/radiation,
-/obj/item/clothing/head/radiation,
+/obj/item/clothing/head/utility/radiation,
/obj/item/clothing/suit/utility/radiation,
/obj/item/geiger_counter,
/turf/open/floor/mineral/titanium/yellow,
diff --git a/_maps/RandomRuins/SpaceRuins/derelict6.dmm b/_maps/RandomRuins/SpaceRuins/derelict6.dmm
index e16d3239e68..d4d487ab7e3 100644
--- a/_maps/RandomRuins/SpaceRuins/derelict6.dmm
+++ b/_maps/RandomRuins/SpaceRuins/derelict6.dmm
@@ -283,7 +283,7 @@
/area/ruin/unpowered)
"bi" = (
/obj/item/stack/sheet/iron,
-/obj/item/clothing/head/chefhat,
+/obj/item/clothing/head/utility/chefhat,
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating/airless,
/area/ruin/unpowered)
diff --git a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
index 4acaabb611a..9c267ad9937 100644
--- a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
+++ b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
@@ -86,7 +86,7 @@
/obj/item/clothing/under/rank/cargo/miner,
/obj/item/pickaxe/drill,
/obj/item/clothing/glasses/meson,
-/obj/item/clothing/head/hardhat,
+/obj/item/clothing/head/utility/hardhat,
/obj/effect/turf_decal/box,
/obj/structure/sign/warning/docking/directional/west,
/turf/open/floor/mineral/plastitanium,
@@ -104,7 +104,7 @@
/obj/item/clothing/under/rank/cargo/miner,
/obj/item/pickaxe/drill,
/obj/item/clothing/glasses/meson,
-/obj/item/clothing/head/hardhat,
+/obj/item/clothing/head/utility/hardhat,
/obj/effect/turf_decal/box,
/obj/structure/sign/warning/docking/directional/east,
/turf/open/floor/mineral/plastitanium,
diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
index e8894b41c73..642f7338902 100644
--- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
@@ -99,7 +99,7 @@
/obj/effect/turf_decal/bot,
/obj/item/weldingtool/largetank,
/obj/item/wrench,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/structure/rack,
/turf/open/floor/plating,
/area/ruin/space/has_grav/listeningstation)
diff --git a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
index 70a0fdaf5ce..28ab06fb24d 100644
--- a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
+++ b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
@@ -318,7 +318,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/mob_spawn/corpse/human/damaged{
- outfit_override = list("head" = /obj/item/clothing/head/kitty)
+ outfit_override = list("head" = /obj/item/clothing/head/costume/kitty)
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/powered/cat_man)
@@ -674,7 +674,7 @@
name = "kitty bed"
},
/obj/effect/mob_spawn/corpse/human/damaged{
- outfit_override = list("head" = /obj/item/clothing/head/kitty)
+ outfit_override = list("head" = /obj/item/clothing/head/costume/kitty)
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/powered/cat_man)
diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
index 258695173e3..c9c35ceae29 100644
--- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -1258,7 +1258,7 @@
/obj/item/t_scanner,
/obj/item/screwdriver/power,
/obj/item/storage/belt/utility,
-/obj/item/clothing/head/hardhat/weldhat,
+/obj/item/clothing/head/utility/hardhat/weldhat,
/turf/open/floor/plating,
/area/ruin/space/ancientstation/beta/supermatter)
"ec" = (
@@ -2506,7 +2506,7 @@
/area/ruin/space/ancientstation/charlie/engie)
"hP" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = -3;
pixel_y = 5
},
@@ -6329,7 +6329,7 @@
},
/obj/structure/table,
/obj/item/clothing/gloves/color/fyellow/old,
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = -3;
pixel_y = 5
},
@@ -8550,8 +8550,8 @@
/obj/structure/closet/radiation,
/obj/item/clothing/suit/utility/radiation,
/obj/item/clothing/suit/utility/radiation,
-/obj/item/clothing/head/radiation,
-/obj/item/clothing/head/radiation,
+/obj/item/clothing/head/utility/radiation,
+/obj/item/clothing/head/utility/radiation,
/obj/item/geiger_counter,
/obj/item/geiger_counter,
/obj/machinery/light/small/broken/directional/north,
diff --git a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
index b6e4413984d..2563052175f 100644
--- a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
+++ b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
@@ -144,7 +144,7 @@
/area/ruin/space/has_grav/turretedoutpost)
"aB" = (
/obj/structure/table/reinforced,
-/obj/item/clothing/head/ushanka,
+/obj/item/clothing/head/costume/ushanka,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm
index 596356d24c9..1914bd589e5 100644
--- a/_maps/RandomZLevels/SnowCabin.dmm
+++ b/_maps/RandomZLevels/SnowCabin.dmm
@@ -2031,7 +2031,7 @@
/obj/structure/table/wood,
/obj/item/clothing/suit/hooded/wintercoat/hydro,
/obj/item/clothing/ears/earmuffs,
-/obj/item/clothing/head/hardhat,
+/obj/item/clothing/head/utility/hardhat,
/turf/open/floor/wood/freezing,
/area/awaymission/cabin/lumbermill)
"gZ" = (
@@ -2182,7 +2182,7 @@
/area/awaymission/cabin)
"hv" = (
/obj/structure/table/reinforced,
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_y = 4
},
/obj/effect/decal/cleanable/dirt,
@@ -3709,7 +3709,7 @@
"sK" = (
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/item/clothing/shoes/sneakers/brown,
-/obj/item/clothing/head/warden/police{
+/obj/item/clothing/head/hats/warden/police{
armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 2, "bomb" = 15, "bio" = 0, "fire" = 20, "acid" = 20);
desc = "I am the law!"
},
@@ -3842,7 +3842,7 @@
desc = "The dead body of a snowman. There's holes to stick your own body in it.";
name = "snowman corpse"
},
-/obj/item/clothing/head/snowman{
+/obj/item/clothing/head/costume/snowman{
desc = "The head of a dead snowman. There's enough room inside for your own head.";
pixel_x = -1;
pixel_y = 10
@@ -4203,7 +4203,7 @@
anchored = 1;
name = "Because"
},
-/obj/item/clothing/head/scarecrow_hat{
+/obj/item/clothing/head/costume/scarecrow_hat{
desc = "A replica straw hat that isn't actually made out of straw";
name = "synthetic straw hat";
pixel_x = -1;
@@ -4392,7 +4392,7 @@
anchored = 1;
name = "I Don't Know"
},
-/obj/item/clothing/head/bishopmitre{
+/obj/item/clothing/head/chaplain/bishopmitre{
pixel_x = -1;
pixel_y = 16
},
@@ -4856,7 +4856,7 @@
anchored = 1;
name = "Why"
},
-/obj/item/clothing/head/bandana{
+/obj/item/clothing/head/costume/pirate/bandana{
pixel_x = -1;
pixel_y = -1
},
diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm
index ab3b00e8584..b27e14e9932 100644
--- a/_maps/RandomZLevels/TheBeach.dmm
+++ b/_maps/RandomZLevels/TheBeach.dmm
@@ -123,7 +123,7 @@
desc = "Now this is what island exploration is all about.";
name = "Treasure Chest"
},
-/obj/item/clothing/head/pirate,
+/obj/item/clothing/head/costume/pirate,
/obj/item/clothing/glasses/eyepatch,
/obj/item/clothing/suit/costume/pirate,
/obj/item/claymore/cutlass{
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index 545e9e9c41a..39d2fd80fbd 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -3731,7 +3731,7 @@
/turf/open/floor/plating/snowed/smoothed,
/area/awaymission/snowdin/outside)
"kt" = (
-/obj/item/clothing/head/santa,
+/obj/item/clothing/head/costume/santa,
/turf/open/misc/asteroid/snow,
/area/awaymission/snowdin/outside)
"ku" = (
@@ -5884,7 +5884,7 @@
/area/awaymission/snowdin/post/engineering)
"qd" = (
/obj/structure/reagent_dispensers/fueltank,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/item/weldingtool/largetank,
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible{
@@ -9600,7 +9600,7 @@
/area/awaymission/snowdin/post/mining_main/robotics)
"Gy" = (
/obj/structure/table,
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = -3;
pixel_y = 5
},
@@ -9671,7 +9671,7 @@
/obj/structure/statue/snow/snowman{
anchored = 1
},
-/obj/item/clothing/head/bowler{
+/obj/item/clothing/head/hats/bowler{
pixel_y = 13
},
/turf/open/misc/asteroid/snow,
@@ -12381,7 +12381,7 @@
/obj/structure/statue/snow/snowman{
name = "Snow-Luc Price"
},
-/obj/item/clothing/head/hos{
+/obj/item/clothing/head/hats/hos{
pixel_y = 10
},
/turf/open/misc/asteroid/snow,
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index 7ccd1a1abdb..29c63d47c63 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -4457,7 +4457,7 @@
"ky" = (
/obj/structure/table,
/obj/item/storage/belt/utility,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/structure/sign/warning/biohazard/directional/north,
/obj/item/assembly/prox_sensor,
/obj/item/assembly/prox_sensor,
diff --git a/_maps/map_files/CTF/downtown.dmm b/_maps/map_files/CTF/downtown.dmm
index f6086ee9748..8643f2d2a7b 100644
--- a/_maps/map_files/CTF/downtown.dmm
+++ b/_maps/map_files/CTF/downtown.dmm
@@ -1538,7 +1538,7 @@
/obj/structure/rack{
resistance_flags = 64
},
-/obj/item/clothing/head/hardhat/dblue{
+/obj/item/clothing/head/utility/hardhat/dblue{
name = "blue hardhat"
},
/turf/open/floor/carpet/blue,
@@ -1739,7 +1739,7 @@
/obj/structure/rack{
resistance_flags = 64
},
-/obj/item/clothing/head/hardhat/red,
+/obj/item/clothing/head/utility/hardhat/red,
/turf/open/floor/carpet/red,
/area/centcom/ctf)
"JM" = (
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index b2b103b8ebe..a82cd23b638 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -3463,7 +3463,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/item/weldingtool,
/obj/item/assembly/voice,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -5751,8 +5751,8 @@
/obj/structure/sign/poster/contraband/random/directional/west,
/obj/structure/table/wood,
/obj/item/newspaper,
-/obj/item/clothing/head/bowler,
-/obj/item/clothing/head/festive{
+/obj/item/clothing/head/hats/bowler,
+/obj/item/clothing/head/costume/festive{
pixel_x = 6;
pixel_y = 13
},
@@ -10043,19 +10043,19 @@
pixel_x = -3;
pixel_y = -3
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
@@ -12375,7 +12375,7 @@
/obj/structure/table/reinforced,
/obj/item/storage/belt/utility,
/obj/item/weldingtool,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/machinery/newscaster/directional/north,
/turf/open/floor/iron,
/area/station/commons/storage/primary)
@@ -15744,7 +15744,7 @@
/obj/machinery/light/small/directional/east,
/obj/effect/decal/cleanable/dirt,
/obj/item/clothing/suit/costume/cardborg,
-/obj/item/clothing/head/cardborg,
+/obj/item/clothing/head/costume/cardborg,
/turf/open/floor/wood,
/area/station/service/theater/abandoned)
"dKg" = (
@@ -19776,7 +19776,7 @@
/obj/effect/turf_decal/bot,
/obj/item/wrench,
/obj/item/storage/belt/utility,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/effect/decal/cleanable/dirt,
/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron,
@@ -22516,23 +22516,23 @@
pixel_x = -3;
pixel_y = -3
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
@@ -23930,7 +23930,7 @@
"fLc" = (
/obj/structure/table/wood,
/obj/item/clothing/neck/tie/red,
-/obj/item/clothing/head/that,
+/obj/item/clothing/head/hats/tophat,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/service/electronic_marketing_den)
@@ -28864,7 +28864,7 @@
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
/obj/item/clothing/suit/apron/chef,
-/obj/item/clothing/head/chefhat,
+/obj/item/clothing/head/utility/chefhat,
/obj/item/reagent_containers/condiment/flour,
/obj/effect/turf_decal/bot,
/obj/structure/sign/poster/contraband/random/directional/south,
@@ -29046,7 +29046,7 @@
/area/station/service/abandoned_gambling_den/gaming)
"gWz" = (
/obj/structure/closet/secure_closet/chief_medical,
-/obj/item/clothing/head/nursehat,
+/obj/item/clothing/head/costume/nursehat,
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/obj/effect/turf_decal/stripes/line,
/obj/machinery/status_display/ai/directional/north,
@@ -29252,7 +29252,7 @@
pixel_x = 1
},
/obj/item/multitool,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/effect/turf_decal/siding/purple{
dir = 8
},
@@ -33460,15 +33460,15 @@
pixel_x = -3;
pixel_y = -3
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
@@ -35571,7 +35571,7 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/table/wood,
/obj/item/clothing/under/costume/maid,
-/obj/item/clothing/head/kitty,
+/obj/item/clothing/head/costume/kitty,
/obj/structure/sign/poster/official/report_crimes{
pixel_y = 32
},
@@ -36502,7 +36502,7 @@
/obj/machinery/door/firedoor,
/obj/item/storage/bag/tray,
/obj/item/clothing/suit/apron/chef,
-/obj/item/clothing/head/chefhat,
+/obj/item/clothing/head/utility/chefhat,
/obj/machinery/door/poddoor/shutters/preopen{
dir = 8;
id = "cafe_counter";
@@ -36517,7 +36517,7 @@
/obj/structure/rack,
/obj/item/weldingtool,
/obj/item/wrench,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/item/clothing/gloves/color/yellow,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -40867,7 +40867,7 @@
"jPX" = (
/obj/structure/table,
/obj/item/cane,
-/obj/item/clothing/head/bowler{
+/obj/item/clothing/head/hats/bowler{
pixel_y = 2
},
/obj/effect/turf_decal/trimline/neutral/filled/corner{
@@ -42455,7 +42455,7 @@
},
/obj/structure/reagent_dispensers/servingdish,
/obj/structure/reagent_dispensers/servingdish,
-/obj/item/clothing/head/chefhat,
+/obj/item/clothing/head/utility/chefhat,
/turf/open/floor/iron/cafeteria,
/area/station/security/prison/mess)
"kic" = (
@@ -52467,15 +52467,15 @@
pixel_x = -3;
pixel_y = -3
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
@@ -60543,15 +60543,15 @@
pixel_x = -3;
pixel_y = -3
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
@@ -61888,7 +61888,7 @@
/obj/item/weldingtool,
/obj/effect/turf_decal/bot,
/obj/item/wrench,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/turf/open/floor/iron,
/area/station/engineering/main)
"pes" = (
@@ -67529,7 +67529,7 @@
/area/station/science/explab)
"qvv" = (
/obj/structure/table/wood,
-/obj/item/clothing/head/papersack/smiley,
+/obj/item/clothing/head/costume/papersack/smiley,
/obj/item/pen,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -80139,7 +80139,7 @@
/obj/effect/spawner/random/trash/box,
/obj/effect/spawner/random/clothing/twentyfive_percent_cyborg_mask,
/obj/item/clothing/suit/costume/cardborg,
-/obj/item/clothing/head/cardborg,
+/obj/item/clothing/head/costume/cardborg,
/turf/open/floor/plating,
/area/station/maintenance/port)
"tCq" = (
@@ -84192,7 +84192,7 @@
/obj/item/weldingtool,
/obj/machinery/light/directional/north,
/obj/item/wrench,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron,
/area/station/engineering/atmos)
@@ -87142,7 +87142,7 @@
/obj/effect/turf_decal/siding/yellow,
/obj/structure/table,
/obj/item/storage/toolbox/mechanical,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/turf/open/floor/iron/dark,
/area/station/medical/chemistry)
"vmL" = (
@@ -97885,9 +97885,9 @@
/obj/machinery/airalarm/directional/north,
/obj/effect/landmark/start/hangover/closet,
/obj/effect/spawner/random/structure/closet_private,
-/obj/item/clothing/head/kitty,
+/obj/item/clothing/head/costume/kitty,
/obj/item/clothing/under/costume/maid,
-/obj/item/clothing/head/rabbitears,
+/obj/item/clothing/head/costume/rabbitears,
/obj/item/clothing/under/dress/redeveninggown,
/turf/open/floor/wood,
/area/station/commons/dorms)
@@ -98802,7 +98802,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/item/stack/package_wrap,
/obj/item/hand_labeler,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index 8b20f401826..985f3beea10 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -1235,7 +1235,7 @@
/obj/item/tank/internals/oxygen,
/obj/item/clothing/mask/gas,
/obj/item/extinguisher,
-/obj/item/clothing/head/hardhat/red,
+/obj/item/clothing/head/utility/hardhat/red,
/obj/item/clothing/glasses/meson,
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -2228,7 +2228,7 @@
"aLG" = (
/obj/structure/rack,
/obj/structure/window/reinforced/spawner/east,
-/obj/item/clothing/head/fancy,
+/obj/item/clothing/head/costume/fancy,
/turf/open/floor/iron/dark/textured,
/area/station/security/prison)
"aLJ" = (
@@ -2743,7 +2743,7 @@
/obj/item/storage/belt/utility,
/obj/item/wrench,
/obj/item/weldingtool,
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = -3;
pixel_y = 5
},
@@ -7236,7 +7236,7 @@
/obj/item/clothing/suit/costume/snowman{
name = "Man of Snow"
},
-/obj/item/clothing/head/snowman{
+/obj/item/clothing/head/costume/snowman{
name = "Head of Snow";
pixel_y = 9
},
@@ -8659,7 +8659,7 @@
/area/station/commons/locker)
"cBj" = (
/obj/structure/closet/emcloset,
-/obj/item/clothing/head/festive,
+/obj/item/clothing/head/costume/festive,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"cBn" = (
@@ -9808,7 +9808,7 @@
/obj/item/honey_frame,
/obj/item/clothing/suit/utility/beekeeper_suit,
/obj/item/clothing/suit/hooded/bee_costume,
-/obj/item/clothing/head/beekeeper_head,
+/obj/item/clothing/head/utility/beekeeper_head,
/obj/item/clothing/head/hooded/bee_hood,
/obj/item/melee/flyswatter,
/obj/item/queen_bee/bought,
@@ -21989,7 +21989,7 @@
"gFR" = (
/obj/structure/table/reinforced,
/obj/item/clothing/suit/utility/radiation,
-/obj/item/clothing/head/radiation,
+/obj/item/clothing/head/utility/radiation,
/obj/item/geiger_counter,
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -22760,7 +22760,7 @@
"gSr" = (
/obj/structure/table/reinforced,
/obj/item/clothing/suit/utility/radiation,
-/obj/item/clothing/head/radiation,
+/obj/item/clothing/head/utility/radiation,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -25611,7 +25611,7 @@
/area/station/ai_monitored/turret_protected/aisat_interior)
"hPf" = (
/obj/structure/safe,
-/obj/item/clothing/head/bearpelt,
+/obj/item/clothing/head/costume/bearpelt,
/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass,
/obj/item/gun/ballistic/revolver/russian,
@@ -32641,7 +32641,7 @@
/area/station/engineering/main)
"jWO" = (
/obj/item/soap/nanotrasen,
-/obj/item/clothing/head/sombrero,
+/obj/item/clothing/head/costume/sombrero/green,
/obj/structure/table/wood,
/obj/structure/sign/poster/random/directional/north,
/turf/open/floor/wood/tile,
@@ -34943,7 +34943,7 @@
/obj/structure/closet/secure_closet/personal{
anchored = 1
},
-/obj/item/clothing/head/bandana,
+/obj/item/clothing/head/costume/pirate/bandana,
/turf/open/floor/iron,
/area/station/maintenance/starboard/fore)
"kHn" = (
@@ -34969,7 +34969,7 @@
/obj/structure/table,
/obj/item/stack/sheet/iron/fifty,
/obj/item/stack/sheet/glass/fifty,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/item/stack/sheet/mineral/plasma{
amount = 35
},
@@ -39272,7 +39272,7 @@
"maY" = (
/obj/item/wrench,
/obj/item/weldingtool,
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = -3;
pixel_y = 5
},
@@ -43994,7 +43994,7 @@
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/east,
/obj/item/storage/toolbox/mechanical,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/turf/open/floor/iron/dark/textured_half{
dir = 1
},
@@ -44894,7 +44894,7 @@
/turf/open/floor/iron,
/area/station/cargo/miningdock)
"nME" = (
-/obj/item/clothing/head/hardhat,
+/obj/item/clothing/head/utility/hardhat,
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/surface/outdoors/nospawn)
"nMN" = (
@@ -47380,11 +47380,11 @@
/obj/structure/table,
/obj/item/storage/box,
/obj/item/storage/box,
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = -3;
pixel_y = 7
},
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = -5;
pixel_y = 3
},
@@ -57137,7 +57137,7 @@
pixel_x = 1;
pixel_y = 6
},
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = -3;
pixel_y = 5
},
@@ -57160,15 +57160,15 @@
dir = 1
},
/obj/structure/table,
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = 4;
pixel_y = 5
},
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = 2;
pixel_y = 3
},
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/sign/poster/official/safety_internals{
pixel_x = 31
@@ -66228,7 +66228,7 @@
pixel_x = -2;
pixel_y = -1
},
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = -3;
pixel_y = 5
},
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 155a1eae36b..c780db60174 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -12425,8 +12425,8 @@
pixel_y = 5
},
/obj/item/storage/belt/utility,
-/obj/item/clothing/head/welding,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
+/obj/item/clothing/head/utility/welding,
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
@@ -14419,7 +14419,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_y = 4
},
/obj/machinery/camera/directional/north{
@@ -20570,7 +20570,7 @@
},
/obj/structure/rack,
/obj/item/clothing/under/costume/lobster,
-/obj/item/clothing/head/lobsterhat,
+/obj/item/clothing/head/costume/lobsterhat,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/siding/wood/corner{
dir = 1
@@ -25654,7 +25654,7 @@
},
/obj/item/storage/belt/utility,
/obj/item/weldingtool/largetank,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/machinery/firealarm/directional/east,
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -28528,15 +28528,15 @@
/obj/item/clothing/suit/hazardvest,
/obj/item/clothing/suit/hazardvest,
/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 6
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 6
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 6
},
@@ -30326,11 +30326,11 @@
/obj/structure/table,
/obj/item/stack/sheet/iron/fifty,
/obj/item/stack/sheet/iron/fifty,
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = 4;
pixel_y = 4
},
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -32722,7 +32722,7 @@
/area/station/service/chapel/funeral)
"jhc" = (
/obj/structure/table/bronze,
-/obj/item/clothing/head/bronze{
+/obj/item/clothing/head/costume/bronze{
pixel_x = 5;
pixel_y = 4
},
@@ -33278,7 +33278,7 @@
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
-/obj/item/clothing/head/chefhat{
+/obj/item/clothing/head/utility/chefhat{
pixel_x = -4;
pixel_y = 4
},
@@ -43070,7 +43070,7 @@
/obj/structure/table/wood,
/obj/machinery/light/small/directional/north,
/obj/item/clothing/suit/toggle/suspenders,
-/obj/item/clothing/head/papersack/smiley,
+/obj/item/clothing/head/costume/papersack/smiley,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/station/maintenance/port/fore)
@@ -44479,7 +44479,7 @@
/obj/item/stack/sheet/iron/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/storage/belt/utility,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/item/clothing/glasses/welding,
/obj/structure/noticeboard/directional/north,
/turf/open/floor/iron/dark,
@@ -46547,7 +46547,7 @@
},
/obj/item/storage/briefcase,
/obj/item/clothing/neck/tie/red,
-/obj/item/clothing/head/bowler{
+/obj/item/clothing/head/hats/bowler{
pixel_y = 8
},
/obj/item/cane,
@@ -51745,7 +51745,7 @@
pixel_x = -2;
pixel_y = 6
},
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_y = 5
},
/obj/item/crowbar/red,
@@ -61927,7 +61927,7 @@
},
/obj/structure/table,
/obj/item/storage/toolbox/mechanical,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/machinery/light/directional/north,
/turf/open/floor/iron/showroomfloor,
/area/station/medical/chemistry)
@@ -72591,7 +72591,7 @@
"uHc" = (
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/blood/old,
-/obj/item/clothing/head/that{
+/obj/item/clothing/head/hats/tophat{
pixel_x = 1;
pixel_y = 6
},
@@ -76554,7 +76554,7 @@
/turf/open/floor/engine/vacuum,
/area/station/maintenance/disposal/incinerator)
"vKp" = (
-/obj/item/clothing/head/cardborg,
+/obj/item/clothing/head/costume/cardborg,
/obj/item/clothing/suit/costume/cardborg,
/obj/structure/closet/cardboard/metal,
/obj/machinery/airalarm/directional/east,
@@ -77966,7 +77966,7 @@
/obj/machinery/light/small/directional/north,
/obj/effect/decal/cleanable/dirt,
/obj/item/clothing/neck/tie/red,
-/obj/item/clothing/head/bowler{
+/obj/item/clothing/head/hats/bowler{
pixel_x = -6;
pixel_y = 6
},
@@ -80464,7 +80464,7 @@
},
/obj/item/poster/random_official,
/obj/effect/turf_decal/stripes/corner,
-/obj/item/clothing/head/festive{
+/obj/item/clothing/head/costume/festive{
pixel_x = -4;
pixel_y = 6
},
@@ -84336,7 +84336,7 @@
/obj/item/stack/sheet/iron/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/storage/belt/utility,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/item/clothing/glasses/welding,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm/directional/west,
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index a299d7c3efc..5d98fd74498 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -2711,7 +2711,7 @@
/area/station/science/xenobiology)
"aWB" = (
/obj/effect/spawner/random/structure/closet_maintenance,
-/obj/item/clothing/head/festive,
+/obj/item/clothing/head/costume/festive,
/obj/effect/spawner/random/maintenance/two,
/obj/item/clothing/gloves/color/fyellow,
/turf/open/floor/plating,
@@ -10091,7 +10091,7 @@
/area/station/security/prison/safe)
"dLY" = (
/obj/structure/table/wood,
-/obj/item/clothing/head/sombrero,
+/obj/item/clothing/head/costume/sombrero/green,
/obj/structure/sign/poster/random/directional/east,
/turf/open/floor/wood,
/area/station/service/theater)
@@ -20103,7 +20103,7 @@
/area/station/command/teleporter)
"huF" = (
/obj/item/clothing/suit/costume/snowman,
-/obj/item/clothing/head/snowman,
+/obj/item/clothing/head/costume/snowman,
/turf/open/floor/fake_snow,
/area/station/maintenance/port/aft)
"huG" = (
@@ -23219,7 +23219,7 @@
},
/obj/item/storage/toolbox/electrical,
/obj/item/multitool,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/item/clothing/glasses/welding,
/turf/open/floor/iron,
/area/station/science/robotics/lab)
@@ -26079,15 +26079,15 @@
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_y = 9
},
/obj/machinery/power/apc/auto_name/directional/north,
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = -3;
pixel_y = 7
},
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = -5;
pixel_y = 3
},
@@ -30255,7 +30255,7 @@
"kQx" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/item/weldingtool,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/turf/open/floor/iron,
/area/station/construction/storage_wing)
"kQz" = (
@@ -37019,7 +37019,7 @@
amount = 4
},
/obj/item/clothing/suit/apron/chef,
-/obj/item/clothing/head/chefhat,
+/obj/item/clothing/head/utility/chefhat,
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
@@ -42272,10 +42272,10 @@
/obj/structure/rack,
/obj/item/clothing/suit/hazardvest,
/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat"
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat"
},
/obj/item/clothing/mask/breath,
@@ -57478,7 +57478,7 @@
dir = 8
},
/obj/item/cultivator,
-/obj/item/clothing/head/chefhat,
+/obj/item/clothing/head/utility/chefhat,
/obj/machinery/camera/directional/west{
c_tag = "Service - Starboard"
},
@@ -57892,7 +57892,7 @@
/obj/structure/table/reinforced,
/obj/item/stack/package_wrap,
/obj/item/hand_labeler,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
"ush" = (
@@ -63243,7 +63243,7 @@
/obj/effect/turf_decal/tile/bar{
dir = 1
},
-/obj/item/clothing/head/that,
+/obj/item/clothing/head/hats/tophat,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/table,
@@ -64894,7 +64894,7 @@
/obj/structure/sign/warning/electric_shock/directional/east,
/obj/structure/table,
/obj/item/storage/toolbox/mechanical,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 4
},
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index edf528bfab3..d370bd1c4ed 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -11396,7 +11396,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
-/obj/item/clothing/head/festive{
+/obj/item/clothing/head/costume/festive{
pixel_x = -4;
pixel_y = 6
},
@@ -13629,7 +13629,7 @@
"Oe" = (
/obj/structure/closet/crate/bin,
/obj/item/clothing/suit/costume/xenos,
-/obj/item/clothing/head/xenos,
+/obj/item/clothing/head/costume/xenos,
/obj/item/xenos_claw,
/obj/item/grown/log/bamboo,
/obj/item/grown/log/bamboo,
@@ -16564,7 +16564,7 @@
/obj/structure/rack,
/obj/item/storage/box/donkpockets,
/obj/item/storage/box/donkpockets,
-/obj/item/clothing/head/chefhat,
+/obj/item/clothing/head/utility/chefhat,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/status_display/evac/directional/west,
/turf/open/floor/iron/dark,
diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_2.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_2.dmm
index 64bbcbba0e5..9acd0790b2a 100644
--- a/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_2.dmm
+++ b/_maps/map_files/tramstation/modular_pieces/maintenance_loweratmosci_2.dmm
@@ -329,8 +329,8 @@
/obj/structure/rack,
/obj/item/clothing/suit/hazardvest,
/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/head/hardhat/orange,
-/obj/item/clothing/head/hardhat/orange,
+/obj/item/clothing/head/utility/hardhat/orange,
+/obj/item/clothing/head/utility/hardhat/orange,
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
"Fb" = (
diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_attachment_b_2.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_attachment_b_2.dmm
index 20bc68f9dc3..039d2a60eb9 100644
--- a/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_attachment_b_2.dmm
+++ b/_maps/map_files/tramstation/modular_pieces/maintenance_lowerdorm_attachment_b_2.dmm
@@ -48,7 +48,7 @@
pixel_x = 1;
pixel_y = 5
},
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = -5;
pixel_y = 3
},
diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_lowersecurity_2.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_lowersecurity_2.dmm
index 4a370c6cbdb..859bc13f2b9 100644
--- a/_maps/map_files/tramstation/modular_pieces/maintenance_lowersecurity_2.dmm
+++ b/_maps/map_files/tramstation/modular_pieces/maintenance_lowersecurity_2.dmm
@@ -143,7 +143,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/sand/plating,
-/obj/item/clothing/head/hardhat,
+/obj/item/clothing/head/utility/hardhat,
/obj/effect/landmark/event_spawn,
/turf/open/floor/plating,
/area/station/maintenance/central/greater)
diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_lowersecurity_attachment_2.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_lowersecurity_attachment_2.dmm
index d94723277af..8f941f72c95 100644
--- a/_maps/map_files/tramstation/modular_pieces/maintenance_lowersecurity_attachment_2.dmm
+++ b/_maps/map_files/tramstation/modular_pieces/maintenance_lowersecurity_attachment_2.dmm
@@ -71,7 +71,7 @@
name = "security promotional overflow"
},
/obj/item/clothing/under/rank/security/officer/spacepol,
-/obj/item/clothing/head/spacepolice,
+/obj/item/clothing/head/costume/spacepolice,
/obj/item/poster/random_official,
/obj/item/poster/random_official,
/obj/item/toy/figure/secofficer,
diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_lowerservicecargo_attachment_b_1.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_lowerservicecargo_attachment_b_1.dmm
index 22a91543c15..77c939a69d4 100644
--- a/_maps/map_files/tramstation/modular_pieces/maintenance_lowerservicecargo_attachment_b_1.dmm
+++ b/_maps/map_files/tramstation/modular_pieces/maintenance_lowerservicecargo_attachment_b_1.dmm
@@ -21,7 +21,7 @@
/area/station/maintenance/starboard/greater)
"m" = (
/obj/item/shovel,
-/obj/item/clothing/head/hardhat,
+/obj/item/clothing/head/utility/hardhat,
/turf/open/misc/asteroid,
/area/station/maintenance/starboard/greater)
"p" = (
diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_upperbridgeright_attachment_b_1.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_upperbridgeright_attachment_b_1.dmm
index 2e173bbcb9c..671acf87fd2 100644
--- a/_maps/map_files/tramstation/modular_pieces/maintenance_upperbridgeright_attachment_b_1.dmm
+++ b/_maps/map_files/tramstation/modular_pieces/maintenance_upperbridgeright_attachment_b_1.dmm
@@ -36,7 +36,7 @@
/obj/effect/spawner/random/engineering/tool,
/obj/effect/spawner/random/engineering/tool,
/obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/head/hardhat,
+/obj/item/clothing/head/utility/hardhat,
/turf/open/floor/iron/smooth,
/area/station/maintenance/department/security)
"M" = (
diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_upperbridgeright_attachment_b_2.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_upperbridgeright_attachment_b_2.dmm
index 128761d571d..d461ea65d02 100644
--- a/_maps/map_files/tramstation/modular_pieces/maintenance_upperbridgeright_attachment_b_2.dmm
+++ b/_maps/map_files/tramstation/modular_pieces/maintenance_upperbridgeright_attachment_b_2.dmm
@@ -23,7 +23,7 @@
},
/obj/structure/rack,
/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/head/hardhat/orange,
+/obj/item/clothing/head/utility/hardhat/orange,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth,
/area/station/maintenance/department/security)
diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_upperdormsleft_attachment_2.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_upperdormsleft_attachment_2.dmm
index e262c8b62c4..5255ec36954 100644
--- a/_maps/map_files/tramstation/modular_pieces/maintenance_upperdormsleft_attachment_2.dmm
+++ b/_maps/map_files/tramstation/modular_pieces/maintenance_upperdormsleft_attachment_2.dmm
@@ -4,7 +4,7 @@
/area/station/maintenance/port/aft)
"c" = (
/obj/effect/turf_decal/sand/plating,
-/obj/item/clothing/head/hardhat/weldhat/orange,
+/obj/item/clothing/head/utility/hardhat/weldhat/orange,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"f" = (
diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_upperdormsright_attachment_2.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_upperdormsright_attachment_2.dmm
index 9260f4addf5..39388436dc6 100644
--- a/_maps/map_files/tramstation/modular_pieces/maintenance_upperdormsright_attachment_2.dmm
+++ b/_maps/map_files/tramstation/modular_pieces/maintenance_upperdormsright_attachment_2.dmm
@@ -54,7 +54,7 @@
"K" = (
/obj/effect/decal/cleanable/cobweb,
/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/head/hardhat/orange,
+/obj/item/clothing/head/utility/hardhat/orange,
/turf/open/misc/asteroid,
/area/station/maintenance/department/medical)
"M" = (
diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_upperdormsright_attachment_3.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_upperdormsright_attachment_3.dmm
index 2479cba27b9..9a2a99e9ad6 100644
--- a/_maps/map_files/tramstation/modular_pieces/maintenance_upperdormsright_attachment_3.dmm
+++ b/_maps/map_files/tramstation/modular_pieces/maintenance_upperdormsright_attachment_3.dmm
@@ -129,7 +129,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/remains/human,
/obj/item/storage/belt/utility/full/engi,
-/obj/item/clothing/head/hardhat,
+/obj/item/clothing/head/utility/hardhat,
/obj/structure/spider/stickyweb,
/turf/open/floor/iron/smooth,
/area/station/maintenance/department/medical)
diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_uppermedsci_attachment_a_2.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_uppermedsci_attachment_a_2.dmm
index 7285bc20e2f..0d1699b4d6b 100644
--- a/_maps/map_files/tramstation/modular_pieces/maintenance_uppermedsci_attachment_a_2.dmm
+++ b/_maps/map_files/tramstation/modular_pieces/maintenance_uppermedsci_attachment_a_2.dmm
@@ -21,7 +21,7 @@
/obj/structure/closet/body_bag,
/mob/living/simple_animal/hostile/skeleton,
/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/head/hardhat,
+/obj/item/clothing/head/utility/hardhat,
/obj/item/paper/calling_card,
/turf/open/misc/asteroid,
/area/station/maintenance/department/medical)
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index 28bb092f6aa..7f540b554ec 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -4929,12 +4929,12 @@
/obj/structure/closet{
name = "Beekeeper Uniform"
},
-/obj/item/clothing/head/beekeeper_head,
+/obj/item/clothing/head/utility/beekeeper_head,
/obj/item/melee/flyswatter,
/obj/effect/turf_decal/trimline/green/filled/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/item/clothing/suit/utility/beekeeper_suit,
-/obj/item/clothing/head/beekeeper_head,
+/obj/item/clothing/head/utility/beekeeper_head,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"bSP" = (
@@ -14644,7 +14644,7 @@
/area/station/medical/storage)
"fkc" = (
/obj/structure/safe,
-/obj/item/clothing/head/bearpelt,
+/obj/item/clothing/head/costume/bearpelt,
/obj/item/gun/ballistic/revolver/russian,
/obj/item/ammo_box/a357,
/obj/effect/turf_decal/bot_white/left,
@@ -16198,7 +16198,7 @@
dir = 9
},
/obj/item/storage/toolbox/mechanical,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
"fOw" = (
@@ -17069,7 +17069,7 @@
/area/station/cargo/lobby)
"ggv" = (
/obj/structure/table/reinforced,
-/obj/item/clothing/head/radiation,
+/obj/item/clothing/head/utility/radiation,
/obj/item/clothing/glasses/meson,
/obj/item/geiger_counter,
/obj/item/geiger_counter,
@@ -23367,11 +23367,11 @@
/area/station/security/warden)
"ivk" = (
/obj/structure/table,
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = -3;
pixel_y = 7
},
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = -5;
pixel_y = 3
},
@@ -33051,7 +33051,7 @@
"lOM" = (
/obj/structure/table,
/obj/item/storage/box/tail_pin,
-/obj/item/clothing/head/festive,
+/obj/item/clothing/head/costume/festive,
/turf/open/floor/eighties/red,
/area/station/commons/fitness/recreation/entertainment)
"lPe" = (
@@ -39490,7 +39490,7 @@
pixel_y = 3
},
/obj/item/storage/toolbox/electrical,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/item/clothing/glasses/welding,
/obj/machinery/newscaster/directional/north,
/turf/open/floor/iron/dark,
@@ -46351,7 +46351,7 @@
/area/station/engineering/atmos)
"qzD" = (
/obj/structure/table/reinforced,
-/obj/item/clothing/head/radiation,
+/obj/item/clothing/head/utility/radiation,
/obj/item/clothing/glasses/meson,
/obj/item/clothing/glasses/meson,
/obj/effect/turf_decal/stripes/line{
@@ -53631,7 +53631,7 @@
"tcD" = (
/obj/item/wrench,
/obj/item/weldingtool,
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = -3;
pixel_y = 5
},
diff --git a/_maps/shuttles/arrival_delta.dmm b/_maps/shuttles/arrival_delta.dmm
index 8b735b0bb16..a0710a1080e 100644
--- a/_maps/shuttles/arrival_delta.dmm
+++ b/_maps/shuttles/arrival_delta.dmm
@@ -100,23 +100,23 @@
pixel_x = -3;
pixel_y = -3
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
diff --git a/_maps/shuttles/arrival_kilo.dmm b/_maps/shuttles/arrival_kilo.dmm
index b4956b6dfb0..5fab5b6fb98 100644
--- a/_maps/shuttles/arrival_kilo.dmm
+++ b/_maps/shuttles/arrival_kilo.dmm
@@ -56,11 +56,11 @@
pixel_x = -3;
pixel_y = -3
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
diff --git a/_maps/shuttles/emergency_bballhooper.dmm b/_maps/shuttles/emergency_bballhooper.dmm
index 2d0c19f790b..605d27bc6d0 100644
--- a/_maps/shuttles/emergency_bballhooper.dmm
+++ b/_maps/shuttles/emergency_bballhooper.dmm
@@ -157,23 +157,23 @@
pixel_x = -3;
pixel_y = -3
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
@@ -637,34 +637,34 @@
/area/shuttle/escape)
"JR" = (
/obj/structure/table,
-/obj/item/clothing/head/hardhat/red{
+/obj/item/clothing/head/utility/hardhat/red{
name = "A La Penners' Helmet";
pixel_x = 8;
pixel_y = -5
},
/obj/machinery/light/cold/directional/north,
-/obj/item/clothing/head/hardhat/red{
+/obj/item/clothing/head/utility/hardhat/red{
name = "A La Penners' Helmet";
pixel_x = 8;
pixel_y = 1
},
-/obj/item/clothing/head/hardhat/red{
+/obj/item/clothing/head/utility/hardhat/red{
name = "A La Penners' Helmet";
pixel_x = 8;
pixel_y = 7
},
/obj/machinery/status_display/evac/directional/north,
-/obj/item/clothing/head/hardhat/red{
+/obj/item/clothing/head/utility/hardhat/red{
name = "A La Penners' Helmet";
pixel_x = -7;
pixel_y = -5
},
-/obj/item/clothing/head/hardhat/red{
+/obj/item/clothing/head/utility/hardhat/red{
name = "A La Penners' Helmet";
pixel_x = -7;
pixel_y = 1
},
-/obj/item/clothing/head/hardhat/red{
+/obj/item/clothing/head/utility/hardhat/red{
name = "A La Penners' Helmet";
pixel_x = -7;
pixel_y = 7
@@ -817,32 +817,32 @@
/area/shuttle/escape)
"Tg" = (
/obj/structure/table,
-/obj/item/clothing/head/hardhat/dblue{
+/obj/item/clothing/head/utility/hardhat/dblue{
pixel_x = 8;
pixel_y = -5;
name = "Hopping Jezzerton's Helmet"
},
-/obj/item/clothing/head/hardhat/dblue{
+/obj/item/clothing/head/utility/hardhat/dblue{
pixel_x = 8;
pixel_y = 1;
name = "Hopping Jezzerton's Helmet"
},
-/obj/item/clothing/head/hardhat/dblue{
+/obj/item/clothing/head/utility/hardhat/dblue{
pixel_x = 8;
pixel_y = 9;
name = "Hopping Jezzerton's Helmet"
},
-/obj/item/clothing/head/hardhat/dblue{
+/obj/item/clothing/head/utility/hardhat/dblue{
pixel_x = -7;
pixel_y = -5;
name = "Hopping Jezzerton's Helmet"
},
-/obj/item/clothing/head/hardhat/dblue{
+/obj/item/clothing/head/utility/hardhat/dblue{
pixel_x = -7;
pixel_y = 1;
name = "Hopping Jezzerton's Helmet"
},
-/obj/item/clothing/head/hardhat/dblue{
+/obj/item/clothing/head/utility/hardhat/dblue{
pixel_x = -7;
pixel_y = 9;
name = "Hopping Jezzerton's Helmet"
diff --git a/_maps/shuttles/emergency_casino.dmm b/_maps/shuttles/emergency_casino.dmm
index f44345f0309..4265ebcb6a5 100644
--- a/_maps/shuttles/emergency_casino.dmm
+++ b/_maps/shuttles/emergency_casino.dmm
@@ -231,23 +231,23 @@
pixel_x = -3;
pixel_y = -3
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
@@ -718,7 +718,7 @@
/obj/item/skub,
/obj/effect/turf_decal/delivery,
/obj/item/reagent_containers/cup/glass/bottle/hooch,
-/obj/item/clothing/head/foilhat,
+/obj/item/clothing/head/costume/foilhat,
/obj/structure/sign/poster/random/directional/west,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
@@ -1040,7 +1040,7 @@
/obj/machinery/roulette{
anchored = 1
},
-/obj/item/clothing/head/sombrero,
+/obj/item/clothing/head/costume/sombrero/green,
/turf/open/floor/carpet/green,
/area/shuttle/escape)
"Ev" = (
diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm
index ecc20f4d367..44210c9ab17 100644
--- a/_maps/shuttles/emergency_delta.dmm
+++ b/_maps/shuttles/emergency_delta.dmm
@@ -91,23 +91,23 @@
pixel_x = -3;
pixel_y = -3
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
@@ -568,7 +568,7 @@
/obj/item/clothing/suit/utility/fire/firefighter,
/obj/item/tank/internals/oxygen/red,
/obj/item/clothing/mask/gas,
-/obj/item/clothing/head/hardhat/red,
+/obj/item/clothing/head/utility/hardhat/red,
/obj/effect/turf_decal/bot,
/obj/machinery/light/directional/west,
/turf/open/floor/iron,
diff --git a/_maps/shuttles/emergency_kilo.dmm b/_maps/shuttles/emergency_kilo.dmm
index 921f9744ed0..8e27bef8625 100644
--- a/_maps/shuttles/emergency_kilo.dmm
+++ b/_maps/shuttles/emergency_kilo.dmm
@@ -135,11 +135,11 @@
pixel_x = -3;
pixel_y = -3
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
@@ -492,11 +492,11 @@
pixel_x = -3;
pixel_y = -3
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
diff --git a/_maps/shuttles/emergency_medisim.dmm b/_maps/shuttles/emergency_medisim.dmm
index b57a558879a..685fdd87ec3 100644
--- a/_maps/shuttles/emergency_medisim.dmm
+++ b/_maps/shuttles/emergency_medisim.dmm
@@ -790,23 +790,23 @@
pixel_x = -3;
pixel_y = -3
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
@@ -1086,7 +1086,7 @@
/obj/item/tank/internals/oxygen/red,
/obj/item/clothing/suit/utility/fire/firefighter,
/obj/item/clothing/mask/gas,
-/obj/item/clothing/head/hardhat/red,
+/obj/item/clothing/head/utility/hardhat/red,
/obj/machinery/light/directional/west,
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency_meta.dmm
index e192e60c478..b447e69fb1d 100644
--- a/_maps/shuttles/emergency_meta.dmm
+++ b/_maps/shuttles/emergency_meta.dmm
@@ -130,23 +130,23 @@
pixel_x = -3;
pixel_y = -3
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
@@ -568,7 +568,7 @@
/obj/item/tank/internals/oxygen/red,
/obj/item/clothing/suit/utility/fire/firefighter,
/obj/item/clothing/mask/gas,
-/obj/item/clothing/head/hardhat/red,
+/obj/item/clothing/head/utility/hardhat/red,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -706,23 +706,23 @@
pixel_x = -3;
pixel_y = -3
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
diff --git a/_maps/shuttles/emergency_monastery.dmm b/_maps/shuttles/emergency_monastery.dmm
index b2d59f2625d..2894ac35c17 100644
--- a/_maps/shuttles/emergency_monastery.dmm
+++ b/_maps/shuttles/emergency_monastery.dmm
@@ -1149,7 +1149,7 @@
},
/obj/structure/closet,
/obj/item/storage/backpack/cultpack,
-/obj/item/clothing/head/nun_hood,
+/obj/item/clothing/head/chaplain/nun_hood,
/obj/item/clothing/suit/chaplainsuit/nun,
/obj/item/clothing/suit/chaplainsuit/holidaypriest,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -1726,9 +1726,9 @@
/obj/item/clothing/suit/utility/beekeeper_suit,
/obj/item/clothing/suit/utility/beekeeper_suit,
/obj/item/clothing/suit/utility/beekeeper_suit,
-/obj/item/clothing/head/beekeeper_head,
-/obj/item/clothing/head/beekeeper_head,
-/obj/item/clothing/head/beekeeper_head,
+/obj/item/clothing/head/utility/beekeeper_head,
+/obj/item/clothing/head/utility/beekeeper_head,
+/obj/item/clothing/head/utility/beekeeper_head,
/obj/item/melee/flyswatter,
/obj/item/melee/flyswatter,
/obj/item/melee/flyswatter,
@@ -2245,7 +2245,7 @@
/obj/structure/closet/cabinet,
/obj/item/clothing/suit/chaplainsuit/holidaypriest,
/obj/item/clothing/suit/chaplainsuit/nun,
-/obj/item/clothing/head/nun_hood,
+/obj/item/clothing/head/chaplain/nun_hood,
/obj/machinery/button/door{
id = "Cell2";
name = "Cell Bolt Control";
@@ -2405,7 +2405,7 @@
/obj/structure/closet/cabinet,
/obj/item/clothing/suit/chaplainsuit/holidaypriest,
/obj/item/clothing/suit/chaplainsuit/nun,
-/obj/item/clothing/head/nun_hood,
+/obj/item/clothing/head/chaplain/nun_hood,
/obj/machinery/button/door{
id = "Cell1";
name = "Cell Bolt Control";
@@ -3074,7 +3074,7 @@
/area/shuttle/escape)
"PJ" = (
/obj/structure/table/wood,
-/obj/item/clothing/head/pharaoh,
+/obj/item/clothing/head/costume/pharaoh,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
diff --git a/_maps/shuttles/emergency_omega.dmm b/_maps/shuttles/emergency_omega.dmm
index 72d47d23422..fa00387c237 100644
--- a/_maps/shuttles/emergency_omega.dmm
+++ b/_maps/shuttles/emergency_omega.dmm
@@ -171,23 +171,23 @@
pixel_x = -3;
pixel_y = -3
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm
index c88b86ae9ff..fa440f81836 100644
--- a/_maps/shuttles/emergency_raven.dmm
+++ b/_maps/shuttles/emergency_raven.dmm
@@ -279,7 +279,7 @@
/obj/item/tank/internals/oxygen/red,
/obj/item/clothing/suit/utility/fire/firefighter,
/obj/item/clothing/mask/gas,
-/obj/item/clothing/head/hardhat/red,
+/obj/item/clothing/head/utility/hardhat/red,
/obj/effect/decal/cleanable/dirt,
/obj/item/extinguisher,
/turf/open/floor/iron/dark,
@@ -1403,23 +1403,23 @@
pixel_x = -3;
pixel_y = -3
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
@@ -1474,7 +1474,7 @@
/obj/item/tank/internals/oxygen/red,
/obj/item/clothing/suit/utility/fire/firefighter,
/obj/item/clothing/mask/gas,
-/obj/item/clothing/head/hardhat/red,
+/obj/item/clothing/head/utility/hardhat/red,
/turf/open/floor/iron/dark,
/area/shuttle/escape)
"da" = (
@@ -1783,7 +1783,7 @@
"dy" = (
/obj/effect/turf_decal/bot_white,
/obj/structure/rack,
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = -3;
pixel_y = 5
},
diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm
index 4aba416a7a0..8b3f521dc1d 100644
--- a/_maps/shuttles/infiltrator_basic.dmm
+++ b/_maps/shuttles/infiltrator_basic.dmm
@@ -827,7 +827,7 @@
},
/area/shuttle/syndicate/medical)
"vv" = (
-/obj/item/clothing/head/hos/syndicate,
+/obj/item/clothing/head/hats/hos/syndicate,
/obj/item/stamp/syndicate{
pixel_x = -7
},
diff --git a/_maps/shuttles/labour_delta.dmm b/_maps/shuttles/labour_delta.dmm
index f47217c9a9a..78152755b84 100644
--- a/_maps/shuttles/labour_delta.dmm
+++ b/_maps/shuttles/labour_delta.dmm
@@ -187,23 +187,23 @@
pixel_x = -3;
pixel_y = -3
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
diff --git a/_maps/shuttles/mining_delta.dmm b/_maps/shuttles/mining_delta.dmm
index a4f4ea8ba41..da805e42f04 100644
--- a/_maps/shuttles/mining_delta.dmm
+++ b/_maps/shuttles/mining_delta.dmm
@@ -182,23 +182,23 @@
pixel_x = -3;
pixel_y = -3
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
diff --git a/_maps/shuttles/mining_kilo.dmm b/_maps/shuttles/mining_kilo.dmm
index fa0752a503f..0ccbadad5da 100644
--- a/_maps/shuttles/mining_kilo.dmm
+++ b/_maps/shuttles/mining_kilo.dmm
@@ -158,11 +158,11 @@
pixel_x = -3;
pixel_y = -3
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
diff --git a/_maps/shuttles/mining_large.dmm b/_maps/shuttles/mining_large.dmm
index 4aa1977458b..92f52fe5a9d 100644
--- a/_maps/shuttles/mining_large.dmm
+++ b/_maps/shuttles/mining_large.dmm
@@ -284,23 +284,23 @@
pixel_x = -3;
pixel_y = -3
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
-/obj/item/clothing/head/hardhat/orange{
+/obj/item/clothing/head/utility/hardhat/orange{
name = "protective hat";
pixel_y = 9
},
diff --git a/_maps/shuttles/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin_pirate_cutter.dmm
index ffc74b121ca..a65657d48b0 100644
--- a/_maps/shuttles/ruin_pirate_cutter.dmm
+++ b/_maps/shuttles/ruin_pirate_cutter.dmm
@@ -10,7 +10,7 @@
/obj/item/clothing/suit/costume/pirate,
/obj/item/clothing/under/costume/pirate,
/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/head/bandana,
+/obj/item/clothing/head/costume/pirate/bandana,
/turf/open/floor/iron/dark/side{
dir = 5
},
@@ -243,7 +243,7 @@
/obj/item/clothing/suit/costume/pirate,
/obj/item/clothing/under/costume/pirate,
/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/head/bandana,
+/obj/item/clothing/head/costume/pirate/bandana,
/obj/effect/turf_decal/tile/red{
dir = 1
},
diff --git a/_maps/shuttles/starfury_corvette.dmm b/_maps/shuttles/starfury_corvette.dmm
index d46935bb8b7..07f9e85994e 100644
--- a/_maps/shuttles/starfury_corvette.dmm
+++ b/_maps/shuttles/starfury_corvette.dmm
@@ -138,7 +138,7 @@
/obj/structure/rack,
/obj/item/storage/toolbox/mechanical,
/obj/item/multitool,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/window/reinforced/survival_pod{
dir = 8
diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm
index f410a1d8747..0527f8c50e9 100644
--- a/_maps/shuttles/whiteship_delta.dmm
+++ b/_maps/shuttles/whiteship_delta.dmm
@@ -639,7 +639,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/rack,
/obj/item/storage/toolbox/mechanical,
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = -3;
pixel_y = 5
},
@@ -716,7 +716,7 @@
pixel_x = 3;
pixel_y = 3
},
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = -2;
pixel_y = 1
},
@@ -1111,7 +1111,7 @@
desc = "They look like human remains, and have clearly been gnawed at."
},
/obj/effect/decal/cleanable/blood/gibs/old,
-/obj/item/clothing/head/centhat{
+/obj/item/clothing/head/hats/centhat{
desc = "There's a gouge through the top where something has clawed clean through it. Whoever was wearing it probably doesn't need a hat any more.";
name = "\improper damaged CentCom hat";
pixel_x = 2;
diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm
index f98d246c01e..abab63efaa5 100644
--- a/_maps/shuttles/whiteship_meta.dmm
+++ b/_maps/shuttles/whiteship_meta.dmm
@@ -1033,7 +1033,7 @@
pixel_x = -2;
pixel_y = -1
},
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = -2;
pixel_y = 1
},
@@ -1210,7 +1210,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/bot_white,
/obj/structure/rack,
-/obj/item/clothing/head/welding{
+/obj/item/clothing/head/utility/welding{
pixel_x = -3;
pixel_y = 5
},
@@ -1895,7 +1895,7 @@
/obj/structure/rack,
/obj/item/storage/belt/utility,
/obj/item/weldingtool,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/cargo)
diff --git a/_maps/shuttles/whiteship_tram.dmm b/_maps/shuttles/whiteship_tram.dmm
index 9e35940ed7d..c77a65a8850 100644
--- a/_maps/shuttles/whiteship_tram.dmm
+++ b/_maps/shuttles/whiteship_tram.dmm
@@ -59,7 +59,7 @@
pixel_y = 4
},
/obj/item/flashlight,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/effect/turf_decal/bot_white,
/obj/machinery/light/cold/no_nightlight/directional/west,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
diff --git a/_maps/templates/battlecruiser_starfury.dmm b/_maps/templates/battlecruiser_starfury.dmm
index 7cc415445bc..b0e721586fa 100644
--- a/_maps/templates/battlecruiser_starfury.dmm
+++ b/_maps/templates/battlecruiser_starfury.dmm
@@ -1409,7 +1409,7 @@
/obj/structure/table,
/obj/item/storage/toolbox/mechanical,
/obj/item/multitool,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/effect/turf_decal/siding/thinplating_new/dark,
/obj/effect/turf_decal/stripes/red/line,
/turf/open/floor/mineral/plastitanium/red,
@@ -1665,7 +1665,7 @@
/obj/item/wrench,
/obj/item/weldingtool,
/obj/item/storage/toolbox/mechanical,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/machinery/firealarm/directional/south,
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 9
@@ -2690,7 +2690,7 @@
pixel_x = 2
},
/obj/item/card/id/advanced/black/syndicate_command/captain_id/syndie_spare,
-/obj/item/clothing/head/hos/syndicate,
+/obj/item/clothing/head/hats/hos/syndicate,
/obj/item/clothing/head/hos/beret/syndicate,
/obj/item/clothing/under/syndicate/skirt,
/obj/item/clothing/under/syndicate,
@@ -3509,7 +3509,7 @@
pixel_y = -1
},
/obj/item/multitool,
-/obj/item/clothing/head/welding,
+/obj/item/clothing/head/utility/welding,
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
diff --git a/_maps/templates/holodeck_anthophillia.dmm b/_maps/templates/holodeck_anthophillia.dmm
index 1ab367c976e..555038e909d 100644
--- a/_maps/templates/holodeck_anthophillia.dmm
+++ b/_maps/templates/holodeck_anthophillia.dmm
@@ -11,7 +11,7 @@
/area/template_noop)
"U" = (
/obj/effect/holodeck_effect/mobspawner/bee,
-/obj/item/clothing/head/beekeeper_head,
+/obj/item/clothing/head/utility/beekeeper_head,
/turf/open/floor/holofloor/asteroid,
/area/template_noop)
"W" = (
diff --git a/_maps/templates/holodeck_chapelcourt.dmm b/_maps/templates/holodeck_chapelcourt.dmm
index 925fe3da976..bffce1abc3d 100644
--- a/_maps/templates/holodeck_chapelcourt.dmm
+++ b/_maps/templates/holodeck_chapelcourt.dmm
@@ -33,7 +33,7 @@
"d" = (
/obj/structure/table/wood/fancy,
/obj/item/clothing/suit/chaplainsuit/nun,
-/obj/item/clothing/head/nun_hood,
+/obj/item/clothing/head/chaplain/nun_hood,
/obj/item/clothing/suit/chaplainsuit/holidaypriest,
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -221,7 +221,7 @@
/area/template_noop)
"F" = (
/obj/item/clothing/suit/costume/judgerobe,
-/obj/item/clothing/head/powdered_wig,
+/obj/item/clothing/head/costume/powdered_wig,
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 1
diff --git a/_maps/templates/holodeck_thunderdome1218.dmm b/_maps/templates/holodeck_thunderdome1218.dmm
index dde50e98b90..8002ce4fad6 100644
--- a/_maps/templates/holodeck_thunderdome1218.dmm
+++ b/_maps/templates/holodeck_thunderdome1218.dmm
@@ -64,7 +64,7 @@
/area/template_noop)
"C" = (
/obj/structure/table/wood/fancy,
-/obj/item/clothing/head/crown/fancy{
+/obj/item/clothing/head/costume/crown/fancy{
pixel_y = 6
},
/turf/open/floor/holofloor/grass,
diff --git a/_maps/templates/holodeck_winterwonderland.dmm b/_maps/templates/holodeck_winterwonderland.dmm
index 6ab85e235b9..86b851d0aa0 100644
--- a/_maps/templates/holodeck_winterwonderland.dmm
+++ b/_maps/templates/holodeck_winterwonderland.dmm
@@ -71,7 +71,7 @@
/turf/open/floor/holofloor/snow,
/area/template_noop)
"G" = (
-/obj/item/clothing/head/ushanka{
+/obj/item/clothing/head/costume/ushanka{
pixel_x = -5;
pixel_y = 6
},
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
index aed3a79ea09..afc501cecc0 100644
--- a/code/_globalvars/lists/maintenance_loot.dm
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -152,7 +152,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
//light sources
/obj/effect/spawner/random/decoration/glowstick = 1,
- /obj/item/clothing/head/hardhat/red = 1,
+ /obj/item/clothing/head/utility/hardhat/red = 1,
/obj/item/flashlight = 1,
/obj/item/flashlight/flare = 1,
) = 1,
@@ -183,7 +183,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
/obj/item/clothing/glasses/welding = 1,
/obj/item/clothing/gloves/tackler/offbrand = 1,
/obj/item/clothing/head/helmet/old = 1,
- /obj/item/clothing/head/welding = 1,
+ /obj/item/clothing/head/utility/welding = 1,
/obj/item/clothing/mask/muzzle = 1,
/obj/item/clothing/suit/armor/vest/old = 1,
/obj/item/storage/belt/medical = 1,
diff --git a/code/_globalvars/phobias.dm b/code/_globalvars/phobias.dm
index 56b8b00dfe9..f803088ea46 100644
--- a/code/_globalvars/phobias.dm
+++ b/code/_globalvars/phobias.dm
@@ -127,7 +127,7 @@ GLOBAL_LIST_INIT(phobia_objs, list(
"clowns" = typecacheof(list(
/obj/item/bedsheet/clown,
- /obj/item/clothing/head/clownmitre,
+ /obj/item/clothing/head/chaplain/clownmitre,
/obj/item/clothing/mask/gas/clown_hat,
/obj/item/clothing/shoes/clown_shoes,
/obj/item/clothing/suit/chaplainsuit/clownpriest,
@@ -169,7 +169,7 @@ GLOBAL_LIST_INIT(phobia_objs, list(
)),
"lizards" = typecacheof(list(
- /obj/item/clothing/head/lizard,
+ /obj/item/clothing/head/costume/lizard,
/obj/item/clothing/shoes/cowboy/lizard,
/obj/item/food/kebab/tail,
/obj/item/organ/external/tail/lizard,
@@ -249,7 +249,7 @@ GLOBAL_LIST_INIT(phobia_objs, list(
"doctors" = typecacheof(list(
/obj/item/cautery,
/obj/item/circular_saw,
- /obj/item/clothing/head/plaguedoctorhat,
+ /obj/item/clothing/head/bio_hood/plague,
/obj/item/clothing/mask/gas/plaguedoctor,
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit,
/obj/item/clothing/under/rank/medical,
@@ -401,7 +401,7 @@ GLOBAL_LIST_INIT(phobia_objs, list(
)),
"anime" = typecacheof(list(
- /obj/item/clothing/head/kitty/genuine,
+ /obj/item/clothing/head/costume/kitty/genuine,
/obj/item/clothing/mask/gas/ninja,
/obj/item/clothing/under/syndicate/ninja,
/obj/item/clothing/under/costume/schoolgirl,
@@ -420,8 +420,8 @@ GLOBAL_LIST_INIT(phobia_objs, list(
)),
"birds" = typecacheof(list(
- /obj/item/clothing/head/chicken,
- /obj/item/clothing/head/griffin,
+ /obj/item/clothing/head/costume/chicken,
+ /obj/item/clothing/head/costume/griffin,
/obj/item/clothing/head/helmet/space/freedom,
/obj/item/clothing/mask/gas/owl_mask,
/obj/item/clothing/mask/gas/plaguedoctor,
diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm
index cc1f8b12a86..f7cc24f2cef 100644
--- a/code/datums/components/crafting/recipes.dm
+++ b/code/datums/components/crafting/recipes.dm
@@ -429,7 +429,7 @@
reqs = list(/obj/item/extinguisher = 1,
/obj/item/bodypart/r_arm/robot = 1,
/obj/item/assembly/prox_sensor = 1,
- /obj/item/clothing/head/hardhat/red = 1)
+ /obj/item/clothing/head/utility/hardhat/red = 1)
time = 4 SECONDS
category = CAT_ROBOT
@@ -642,21 +642,21 @@
/datum/crafting_recipe/lizardhat
name = "Lizard Cloche Hat"
- result = /obj/item/clothing/head/lizard
+ result = /obj/item/clothing/head/costume/lizard
time = 1 SECONDS
reqs = list(/obj/item/organ/external/tail/lizard = 1)
category = CAT_CLOTHING
/datum/crafting_recipe/lizardhat_alternate
name = "Lizard Cloche Hat"
- result = /obj/item/clothing/head/lizard
+ result = /obj/item/clothing/head/costume/lizard
time = 1 SECONDS
reqs = list(/obj/item/stack/sheet/animalhide/lizard = 1)
category = CAT_CLOTHING
/datum/crafting_recipe/kittyears
name = "Kitty Ears"
- result = /obj/item/clothing/head/kitty/genuine
+ result = /obj/item/clothing/head/costume/kitty/genuine
time = 1 SECONDS
reqs = list(/obj/item/organ/external/tail/cat = 1,
/obj/item/organ/internal/ears/cat = 1)
@@ -1116,7 +1116,7 @@
/datum/crafting_recipe/flower_garland
name = "Flower Garland"
- result = /obj/item/clothing/head/garland
+ result = /obj/item/clothing/head/costume/garland
time = 1 SECONDS
reqs = list(/obj/item/food/grown/poppy = 4,
/obj/item/food/grown/harebell = 4,
diff --git a/code/datums/components/crafting/tailoring.dm b/code/datums/components/crafting/tailoring.dm
index e86e6bbfdcd..0b1a8fdc16a 100644
--- a/code/datums/components/crafting/tailoring.dm
+++ b/code/datums/components/crafting/tailoring.dm
@@ -167,7 +167,7 @@
/datum/crafting_recipe/tv_helmet
name = "Television Helmet"
- result = /obj/item/clothing/head/tv_head
+ result = /obj/item/clothing/head/costume/tv_head
tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_CROWBAR)
reqs = list(/obj/item/wallframe/status_display = 1)
time = 2 SECONDS
diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm
index eee5a77ad5b..9e7051c9d31 100644
--- a/code/datums/components/tackle.dm
+++ b/code/datums/components/tackle.dm
@@ -373,7 +373,7 @@
var/mob/living/carbon/human/S = user
var/head_slot = S.get_item_by_slot(ITEM_SLOT_HEAD)
var/suit_slot = S.get_item_by_slot(ITEM_SLOT_OCLOTHING)
- if(head_slot && (istype(head_slot,/obj/item/clothing/head/helmet) || istype(head_slot,/obj/item/clothing/head/hardhat)))
+ if(head_slot && (istype(head_slot,/obj/item/clothing/head/helmet) || istype(head_slot,/obj/item/clothing/head/utility/hardhat)))
oopsie_mod -= 6
if(suit_slot && (istype(suit_slot,/obj/item/clothing/suit/armor/riot)))
oopsie_mod -= 6
diff --git a/code/datums/greyscale/config_types/greyscale_configs.dm b/code/datums/greyscale/config_types/greyscale_configs.dm
index 7892c1b8791..ce2215fe2c2 100644
--- a/code/datums/greyscale/config_types/greyscale_configs.dm
+++ b/code/datums/greyscale/config_types/greyscale_configs.dm
@@ -627,12 +627,12 @@
/datum/greyscale_config/heck_helmet
name = "H.E.C.K. Helmet"
- icon_file = 'icons/obj/clothing/hats.dmi'
+ icon_file = 'icons/obj/clothing/head/helmet.dmi'
json_config = 'code/datums/greyscale/json_configs/heck_helmet.json'
/datum/greyscale_config/heck_helmet/worn
name = "H.E.C.K. Helmet Worn"
- icon_file = 'icons/mob/clothing/head.dmi'
+ icon_file = 'icons/mob/clothing/head/helmet.dmi'
json_config = 'code/datums/greyscale/json_configs/heck_helmet_worn.json'
/datum/greyscale_config/plaidskirt
@@ -677,12 +677,12 @@
/datum/greyscale_config/beanie
name = "Beanie"
- icon_file = 'icons/obj/clothing/hats.dmi'
+ icon_file = 'icons/obj/clothing/head/beanie.dmi'
json_config = 'code/datums/greyscale/json_configs/beanie.json'
/datum/greyscale_config/beanie_worn
name = "Worn Beanie"
- icon_file = 'icons/mob/clothing/head.dmi'
+ icon_file = 'icons/mob/clothing/head/beanie.dmi'
json_config = 'code/datums/greyscale/json_configs/beanie_worn.json'
/datum/greyscale_config/scarf
@@ -827,12 +827,12 @@
/datum/greyscale_config/football_helmet
name = "Football Helmet"
- icon_file = 'icons/obj/clothing/hats.dmi'
+ icon_file = 'icons/obj/clothing/head/costume.dmi'
json_config = 'code/datums/greyscale/json_configs/football_helmet.json'
/datum/greyscale_config/football_helmet_worn
name = "Worn Football Helmet"
- icon_file = 'icons/mob/clothing/head.dmi'
+ icon_file = 'icons/mob/clothing/head/costume.dmi'
json_config = 'code/datums/greyscale/json_configs/football_helmet_worn.json'
/datum/greyscale_config/football_suit
@@ -867,12 +867,12 @@
/datum/greyscale_config/fancy_hat
name = "Fancy Hat"
- icon_file = 'icons/obj/clothing/hats.dmi'
+ icon_file = 'icons/obj/clothing/head/costume.dmi'
json_config = 'code/datums/greyscale/json_configs/fancy_hat.json'
/datum/greyscale_config/fancy_hat_worn
name = "Worn Fancy Hat"
- icon_file = 'icons/mob/clothing/head.dmi'
+ icon_file = 'icons/mob/clothing/head/costume.dmi'
json_config = 'code/datums/greyscale/json_configs/fancy_hat_worn.json'
/datum/greyscale_config/fancy_coat
diff --git a/code/datums/martial/psychotic_brawl.dm b/code/datums/martial/psychotic_brawl.dm
index 329144feebb..e79e6095ffc 100644
--- a/code/datums/martial/psychotic_brawl.dm
+++ b/code/datums/martial/psychotic_brawl.dm
@@ -51,7 +51,7 @@
A.apply_damage(rand(5,10), A.get_attack_type(), BODY_ZONE_HEAD)
if (iscarbon(D))
var/mob/living/carbon/defender = D
- if(!istype(defender.head,/obj/item/clothing/head/helmet/) && !istype(defender.head,/obj/item/clothing/head/hardhat))
+ if(!istype(defender.head,/obj/item/clothing/head/helmet/) && !istype(defender.head,/obj/item/clothing/head/utility/hardhat))
defender.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5)
A.Stun(rand(10,45))
D.Stun(rand(5,30))
diff --git a/code/datums/quirks/negative.dm b/code/datums/quirks/negative.dm
index 093054d4aec..e2d5f4ed3a7 100644
--- a/code/datums/quirks/negative.dm
+++ b/code/datums/quirks/negative.dm
@@ -257,9 +257,9 @@
/obj/item/clothing/glasses/blindfold,
/obj/item/bedsheet/random,
/obj/item/clothing/under/misc/pj/red,
- /obj/item/clothing/head/nightcap/red,
+ /obj/item/clothing/head/costume/nightcap/red,
/obj/item/clothing/under/misc/pj/blue,
- /obj/item/clothing/head/nightcap/blue,
+ /obj/item/clothing/head/costume/nightcap/blue,
)
/datum/quirk/hypersensitive
@@ -958,7 +958,7 @@
if(istype(possible_saint_nick.back, /obj/item/storage/backpack/santabag))
return TRUE
- if(istype(possible_saint_nick.head, /obj/item/clothing/head/santa))
+ if(istype(possible_saint_nick.head, /obj/item/clothing/head/costume/santa))
return TRUE
if(istype(possible_saint_nick.wear_suit, /obj/item/clothing/suit/space/santa))
diff --git a/code/datums/quirks/neutral.dm b/code/datums/quirks/neutral.dm
index 2c9f58dd3e9..ab68a7d42e1 100644
--- a/code/datums/quirks/neutral.dm
+++ b/code/datums/quirks/neutral.dm
@@ -300,7 +300,7 @@
value = 0
medical_record_text = "Fucking creep kept staring at me the whole damn checkup. I'm only diagnosing this because it's less awkward than thinking it was on purpose."
mob_trait = TRAIT_SHIFTY_EYES
- mail_goodies = list(/obj/item/clothing/head/papersack, /obj/item/clothing/head/papersack/smiley)
+ mail_goodies = list(/obj/item/clothing/head/costume/papersack, /obj/item/clothing/head/costume/papersack/smiley)
/datum/quirk/item_quirk/bald
name = "Smooth-Headed"
diff --git a/code/datums/station_traits/negative_traits.dm b/code/datums/station_traits/negative_traits.dm
index b97091ffd05..9b34b4c63a5 100644
--- a/code/datums/station_traits/negative_traits.dm
+++ b/code/datums/station_traits/negative_traits.dm
@@ -60,12 +60,12 @@
if(!prob(35))
return
var/obj/item/hat = pick(
- /obj/item/clothing/head/sombrero,
+ /obj/item/clothing/head/costume/sombrero/green,
/obj/item/clothing/head/fedora,
/obj/item/clothing/mask/balaclava,
- /obj/item/clothing/head/ushanka,
- /obj/item/clothing/head/cardborg,
- /obj/item/clothing/head/pirate,
+ /obj/item/clothing/head/costume/ushanka,
+ /obj/item/clothing/head/costume/cardborg,
+ /obj/item/clothing/head/costume/pirate,
/obj/item/clothing/head/cone,
)
hat = new hat(spawned_mob)
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 3d56e3f4470..2baea6ffefd 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -123,7 +123,7 @@
/obj/machinery/suit_storage_unit/radsuit
name = "radiation suit storage unit"
suit_type = /obj/item/clothing/suit/utility/radiation
- helmet_type = /obj/item/clothing/head/radiation
+ helmet_type = /obj/item/clothing/head/utility/radiation
storage_type = /obj/item/geiger_counter
/obj/machinery/suit_storage_unit/open
diff --git a/code/game/objects/effects/anomaly_dimensional_themes.dm b/code/game/objects/effects/anomaly_dimensional_themes.dm
index a3080b71b9d..478eaebfa66 100644
--- a/code/game/objects/effects/anomaly_dimensional_themes.dm
+++ b/code/game/objects/effects/anomaly_dimensional_themes.dm
@@ -286,7 +286,7 @@
sound = SFX_SHATTER
/datum/dimension_theme/fancy
- icon = 'icons/obj/clothing/hats.dmi'
+ icon = 'icons/obj/clothing/head/costume.dmi'
icon_state = "fancycrown"
replace_walls = /turf/closed/wall/mineral/wood/nonmetal
diff --git a/code/game/objects/effects/spawners/costume.dm b/code/game/objects/effects/spawners/costume.dm
index 1e8fb03f601..187004aba39 100644
--- a/code/game/objects/effects/spawners/costume.dm
+++ b/code/game/objects/effects/spawners/costume.dm
@@ -17,7 +17,7 @@
name = "chicken costume spawner"
items = list(
/obj/item/clothing/suit/costume/chickensuit,
- /obj/item/clothing/head/chicken,
+ /obj/item/clothing/head/costume/chicken,
/obj/item/food/egg,
)
@@ -49,7 +49,7 @@
name = "nyangirl costume spawner"
items = list(
/obj/item/clothing/under/costume/schoolgirl,
- /obj/item/clothing/head/kitty,
+ /obj/item/clothing/head/costume/kitty,
/obj/item/clothing/glasses/blindfold,
)
@@ -68,7 +68,7 @@
/obj/item/clothing/accessory/waistcoat,
/obj/item/clothing/under/suit/black,
/obj/item/clothing/neck/tie/black,
- /obj/item/clothing/head/that,
+ /obj/item/clothing/head/hats/tophat,
)
/obj/effect/spawner/costume/referee
@@ -104,7 +104,7 @@
name = "plague doctor costume spawner"
items = list(
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit,
- /obj/item/clothing/head/plaguedoctorhat,
+ /obj/item/clothing/head/bio_hood/plague,
/obj/item/clothing/mask/gas/plaguedoctor,
)
@@ -122,7 +122,7 @@
/obj/item/clothing/suit/toggle/owlwings/griffinwings,
/obj/item/clothing/shoes/griffin,
/obj/item/clothing/under/costume/griffin,
- /obj/item/clothing/head/griffin,
+ /obj/item/clothing/head/costume/griffin,
)
/obj/effect/spawner/costume/waiter
@@ -146,7 +146,7 @@
name = "commie costume spawner"
items = list(
/obj/item/clothing/under/costume/soviet,
- /obj/item/clothing/head/ushanka,
+ /obj/item/clothing/head/costume/ushanka,
)
/obj/effect/spawner/costume/imperium_monk
@@ -172,7 +172,7 @@
name = "cute witch costume spawner"
items = list(
/obj/item/clothing/under/dress/sundress,
- /obj/item/clothing/head/witchwig,
+ /obj/item/clothing/head/costume/witchwig,
/obj/item/staff/broom,
)
diff --git a/code/game/objects/effects/spawners/random/clothing.dm b/code/game/objects/effects/spawners/random/clothing.dm
index a03d69a2efe..437c9475458 100644
--- a/code/game/objects/effects/spawners/random/clothing.dm
+++ b/code/game/objects/effects/spawners/random/clothing.dm
@@ -13,28 +13,28 @@
name = "beret or rabbit ears spawner"
loot = list(
/obj/item/clothing/head/beret,
- /obj/item/clothing/head/rabbitears,
+ /obj/item/clothing/head/costume/rabbitears,
)
/obj/effect/spawner/random/clothing/bowler_or_that
name = "bowler or top hat spawner"
loot = list(
- /obj/item/clothing/head/bowler,
- /obj/item/clothing/head/that,
+ /obj/item/clothing/head/hats/bowler,
+ /obj/item/clothing/head/hats/tophat,
)
/obj/effect/spawner/random/clothing/kittyears_or_rabbitears
name = "kitty ears or rabbit ears spawner"
loot = list(
- /obj/item/clothing/head/kitty,
- /obj/item/clothing/head/rabbitears,
+ /obj/item/clothing/head/costume/kitty,
+ /obj/item/clothing/head/costume/rabbitears,
)
/obj/effect/spawner/random/clothing/pirate_or_bandana
name = "pirate hat or bandana spawner"
loot = list(
- /obj/item/clothing/head/pirate,
- /obj/item/clothing/head/bandana,
+ /obj/item/clothing/head/costume/pirate,
+ /obj/item/clothing/head/costume/pirate/bandana,
)
/obj/effect/spawner/random/clothing/twentyfive_percent_cyborg_mask
diff --git a/code/game/objects/effects/spawners/random/engineering.dm b/code/game/objects/effects/spawners/random/engineering.dm
index ed7eacc87ee..643343660fe 100644
--- a/code/game/objects/effects/spawners/random/engineering.dm
+++ b/code/game/objects/effects/spawners/random/engineering.dm
@@ -18,7 +18,7 @@
/obj/item/multitool = 1,
/obj/item/clothing/glasses/meson = 1,
/obj/item/storage/belt/utility = 1,
- /obj/item/clothing/head/welding = 1,
+ /obj/item/clothing/head/utility/welding = 1,
)
/obj/effect/spawner/random/engineering/tool_advanced
diff --git a/code/game/objects/effects/spawners/random/entertainment.dm b/code/game/objects/effects/spawners/random/entertainment.dm
index f97e38fdde9..22d5f681edf 100644
--- a/code/game/objects/effects/spawners/random/entertainment.dm
+++ b/code/game/objects/effects/spawners/random/entertainment.dm
@@ -37,7 +37,7 @@
icon_state = "dice"
loot = list(
/obj/item/gun/ballistic/revolver/russian = 5,
- /obj/item/clothing/head/ushanka = 3,
+ /obj/item/clothing/head/costume/ushanka = 3,
/obj/effect/spawner/random/entertainment/coin = 3,
/obj/effect/spawner/random/entertainment/money = 3,
/obj/item/dice/d6 = 3,
diff --git a/code/game/objects/items/devices/reverse_bear_trap.dm b/code/game/objects/items/devices/reverse_bear_trap.dm
index 8f334104b59..04f32bf2d81 100644
--- a/code/game/objects/items/devices/reverse_bear_trap.dm
+++ b/code/game/objects/items/devices/reverse_bear_trap.dm
@@ -4,6 +4,7 @@
name = "reverse bear trap"
desc = "A horrifying set of shut metal jaws, rigged to a kitchen timer and secured by padlock to a head-mounted clamp. To apply, hit someone with it."
icon = 'icons/obj/device.dmi'
+ worn_icon = 'icons/mob/clothing/head/utility.dmi'
icon_state = "reverse_bear_trap"
slot_flags = ITEM_SLOT_HEAD
flags_1 = CONDUCT_1
diff --git a/code/game/objects/items/dice.dm b/code/game/objects/items/dice.dm
index 2e8fa6f7f84..1b1efab695e 100644
--- a/code/game/objects/items/dice.dm
+++ b/code/game/objects/items/dice.dm
@@ -450,7 +450,7 @@
uniform = /obj/item/clothing/under/suit/black_really
neck = /obj/item/clothing/neck/tie/red/tied
shoes = /obj/item/clothing/shoes/laceup
- head = /obj/item/clothing/head/bowler
+ head = /obj/item/clothing/head/hats/bowler
glasses = /obj/item/clothing/glasses/monocle
gloves = /obj/item/clothing/gloves/color/white
diff --git a/code/game/objects/items/food/cake.dm b/code/game/objects/items/food/cake.dm
index 818d1918c51..3e73ea190ac 100644
--- a/code/game/objects/items/food/cake.dm
+++ b/code/game/objects/items/food/cake.dm
@@ -186,7 +186,7 @@
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/birthday, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cake/birthday/microwave_act(obj/machinery/microwave/microwave) //super sekrit club
- new /obj/item/clothing/head/hardhat/cakehat(get_turf(src))
+ new /obj/item/clothing/head/utility/hardhat/cakehat(get_turf(src))
qdel(src)
/obj/item/food/cakeslice/birthday
@@ -221,7 +221,7 @@
energy_bite(target_mob, user)
/obj/item/food/cake/birthday/energy/microwave_act(obj/machinery/microwave/M) //super sekriter club
- new /obj/item/clothing/head/hardhat/cakehat/energycake(get_turf(src))
+ new /obj/item/clothing/head/utility/hardhat/cakehat/energycake(get_turf(src))
qdel(src)
/obj/item/food/cakeslice/birthday/energy
diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm
index 20b2d319251..a32365acaa2 100644
--- a/code/game/objects/items/gift.dm
+++ b/code/game/objects/items/gift.dm
@@ -88,7 +88,7 @@ GLOBAL_LIST_EMPTY(possible_gifts)
/obj/item/clothing/suit/costume/poncho/green,
/obj/item/clothing/suit/costume/poncho/red,
/obj/item/clothing/suit/costume/snowman,
- /obj/item/clothing/head/snowman,
+ /obj/item/clothing/head/costume/snowman,
/obj/item/stack/sheet/mineral/coal)
gift_type_list += subtypesof(/obj/item/clothing/head/collectable)
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index 63fcc1b42b5..9ba8dad00a9 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -424,7 +424,8 @@
icon_state = "fedora"
inhand_icon_state = "fedora"
slot_flags = ITEM_SLOT_HEAD
- icon = 'icons/obj/clothing/hats.dmi'
+ icon = 'icons/obj/clothing/head/hats.dmi'
+ worn_icon = 'icons/mob/clothing/head/hats.dmi'
lefthand_file = 'icons/mob/inhands/clothing/hats_lefthand.dmi'
righthand_file = 'icons/mob/inhands/clothing/hats_righthand.dmi'
force = 0
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index fc32630179c..7fcbd59ff2f 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -15,7 +15,7 @@
GLOBAL_LIST_INIT(human_recipes, list( \
new/datum/stack_recipe("bloated human costume", /obj/item/clothing/suit/hooded/bloated_human, 5), \
- new/datum/stack_recipe("human skin hat", /obj/item/clothing/head/human_leather, 1), \
+ new/datum/stack_recipe("human skin hat", /obj/item/clothing/head/fedora/human_leather, 1), \
))
/obj/item/stack/sheet/animalhide/human/get_main_recipes()
@@ -112,7 +112,7 @@ GLOBAL_LIST_INIT(monkey_recipes, list ( \
merge_type = /obj/item/stack/sheet/animalhide/xeno
GLOBAL_LIST_INIT(xeno_recipes, list ( \
- new/datum/stack_recipe("alien helmet", /obj/item/clothing/head/xenos, 1), \
+ new/datum/stack_recipe("alien helmet", /obj/item/clothing/head/costume/xenos, 1), \
new/datum/stack_recipe("alien suit", /obj/item/clothing/suit/costume/xenos, 2), \
))
@@ -198,11 +198,11 @@ GLOBAL_LIST_INIT(leather_recipes, list ( \
new/datum/stack_recipe("saddle", /obj/item/saddle, 5), \
new/datum/stack_recipe("sheriff vest", /obj/item/clothing/accessory/vest_sheriff, 4), \
new/datum/stack_recipe_list("cowboy hats", list( \
- new/datum/stack_recipe("sheriff hat", /obj/item/clothing/head/cowboy_hat_brown, 2), \
- new/datum/stack_recipe("desperado hat", /obj/item/clothing/head/cowboy_hat_black, 2), \
- new/datum/stack_recipe("ten-gallon hat", /obj/item/clothing/head/cowboy_hat_white, 2), \
- new/datum/stack_recipe("deputy hat", /obj/item/clothing/head/cowboy_hat_red, 2), \
- new/datum/stack_recipe("drifter hat", /obj/item/clothing/head/cowboy_hat_grey, 2), \
+ new/datum/stack_recipe("sheriff hat", /obj/item/clothing/head/cowboy/brown, 2), \
+ new/datum/stack_recipe("desperado hat", /obj/item/clothing/head/cowboy/black, 2), \
+ new/datum/stack_recipe("ten-gallon hat", /obj/item/clothing/head/cowboy/white, 2), \
+ new/datum/stack_recipe("deputy hat", /obj/item/clothing/head/cowboy/red, 2), \
+ new/datum/stack_recipe("drifter hat", /obj/item/clothing/head/cowboy/grey, 2), \
)),
))
diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index 0d9076ff7c1..79636d772f6 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -201,7 +201,7 @@ GLOBAL_LIST_INIT(gold_recipes, list ( \
new/datum/stack_recipe("golden door", /obj/structure/mineral_door/gold, 10, one_per_turf = 1, on_solid_ground = 1, applies_mats = TRUE), \
new/datum/stack_recipe("gold tile", /obj/item/stack/tile/mineral/gold, 1, 4, 20), \
new/datum/stack_recipe("blank plaque", /obj/item/plaque, 1), \
- new/datum/stack_recipe("Simple Crown", /obj/item/clothing/head/crown, 5), \
+ new/datum/stack_recipe("Simple Crown", /obj/item/clothing/head/costume/crown, 5), \
))
/obj/item/stack/sheet/mineral/gold/get_main_recipes()
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index ee94ba4938e..12d377481f7 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -514,7 +514,7 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \
GLOBAL_LIST_INIT(cardboard_recipes, list ( \
new/datum/stack_recipe("box", /obj/item/storage/box), \
new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/costume/cardborg, 3), \
- new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg), \
+ new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/costume/cardborg), \
new/datum/stack_recipe("large box", /obj/structure/closet/cardboard, 4, one_per_turf = TRUE, on_solid_ground = TRUE), \
new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5), \
null, \
@@ -622,7 +622,7 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
new/datum/stack_recipe("pinion airlock assembly", /obj/structure/door_assembly/door_assembly_bronze, 4, time = 50, one_per_turf = TRUE, on_solid_ground = TRUE), \
new/datum/stack_recipe("bronze pinion airlock assembly", /obj/structure/door_assembly/door_assembly_bronze/seethru, 4, time = 50, one_per_turf = TRUE, on_solid_ground = TRUE), \
new/datum/stack_recipe("bronze floor tile", /obj/item/stack/tile/bronze, 1, 4, 20), \
- new/datum/stack_recipe("bronze hat", /obj/item/clothing/head/bronze), \
+ new/datum/stack_recipe("bronze hat", /obj/item/clothing/head/costume/bronze), \
new/datum/stack_recipe("bronze suit", /obj/item/clothing/suit/costume/bronze), \
new/datum/stack_recipe("bronze boots", /obj/item/clothing/shoes/bronze), \
null,
diff --git a/code/game/objects/items/storage/boxes/food_boxes.dm b/code/game/objects/items/storage/boxes/food_boxes.dm
index e66130ee805..072bbce1c6f 100644
--- a/code/game/objects/items/storage/boxes/food_boxes.dm
+++ b/code/game/objects/items/storage/boxes/food_boxes.dm
@@ -102,12 +102,12 @@
if(!contents.len)
if(inhand_icon_state == "paperbag_None")
user.show_message(span_notice("You cut eyeholes into [src]."), MSG_VISUAL)
- new /obj/item/clothing/head/papersack(user.loc)
+ new /obj/item/clothing/head/costume/papersack(user.loc)
qdel(src)
return FALSE
else if(inhand_icon_state == "paperbag_SmileyFace")
user.show_message(span_notice("You cut eyeholes into [src] and modify the design."), MSG_VISUAL)
- new /obj/item/clothing/head/papersack/smiley(user.loc)
+ new /obj/item/clothing/head/costume/papersack/smiley(user.loc)
qdel(src)
return FALSE
return ..()
diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm
index 7c023363d8f..b8553708955 100644
--- a/code/game/objects/items/storage/garment.dm
+++ b/code/game/objects/items/storage/garment.dm
@@ -50,9 +50,9 @@
new /obj/item/clothing/suit/jacket/capjacket(src)
new /obj/item/clothing/glasses/sunglasses/gar/giga(src)
new /obj/item/clothing/gloves/color/captain(src)
- new /obj/item/clothing/head/caphat(src)
- new /obj/item/clothing/head/caphat/parade(src)
- new /obj/item/clothing/head/crown/fancy(src)
+ new /obj/item/clothing/head/hats/caphat(src)
+ new /obj/item/clothing/head/hats/caphat/parade(src)
+ new /obj/item/clothing/head/costume/crown/fancy(src)
new /obj/item/clothing/neck/cloak/cap(src)
new /obj/item/clothing/shoes/laceup(src)
new /obj/item/clothing/suit/hooded/wintercoat/captain(src)
@@ -63,7 +63,7 @@
new /obj/item/clothing/under/rank/civilian/head_of_personnel/skirt(src)
new /obj/item/clothing/suit/armor/vest/hop(src)
new /obj/item/clothing/glasses/sunglasses(src)
- new /obj/item/clothing/head/hopcap(src)
+ new /obj/item/clothing/head/hats/hopcap(src)
new /obj/item/clothing/neck/cloak/hop(src)
new /obj/item/clothing/shoes/laceup(src)
new /obj/item/clothing/suit/hooded/wintercoat/hop(src)
@@ -80,7 +80,7 @@
new /obj/item/clothing/suit/armor/vest/leather(src)
new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch(src)
new /obj/item/clothing/glasses/hud/security/sunglasses/gars/giga(src)
- new /obj/item/clothing/head/hos(src)
+ new /obj/item/clothing/head/hats/hos(src)
new /obj/item/clothing/mask/gas/sechailer/swat(src)
new /obj/item/clothing/neck/cloak/hos(src)
new /obj/item/clothing/suit/armor/hos/trenchcoat/winter(src)
@@ -100,7 +100,7 @@
/obj/item/storage/bag/garment/chief_medical/PopulateContents()
new /obj/item/clothing/head/beret/medical/cmo(src)
- new /obj/item/clothing/head/surgerycap/cmo(src)
+ new /obj/item/clothing/head/utility/surgerycap/cmo(src)
new /obj/item/clothing/under/rank/medical/chief_medical_officer(src)
new /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt(src)
new /obj/item/clothing/under/rank/medical/chief_medical_officer/scrubs(src)
@@ -115,8 +115,8 @@
new /obj/item/clothing/under/rank/engineering/chief_engineer/skirt(src)
new /obj/item/clothing/glasses/meson/engine(src)
new /obj/item/clothing/gloves/color/chief_engineer(src)
- new /obj/item/clothing/head/hardhat/white(src)
- new /obj/item/clothing/head/hardhat/weldhat/white(src)
+ new /obj/item/clothing/head/utility/hardhat/white(src)
+ new /obj/item/clothing/head/utility/hardhat/weldhat/white(src)
new /obj/item/clothing/neck/cloak/ce(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/clothing/suit/hooded/wintercoat/engineering/ce(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
index e7dad6e89ed..ca56d0eb0dc 100644
--- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm
+++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
@@ -28,7 +28,7 @@
/obj/structure/closet/gimmick/russian/PopulateContents()
..()
for(var/i in 1 to 5)
- new /obj/item/clothing/head/ushanka(src)
+ new /obj/item/clothing/head/costume/ushanka(src)
for(var/i in 1 to 5)
new /obj/item/clothing/under/costume/soviet(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index 5ad44de7b38..edeff44d060 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -8,7 +8,7 @@
/obj/structure/closet/gmcloset/PopulateContents()
..()
var/static/items_inside = list(
- /obj/item/clothing/head/that = 2,
+ /obj/item/clothing/head/hats/tophat = 2,
/obj/item/radio/headset/headset_srv = 2,
/obj/item/clothing/under/suit/sl = 2,
/obj/item/clothing/under/rank/civilian/bartender = 2,
@@ -41,7 +41,7 @@
/obj/item/circuitboard/machine/dish_drive = 1,
/obj/item/clothing/suit/toggle/chef = 1,
/obj/item/clothing/under/rank/civilian/chef = 1,
- /obj/item/clothing/head/chefhat = 1,
+ /obj/item/clothing/head/utility/chefhat = 1,
/obj/item/reagent_containers/cup/rag = 1)
generate_items_inside(items_inside,src)
@@ -104,7 +104,7 @@
new /obj/item/clothing/under/rank/civilian/chaplain(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/suit/chaplainsuit/nun(src)
- new /obj/item/clothing/head/nun_hood(src)
+ new /obj/item/clothing/head/chaplain/nun_hood(src)
new /obj/item/clothing/suit/hooded/chaplainsuit/monkhabit(src)
new /obj/item/clothing/suit/chaplainsuit/holidaypriest(src)
new /obj/item/storage/backpack/cultpack(src)
@@ -175,7 +175,7 @@
/obj/item/clothing/under/rank/engineering/engineer = 3,
/obj/item/clothing/suit/hazardvest = 3,
/obj/item/clothing/shoes/workboots = 3,
- /obj/item/clothing/head/hardhat = 3)
+ /obj/item/clothing/head/utility/hardhat = 3)
generate_items_inside(items_inside,src)
return
@@ -189,7 +189,7 @@
/obj/item/storage/backpack/medic = 1,
/obj/item/storage/backpack/satchel/med = 1,
/obj/item/clothing/suit/hooded/wintercoat/medical = 1,
- /obj/item/clothing/head/nursehat = 1,
+ /obj/item/clothing/head/costume/nursehat = 1,
/obj/item/clothing/under/rank/medical/scrubs/blue = 1,
/obj/item/clothing/under/rank/medical/scrubs/green = 1,
/obj/item/clothing/under/rank/medical/scrubs/purple = 1,
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
index c60403d9710..8c8171995eb 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -50,7 +50,7 @@
/obj/structure/closet/secure_closet/engineering_welding/PopulateContents()
..()
for(var/i in 1 to 3)
- new /obj/item/clothing/head/welding(src)
+ new /obj/item/clothing/head/utility/welding(src)
for(var/i in 1 to 3)
new /obj/item/weldingtool(src)
@@ -86,6 +86,6 @@
new /obj/item/watertank/atmos(src)
new /obj/item/clothing/suit/utility/fire/atmos(src)
new /obj/item/clothing/mask/gas/atmos(src)
- new /obj/item/clothing/head/hardhat/atmos(src)
+ new /obj/item/clothing/head/utility/hardhat/atmos(src)
new /obj/item/clothing/glasses/meson/engine/tray(src)
new /obj/item/extinguisher/advanced(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 80b18a439a9..526a684f682 100755
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -81,8 +81,8 @@
..()
new /obj/item/radio/headset/headset_sec(src)
new /obj/item/clothing/suit/armor/vest/warden(src)
- new /obj/item/clothing/head/warden(src)
- new /obj/item/clothing/head/warden/drill(src)
+ new /obj/item/clothing/head/hats/warden(src)
+ new /obj/item/clothing/head/hats/warden/drill(src)
new /obj/item/clothing/head/beret/sec/navywarden(src)
new /obj/item/clothing/suit/armor/vest/warden/alt(src)
new /obj/item/clothing/under/rank/security/warden/formal(src)
@@ -251,7 +251,7 @@
new /obj/item/paper/fluff/jobs/security/court_judgement (src)
new /obj/item/pen (src)
new /obj/item/clothing/suit/costume/judgerobe (src)
- new /obj/item/clothing/head/powdered_wig (src)
+ new /obj/item/clothing/head/costume/powdered_wig (src)
new /obj/item/storage/briefcase(src)
/obj/structure/closet/secure_closet/contraband/armory
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
index 037764528a3..57135bf0bda 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -71,7 +71,7 @@
new /obj/item/clothing/mask/gas(src)
new /obj/item/tank/internals/oxygen/red(src)
new /obj/item/extinguisher(src)
- new /obj/item/clothing/head/hardhat/red(src)
+ new /obj/item/clothing/head/utility/hardhat/red(src)
new /obj/item/crowbar/large/emergency(src)
/obj/structure/closet/firecloset/full/PopulateContents()
@@ -80,7 +80,7 @@
new /obj/item/flashlight(src)
new /obj/item/tank/internals/oxygen/red(src)
new /obj/item/extinguisher(src)
- new /obj/item/clothing/head/hardhat/red(src)
+ new /obj/item/clothing/head/utility/hardhat/red(src)
new /obj/item/crowbar/large/emergency(src)
/*
@@ -123,7 +123,7 @@
if(prob(5))
new /obj/item/clothing/gloves/color/yellow(src)
if(prob(40))
- new /obj/item/clothing/head/hardhat(src)
+ new /obj/item/clothing/head/utility/hardhat(src)
/*
@@ -139,7 +139,7 @@
..()
new /obj/item/geiger_counter(src)
new /obj/item/clothing/suit/utility/radiation(src)
- new /obj/item/clothing/head/radiation(src)
+ new /obj/item/clothing/head/utility/radiation(src)
/*
* Bombsuit closet
@@ -154,19 +154,19 @@
new /obj/item/clothing/suit/utility/bomb_suit(src)
new /obj/item/clothing/under/color/black(src)
new /obj/item/clothing/shoes/sneakers/black(src)
- new /obj/item/clothing/head/bomb_hood(src)
+ new /obj/item/clothing/head/utility/bomb_hood(src)
/obj/structure/closet/bombcloset/security/PopulateContents()
new /obj/item/clothing/suit/utility/bomb_suit/security(src)
new /obj/item/clothing/under/rank/security/officer(src)
new /obj/item/clothing/shoes/jackboots(src)
- new /obj/item/clothing/head/bomb_hood/security(src)
+ new /obj/item/clothing/head/utility/bomb_hood/security(src)
/obj/structure/closet/bombcloset/white/PopulateContents()
new /obj/item/clothing/suit/utility/bomb_suit/white(src)
new /obj/item/clothing/under/color/black(src)
new /obj/item/clothing/shoes/sneakers/black(src)
- new /obj/item/clothing/head/bomb_hood/white(src)
+ new /obj/item/clothing/head/utility/bomb_hood/white(src)
/*
* Ammunition
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index c0b1bce8387..6ee649ebb65 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -42,7 +42,7 @@
for(var/i in 1 to 3)
new /obj/item/clothing/shoes/sneakers/black(src)
for(var/i in 1 to 3)
- new /obj/item/clothing/head/that(src)
+ new /obj/item/clothing/head/hats/tophat(src)
for(var/i in 1 to 3)
new /obj/item/clothing/head/soft/black(src)
new /obj/item/clothing/mask/bandana/black(src)
@@ -123,12 +123,12 @@
/obj/structure/closet/wardrobe/pjs/PopulateContents()
new /obj/item/clothing/under/misc/pj/red(src)
new /obj/item/clothing/under/misc/pj/red(src)
- new /obj/item/clothing/head/nightcap/red(src)
- new /obj/item/clothing/head/nightcap/red(src)
+ new /obj/item/clothing/head/costume/nightcap/red(src)
+ new /obj/item/clothing/head/costume/nightcap/red(src)
new /obj/item/clothing/under/misc/pj/blue(src)
new /obj/item/clothing/under/misc/pj/blue(src)
- new /obj/item/clothing/head/nightcap/blue(src)
- new /obj/item/clothing/head/nightcap/blue(src)
+ new /obj/item/clothing/head/costume/nightcap/blue(src)
+ new /obj/item/clothing/head/costume/nightcap/blue(src)
for(var/i in 1 to 4)
new /obj/item/clothing/shoes/sneakers/white(src)
return
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index d00092d4e8a..c485faccd79 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -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)
diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm
index 36c480dfcbe..2339b6d1be8 100644
--- a/code/modules/antagonists/changeling/powers/mutations.dm
+++ b/code/modules/antagonists/changeling/powers/mutations.dm
@@ -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."
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index f0de743e91c..a21860f1941 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -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
diff --git a/code/modules/antagonists/fugitive/fugitive_outfits.dm b/code/modules/antagonists/fugitive/fugitive_outfits.dm
index e4473d0b265..7db52b33ea2 100644
--- a/code/modules/antagonists/fugitive/fugitive_outfits.dm
+++ b/code/modules/antagonists/fugitive/fugitive_outfits.dm
@@ -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
diff --git a/code/modules/antagonists/heretic/items/heretic_armor.dm b/code/modules/antagonists/heretic/items/heretic_armor.dm
index 255919f30b1..739c321cbf0 100644
--- a/code/modules/antagonists/heretic/items/heretic_armor.dm
+++ b/code/modules/antagonists/heretic/items/heretic_armor.dm
@@ -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"
diff --git a/code/modules/antagonists/nukeop/outfits.dm b/code/modules/antagonists/nukeop/outfits.dm
index bf0d361f58f..e6223a72770 100644
--- a/code/modules/antagonists/nukeop/outfits.dm
+++ b/code/modules/antagonists/nukeop/outfits.dm
@@ -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"
diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm
index 7e6aa09a9ac..f29728a7909 100644
--- a/code/modules/antagonists/revolution/revolution.dm
+++ b/code/modules/antagonists/revolution/revolution.dm
@@ -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
diff --git a/code/modules/cargo/exports/gear.dm b/code/modules/cargo/exports/gear.dm
index e0e495c7507..66ce7afc876 100644
--- a/code/modules/cargo/exports/gear.dm
+++ b/code/modules/cargo/exports/gear.dm
@@ -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
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index caf7763f5bf..00095f2424a 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -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,
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index b01809d2901..923513e5550 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -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)
diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm
index 01ad06c94ed..a799e2d6838 100644
--- a/code/modules/clothing/head/_head.dm
+++ b/code/modules/clothing/head/_head.dm
@@ -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
diff --git a/code/modules/clothing/head/animalears.dm b/code/modules/clothing/head/animalears.dm
index 7218b818fe5..77ed57a9083 100644
--- a/code/modules/clothing/head/animalears.dm
+++ b/code/modules/clothing/head/animalears.dm
@@ -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"
diff --git a/code/modules/clothing/head/beanie.dm b/code/modules/clothing/head/beanie.dm
index ce1480af9e2..ae52ec92ac8 100644
--- a/code/modules/clothing/head/beanie.dm
+++ b/code/modules/clothing/head/beanie.dm
@@ -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
diff --git a/code/modules/clothing/head/cakehat.dm b/code/modules/clothing/head/cakehat.dm
index 5cf4b736e54..9feeb9e1e3a 100644
--- a/code/modules/clothing/head/cakehat.dm
+++ b/code/modules/clothing/head/cakehat.dm
@@ -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 ..()
diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm
index 76799889c41..3cd88ffc8ed 100644
--- a/code/modules/clothing/head/collectable.dm
+++ b/code/modules/clothing/head/collectable.dm
@@ -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
diff --git a/code/modules/clothing/head/cone.dm b/code/modules/clothing/head/cone.dm
index 01caef21d42..59d8cfe0d27 100644
--- a/code/modules/clothing/head/cone.dm
+++ b/code/modules/clothing/head/cone.dm
@@ -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
diff --git a/code/modules/clothing/head/costume.dm b/code/modules/clothing/head/costume.dm
index 2fe390485f1..68b6ea08848 100644
--- a/code/modules/clothing/head/costume.dm
+++ b/code/modules/clothing/head/costume.dm
@@ -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 unspeakably 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
diff --git a/code/modules/clothing/head/crown.dm b/code/modules/clothing/head/crown.dm
index 33e7f2e5225..b728ebcfb8f 100644
--- a/code/modules/clothing/head/crown.dm
+++ b/code/modules/clothing/head/crown.dm
@@ -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 land space."
icon_state = "fancycrown"
diff --git a/code/modules/clothing/head/fedora.dm b/code/modules/clothing/head/fedora.dm
index 7ffc93270f2..4f4a88f0ec0 100644
--- a/code/modules/clothing/head/fedora.dm
+++ b/code/modules/clothing/head/fedora.dm
@@ -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."
diff --git a/code/modules/clothing/head/garlands.dm b/code/modules/clothing/head/garlands.dm
index c4eb99aa050..09a7a7532ca 100644
--- a/code/modules/clothing/head/garlands.dm
+++ b/code/modules/clothing/head/garlands.dm
@@ -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")
diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm
index e2205722733..fa1d68287e0 100644
--- a/code/modules/clothing/head/hardhat.dm
+++ b/code/modules/clothing/head/hardhat.dm
@@ -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"
diff --git a/code/modules/clothing/head/hat.dm b/code/modules/clothing/head/hat.dm
index 91f01e3dbbe..0f67caccd2f 100644
--- a/code/modules/clothing/head/hat.dm
+++ b/code/modules/clothing/head/hat.dm
@@ -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. / Il sent comme des trous de beignets frais."
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 guess it's a redhead.'"
-/obj/item/clothing/head/mailman
+/obj/item/clothing/head/costume/mailman
name = "mailman's hat"
icon_state = "mailman"
desc = "'Right-on-time' 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"
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index cf9b5d64879..b962a98ab5b 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -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)
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 1a0a3b36ea1..1fad20f9deb 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -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."
diff --git a/code/modules/clothing/head/justice.dm b/code/modules/clothing/head/justice.dm
index 0402be4f757..66a8a74847b 100644
--- a/code/modules/clothing/head/justice.dm
+++ b/code/modules/clothing/head/justice.dm
@@ -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
diff --git a/code/modules/clothing/head/mind_monkey_helmet.dm b/code/modules/clothing/head/mind_monkey_helmet.dm
index d600ff0bec7..09c14a3c97f 100644
--- a/code/modules/clothing/head/mind_monkey_helmet.dm
+++ b/code/modules/clothing/head/mind_monkey_helmet.dm
@@ -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
diff --git a/code/modules/clothing/head/papersack.dm b/code/modules/clothing/head/papersack.dm
index 162dbad611b..984b73d6bcc 100644
--- a/code/modules/clothing/head/papersack.dm
+++ b/code/modules/clothing/head/papersack.dm
@@ -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"
diff --git a/code/modules/clothing/head/pirate.dm b/code/modules/clothing/head/pirate.dm
index 551e5f0db34..1706fac3438 100644
--- a/code/modules/clothing/head/pirate.dm
+++ b/code/modules/clothing/head/pirate.dm
@@ -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
diff --git a/code/modules/clothing/head/religious.dm b/code/modules/clothing/head/religious.dm
index 29eb4c2aeb2..4c94cd82123 100644
--- a/code/modules/clothing/head/religious.dm
+++ b/code/modules/clothing/head/religious.dm
@@ -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)
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index 71da30db98b..f95070bbeb2 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -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"
diff --git a/code/modules/clothing/head/sombrero.dm b/code/modules/clothing/head/sombrero.dm
index a5febec39c0..b207d2ae757 100644
--- a/code/modules/clothing/head/sombrero.dm
+++ b/code/modules/clothing/head/sombrero.dm
@@ -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)
diff --git a/code/modules/clothing/head/tinfoilhat.dm b/code/modules/clothing/head/tinfoilhat.dm
index 3f47081a22e..7865e46b6b0 100644
--- a/code/modules/clothing/head/tinfoilhat.dm
+++ b/code/modules/clothing/head/tinfoilhat.dm
@@ -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!!",
diff --git a/code/modules/clothing/head/tophat.dm b/code/modules/clothing/head/tophat.dm
index 6bc123e2062..affb5ffc98b 100644
--- a/code/modules/clothing/head/tophat.dm
+++ b/code/modules/clothing/head/tophat.dm
@@ -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
diff --git a/code/modules/clothing/head/welding.dm b/code/modules/clothing/head/welding.dm
index 0e7f489581b..4680105fdec 100644
--- a/code/modules/clothing/head/welding.dm
+++ b/code/modules/clothing/head/welding.dm
@@ -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()
diff --git a/code/modules/clothing/head/wig.dm b/code/modules/clothing/head/wig.dm
index f379261a0d1..fa3f3223fde 100644
--- a/code/modules/clothing/head/wig.dm
+++ b/code/modules/clothing/head/wig.dm
@@ -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"
diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm
index d565d27b23a..0a73faa16f1 100644
--- a/code/modules/clothing/outfits/ert.dm
+++ b/code/modules/clothing/outfits/ert.dm
@@ -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
diff --git a/code/modules/clothing/outfits/event.dm b/code/modules/clothing/outfits/event.dm
index c24abb233a0..9f2cac52bda 100644
--- a/code/modules/clothing/outfits/event.dm
+++ b/code/modules/clothing/outfits/event.dm
@@ -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
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index f25467594cb..de7aec7e46c 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -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)
diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm
index e69e235f67d..e8efcca6512 100644
--- a/code/modules/clothing/spacesuits/_spacesuits.dm
+++ b/code/modules/clothing/spacesuits/_spacesuits.dm
@@ -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."
diff --git a/code/modules/clothing/spacesuits/freedom.dm b/code/modules/clothing/spacesuits/freedom.dm
index 9a05b743a53..c8058c3c5d1 100644
--- a/code/modules/clothing/spacesuits/freedom.dm
+++ b/code/modules/clothing/spacesuits/freedom.dm
@@ -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)
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index 1a32edb6325..749ff1fe148 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -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
diff --git a/code/modules/clothing/spacesuits/santa.dm b/code/modules/clothing/spacesuits/santa.dm
index d7ffc91acec..a9902aaa1d8 100644
--- a/code/modules/clothing/spacesuits/santa.dm
+++ b/code/modules/clothing/spacesuits/santa.dm
@@ -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
diff --git a/code/modules/clothing/suits/ablativecoat.dm b/code/modules/clothing/suits/ablativecoat.dm
index be67f80b5bb..32366d06193 100644
--- a/code/modules/clothing/suits/ablativecoat.dm
+++ b/code/modules/clothing/suits/ablativecoat.dm
@@ -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)
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index 0aba4fb2961..fed14ffe204 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -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
diff --git a/code/modules/clothing/suits/chaplainsuits.dm b/code/modules/clothing/suits/chaplainsuits.dm
index 32a467e96a0..0537d5b1934 100644
--- a/code/modules/clothing/suits/chaplainsuits.dm
+++ b/code/modules/clothing/suits/chaplainsuits.dm
@@ -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
diff --git a/code/modules/clothing/suits/costume.dm b/code/modules/clothing/suits/costume.dm
index c1212ec98aa..0f792148ea0 100644
--- a/code/modules/clothing/suits/costume.dm
+++ b/code/modules/clothing/suits/costume.dm
@@ -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
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 96db8ae76b8..f22f3084593 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -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
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index 78b5dbb8594..9cbf3c6ee83 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -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)
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm
index fe71d63f5b0..e7b708901d1 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -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!"
diff --git a/code/modules/events/holiday/easter.dm b/code/modules/events/holiday/easter.dm
index 9248bd33a43..448c0c3306c 100644
--- a/code/modules/events/holiday/easter.dm
+++ b/code/modules/events/holiday/easter.dm
@@ -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,
diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm
index 7f9b878bf60..e5c096d8d9e 100644
--- a/code/modules/events/holiday/xmas.dm
+++ b/code/modules/events/holiday/xmas.dm
@@ -22,7 +22,7 @@
"Why is Christmas just like life on ss13?\n\nYou do all the work and the fat guy gets all the credit.",
"Why doesn't Santa have any children?\n\nBecause he only comes down the chimney."))
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."
diff --git a/code/modules/events/wizard/curseditems.dm b/code/modules/events/wizard/curseditems.dm
index a634a6fc934..cc63c15cda5 100644
--- a/code/modules/events/wizard/curseditems.dm
+++ b/code/modules/events/wizard/curseditems.dm
@@ -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
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
index 4841fac3cf4..b2712674bea 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
@@ -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
)
diff --git a/code/modules/food_and_drinks/restaurant/custom_order.dm b/code/modules/food_and_drinks/restaurant/custom_order.dm
index a904adf5965..1ac565cb898 100644
--- a/code/modules/food_and_drinks/restaurant/custom_order.dm
+++ b/code/modules/food_and_drinks/restaurant/custom_order.dm
@@ -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,
))
diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm
index aed67f1bba9..6ff2d2e8441 100644
--- a/code/modules/holiday/holidays.dm
+++ b/code/modules/holiday/holidays.dm
@@ -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
diff --git a/code/modules/holiday/nth_week.dm b/code/modules/holiday/nth_week.dm
index d18b9e8baf2..55cfec74be6 100644
--- a/code/modules/holiday/nth_week.dm
+++ b/code/modules/holiday/nth_week.dm
@@ -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"
diff --git a/code/modules/hydroponics/beekeeping/beekeeper_suit.dm b/code/modules/hydroponics/beekeeping/beekeeper_suit.dm
index 83603e5ad84..3b759a95f49 100644
--- a/code/modules/hydroponics/beekeeping/beekeeper_suit.dm
+++ b/code/modules/hydroponics/beekeeping/beekeeper_suit.dm
@@ -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."
diff --git a/code/modules/hydroponics/grown/pumpkin.dm b/code/modules/hydroponics/grown/pumpkin.dm
index 56e133f9709..f02556fc31e 100644
--- a/code/modules/hydroponics/grown/pumpkin.dm
+++ b/code/modules/hydroponics/grown/pumpkin.dm
@@ -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
diff --git a/code/modules/instruments/piano_synth.dm b/code/modules/instruments/piano_synth.dm
index d911671038d..3f6ddc54d6b 100644
--- a/code/modules/instruments/piano_synth.dm
+++ b/code/modules/instruments/piano_synth.dm
@@ -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"
diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm
index fb7a93328a5..af9b5cb31c1 100644
--- a/code/modules/jobs/job_types/bartender.dm
+++ b/code/modules/jobs/job_types/bartender.dm
@@ -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,
diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm
index 5e0f309bb93..a3fd4384411 100755
--- a/code/modules/jobs/job_types/captain.dm
+++ b/code/modules/jobs/job_types/captain.dm
@@ -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
diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm
index 0d8ebb5e614..40fd41de6e1 100644
--- a/code/modules/jobs/job_types/chief_engineer.dm
+++ b/code/modules/jobs/job_types/chief_engineer.dm
@@ -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
diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm
index 633f7c233c5..889928510c9 100644
--- a/code/modules/jobs/job_types/chief_medical_officer.dm
+++ b/code/modules/jobs/job_types/chief_medical_officer.dm
@@ -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
diff --git a/code/modules/jobs/job_types/cook.dm b/code/modules/jobs/job_types/cook.dm
index 3afbfdde5d0..842d803cdd2 100644
--- a/code/modules/jobs/job_types/cook.dm
+++ b/code/modules/jobs/job_types/cook.dm
@@ -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)
diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm
index abb964551ac..1f8bba9bbbe 100644
--- a/code/modules/jobs/job_types/head_of_personnel.dm
+++ b/code/modules/jobs/job_types/head_of_personnel.dm
@@ -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
diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm
index b1a73f79307..2b1b51a1a71 100644
--- a/code/modules/jobs/job_types/medical_doctor.dm
+++ b/code/modules/jobs/job_types/medical_doctor.dm
@@ -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
diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm
index 31eb4ea7551..195057624e7 100644
--- a/code/modules/jobs/job_types/station_engineer.dm
+++ b/code/modules/jobs/job_types/station_engineer.dm
@@ -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
diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm
index d33f51c5846..5d1d5582b6b 100644
--- a/code/modules/jobs/job_types/warden.dm
+++ b/code/modules/jobs/job_types/warden.dm
@@ -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
diff --git a/code/modules/mafia/outfits.dm b/code/modules/mafia/outfits.dm
index 5d239aca6c5..4d86faf2f4d 100644
--- a/code/modules/mafia/outfits.dm
+++ b/code/modules/mafia/outfits.dm
@@ -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
diff --git a/code/modules/mapfluff/ruins/spaceruin_code/crashedship.dm b/code/modules/mapfluff/ruins/spaceruin_code/crashedship.dm
index 5fa131cd209..9f431491841 100644
--- a/code/modules/mapfluff/ruins/spaceruin_code/crashedship.dm
+++ b/code/modules/mapfluff/ruins/spaceruin_code/crashedship.dm
@@ -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
diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm
index ab3198562b0..e85fd09070f 100644
--- a/code/modules/mapping/mapping_helpers.dm
+++ b/code/modules/mapping/mapping_helpers.dm
@@ -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
diff --git a/code/modules/meteors/meteors.dm b/code/modules/meteors/meteors.dm
index 44a2ccb06a5..d1759656aab 100644
--- a/code/modules/meteors/meteors.dm
+++ b/code/modules/meteors/meteors.dm
@@ -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)
diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm
index 390e1dd2e0b..911eba6d54c 100644
--- a/code/modules/mining/abandoned_crates.dm
+++ b/code/modules/mining/abandoned_crates.dm
@@ -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)
diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm
index c08085c9dc7..106b5a29812 100644
--- a/code/modules/mining/equipment/explorer_gear.dm
+++ b/code/modules/mining/equipment/explorer_gear.dm
@@ -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)
diff --git a/code/modules/mining/lavaland/megafauna_loot.dm b/code/modules/mining/lavaland/megafauna_loot.dm
index d53efe876b6..5cd24edd378 100644
--- a/code/modules/mining/lavaland/megafauna_loot.dm
+++ b/code/modules/mining/lavaland/megafauna_loot.dm
@@ -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
diff --git a/code/modules/mining/voucher_sets.dm b/code/modules/mining/voucher_sets.dm
index 3044d134894..74074e19329 100644
--- a/code/modules/mining/voucher_sets.dm
+++ b/code/modules/mining/voucher_sets.dm
@@ -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,
)
diff --git a/code/modules/mob/living/basic/vermin/mothroach.dm b/code/modules/mob/living/basic/vermin/mothroach.dm
index 9fc8f96eada..816813bb942 100644
--- a/code/modules/mob/living/basic/vermin/mothroach.dm
+++ b/code/modules/mob/living/basic/vermin/mothroach.dm
@@ -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
diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm
index 74858595106..5b3f3062e99 100644
--- a/code/modules/mob/living/carbon/carbon_update_icons.dm
+++ b/code/modules/mob/living/carbon/carbon_update_icons.dm
@@ -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)
diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm
index 5586fa59979..5e258aa53aa 100644
--- a/code/modules/mob/living/carbon/human/human_update_icons.dm
+++ b/code/modules/mob/living/carbon/human/human_update_icons.dm
@@ -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)
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 22d20c023cf..091d93e9c17 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -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 = ""
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 1dfb6f62224..eacd4b3bc88 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -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()
diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm
index 87515fd790e..2a1b8ba3eeb 100644
--- a/code/modules/mob/living/silicon/robot/robot_defense.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defense.dm
@@ -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 \
)))
diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm
index 4e0dd06e553..d6dad79b8ca 100644
--- a/code/modules/mob/living/simple_animal/bot/construction.dm
+++ b/code/modules/mob/living/simple_animal/bot/construction.dm
@@ -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]!"))
diff --git a/code/modules/mob/living/simple_animal/bot/firebot.dm b/code/modules/mob/living/simple_animal/bot/firebot.dm
index 03012317d71..f572d0c828b 100644
--- a/code/modules/mob/living/simple_animal/bot/firebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/firebot.dm
@@ -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)
diff --git a/code/modules/mob/living/simple_animal/friendly/axolotl.dm b/code/modules/mob/living/simple_animal/friendly/axolotl.dm
index 445e251b890..a9798d97306 100644
--- a/code/modules/mob/living/simple_animal/friendly/axolotl.dm
+++ b/code/modules/mob/living/simple_animal/friendly/axolotl.dm
@@ -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)
. = ..()
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index e944b802d93..00261e534aa 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -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
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
index 4bbf2371802..6c60bc85563 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
@@ -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"+\
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm b/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm
index ffeca6776de..90fa3962f11 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm
@@ -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)
diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index 15d2f0e5daf..62beea9eaee 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -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
diff --git a/code/modules/mob/living/simple_animal/hostile/regalrat.dm b/code/modules/mob/living/simple_animal/hostile/regalrat.dm
index 19135903fb2..2c5f3168ff9 100644
--- a/code/modules/mob/living/simple_animal/hostile/regalrat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/regalrat.dm
@@ -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"
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm
index db8d1cabe03..e42a13d03a1 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm
@@ -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
diff --git a/code/modules/mob_spawn/corpses/mob_corpses.dm b/code/modules/mob_spawn/corpses/mob_corpses.dm
index 7e0fd1efd6d..11657484b76 100644
--- a/code/modules/mob_spawn/corpses/mob_corpses.dm
+++ b/code/modules/mob_spawn/corpses/mob_corpses.dm
@@ -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
diff --git a/code/modules/mob_spawn/corpses/nanotrasen_corpses.dm b/code/modules/mob_spawn/corpses/nanotrasen_corpses.dm
index a10170be12c..0940815f1fc 100644
--- a/code/modules/mob_spawn/corpses/nanotrasen_corpses.dm
+++ b/code/modules/mob_spawn/corpses/nanotrasen_corpses.dm
@@ -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
diff --git a/code/modules/mob_spawn/ghost_roles/space_roles.dm b/code/modules/mob_spawn/ghost_roles/space_roles.dm
index 7fc64240b98..c8183349199 100644
--- a/code/modules/mob_spawn/ghost_roles/space_roles.dm
+++ b/code/modules/mob_spawn/ghost_roles/space_roles.dm
@@ -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
diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm
index 6b4edd97e91..ffd5f2e8920 100644
--- a/code/modules/mod/modules/modules_general.dm
+++ b/code/modules/mod/modules/modules_general.dm
@@ -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
diff --git a/code/modules/pai/pai.dm b/code/modules/pai/pai.dm
index c148b78d0e9..c4739c37d09 100644
--- a/code/modules/pai/pai.dm
+++ b/code/modules/pai/pai.dm
@@ -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"
diff --git a/code/modules/reagents/reagent_containers/cups/_cup.dm b/code/modules/reagents/reagent_containers/cups/_cup.dm
index c0cdcf02a17..c5a47a0221b 100644
--- a/code/modules/reagents/reagent_containers/cups/_cup.dm
+++ b/code/modules/reagents/reagent_containers/cups/_cup.dm
@@ -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'
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index aca194ce7eb..a452564c112 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -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
diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm
index dcc09a6d298..f4fbe183ec4 100644
--- a/code/modules/research/designs/biogenerator_designs.dm
+++ b/code/modules/research/designs/biogenerator_designs.dm
@@ -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)
diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm
index 922bda69c96..bad538fb919 100644
--- a/code/modules/research/designs/misc_designs.dm
+++ b/code/modules/research/designs/misc_designs.dm
@@ -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
)
diff --git a/code/modules/research/xenobiology/crossbreeding/_clothing.dm b/code/modules/research/xenobiology/crossbreeding/_clothing.dm
index 14faefa54f8..69c9097b3b4 100644
--- a/code/modules/research/xenobiology/crossbreeding/_clothing.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_clothing.dm
@@ -96,12 +96,12 @@ Slimecrossing Armor
name = "heroine bud"
desc = "An extremely addictive flower, full of peace magic."
icon = 'icons/obj/xenobiology/slimecrossing.dmi'
+ worn_icon = 'icons/mob/clothing/head/costume.dmi'
icon_state = "peaceflower"
inhand_icon_state = null
slot_flags = ITEM_SLOT_HEAD
clothing_traits = list(TRAIT_PACIFISM)
body_parts_covered = NONE
-
force = 0
throwforce = 0
w_class = WEIGHT_CLASS_TINY
diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm
index bf853563142..f6265c82273 100644
--- a/code/modules/surgery/organs/ears.dm
+++ b/code/modules/surgery/organs/ears.dm
@@ -62,7 +62,8 @@
/obj/item/organ/internal/ears/cat
name = "cat ears"
- icon = 'icons/obj/clothing/hats.dmi'
+ icon = 'icons/obj/clothing/head/costume.dmi'
+ worn_icon = 'icons/mob/clothing/head/costume.dmi'
icon_state = "kitty"
visual = TRUE
damage_multiplier = 2
diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm
index 1d95097735b..68b3b7f576e 100644
--- a/code/modules/vehicles/scooter.dm
+++ b/code/modules/vehicles/scooter.dm
@@ -102,7 +102,7 @@
return
rider.throw_at(throw_target, 3, 2)
var/head_slot = rider.get_item_by_slot(ITEM_SLOT_HEAD)
- if(!head_slot || !(istype(head_slot,/obj/item/clothing/head/helmet) || istype(head_slot,/obj/item/clothing/head/hardhat)))
+ if(!head_slot || !(istype(head_slot,/obj/item/clothing/head/helmet) || istype(head_slot,/obj/item/clothing/head/utility/hardhat)))
rider.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5)
rider.updatehealth()
visible_message(span_danger("[src] crashes into [bumped_thing], sending [rider] flying!"))
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index cd8dd34794c..823104eebd5 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -9,7 +9,7 @@
vend_reply = "Thank you for using AutoDrobe!"
products = list(
/obj/item/clothing/suit/costume/chickensuit = 1,
- /obj/item/clothing/head/chicken = 1,
+ /obj/item/clothing/head/costume/chicken = 1,
/obj/item/clothing/under/rank/civilian/clown/blue = 1,
/obj/item/clothing/under/rank/civilian/clown/green = 1,
/obj/item/clothing/under/rank/civilian/clown/yellow = 1,
@@ -26,23 +26,23 @@
/obj/item/clothing/under/costume/schoolgirl/red = 1,
/obj/item/clothing/under/costume/schoolgirl/green = 1,
/obj/item/clothing/under/costume/schoolgirl/orange = 1,
- /obj/item/clothing/head/kitty = 1,
+ /obj/item/clothing/head/costume/kitty = 1,
/obj/item/clothing/under/dress/skirt = 1,
/obj/item/clothing/head/beret = 1,
/obj/item/clothing/accessory/waistcoat = 1,
/obj/item/clothing/under/suit/black = 1,
/obj/item/clothing/neck/tie = 3,
- /obj/item/clothing/head/that = 1,
+ /obj/item/clothing/head/hats/tophat = 1,
/obj/item/clothing/under/costume/kilt = 1,
/obj/item/clothing/head/beret = 3,
/obj/item/clothing/accessory/waistcoat = 1,
/obj/item/clothing/glasses/monocle =1,
- /obj/item/clothing/head/bowler = 1,
+ /obj/item/clothing/head/hats/bowler = 1,
/obj/item/cane = 1,
/obj/item/clothing/under/suit/sl = 1,
/obj/item/clothing/mask/fakemoustache = 1,
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1,
- /obj/item/clothing/head/plaguedoctorhat = 1,
+ /obj/item/clothing/head/bio_hood/plague = 1,
/obj/item/clothing/mask/gas/plaguedoctor = 1,
/obj/item/clothing/suit/toggle/owlwings = 1,
/obj/item/clothing/under/costume/owl = 1,
@@ -50,17 +50,17 @@
/obj/item/clothing/suit/toggle/owlwings/griffinwings = 1,
/obj/item/clothing/under/costume/griffin = 1,
/obj/item/clothing/shoes/griffin = 1,
- /obj/item/clothing/head/griffin = 1,
+ /obj/item/clothing/head/costume/griffin = 1,
/obj/item/clothing/suit/apron = 1,
/obj/item/clothing/under/suit/waiter = 1,
/obj/item/clothing/suit/jacket/miljacket = 1,
/obj/item/clothing/under/costume/pirate = 1,
/obj/item/clothing/suit/costume/pirate = 1,
- /obj/item/clothing/head/pirate = 1,
- /obj/item/clothing/head/bandana = 1,
- /obj/item/clothing/head/bandana = 1,
+ /obj/item/clothing/head/costume/pirate = 1,
+ /obj/item/clothing/head/costume/pirate/bandana = 1,
+ /obj/item/clothing/head/costume/pirate/bandana = 1,
/obj/item/clothing/under/costume/soviet = 1,
- /obj/item/clothing/head/ushanka = 1,
+ /obj/item/clothing/head/costume/ushanka = 1,
/obj/item/clothing/suit/costume/imperium_monk = 1,
/obj/item/clothing/mask/gas/cyborg = 1,
/obj/item/clothing/suit/chaplainsuit/holidaypriest = 1,
@@ -68,7 +68,7 @@
/obj/item/clothing/head/wizard/marisa/fake = 1,
/obj/item/clothing/suit/wizrobe/marisa/fake = 1,
/obj/item/clothing/under/dress/sundress = 1,
- /obj/item/clothing/head/witchwig = 1,
+ /obj/item/clothing/head/costume/witchwig = 1,
/obj/item/staff/broom = 1,
/obj/item/clothing/suit/wizrobe/fake = 1,
/obj/item/clothing/head/wizard/fake = 1,
@@ -91,17 +91,16 @@
/obj/item/clothing/mask/animal/cowmask = 1,
/obj/item/clothing/mask/animal/horsehead = 1,
/obj/item/clothing/suit/apron/overalls = 1,
- /obj/item/clothing/head/rabbitears =1,
+ /obj/item/clothing/head/costume/rabbitears =1,
/obj/item/clothing/accessory/vest_sheriff =1,
- /obj/item/clothing/head/cowboy_hat_brown =1,
- /obj/item/clothing/head/cowboy_hat_red =1,
- /obj/item/clothing/head/cowboy_hat_black =1,
- /obj/item/clothing/head/sombrero = 1,
- /obj/item/clothing/head/sombrero/green = 1,
+ /obj/item/clothing/head/cowboy/brown =1,
+ /obj/item/clothing/head/cowboy/red =1,
+ /obj/item/clothing/head/cowboy/black =1,
+ /obj/item/clothing/head/costume/sombrero/green = 1,
/obj/item/clothing/suit/costume/poncho = 1,
/obj/item/clothing/suit/costume/poncho/green = 1,
/obj/item/clothing/suit/costume/poncho/red = 1,
- /obj/item/clothing/head/maidheadband = 1,
+ /obj/item/clothing/head/costume/maidheadband = 1,
/obj/item/clothing/under/costume/maid = 1,
/obj/item/clothing/gloves/maid = 1,
/obj/item/clothing/neck/maid = 1,
@@ -111,7 +110,7 @@
/obj/item/clothing/glasses/heat=1,
/obj/item/clothing/suit/costume/whitedress = 1,
/obj/item/clothing/under/rank/civilian/clown/jester = 1,
- /obj/item/clothing/head/jester = 1,
+ /obj/item/clothing/head/costume/jester = 1,
/obj/item/clothing/under/costume/villain = 1,
/obj/item/clothing/shoes/singery = 1,
/obj/item/clothing/under/costume/singer/yellow = 1,
@@ -121,18 +120,18 @@
/obj/item/clothing/suit/hooded/ian_costume = 1,
/obj/item/clothing/suit/hooded/bee_costume = 1,
/obj/item/clothing/suit/costume/snowman = 1,
- /obj/item/clothing/head/snowman = 1,
+ /obj/item/clothing/head/costume/snowman = 1,
/obj/item/clothing/suit/costume/joker = 1,
/obj/item/clothing/under/costume/joker = 1,
/obj/item/clothing/mask/joy = 1,
- /obj/item/clothing/head/cueball = 1,
+ /obj/item/clothing/head/costume/cueball = 1,
/obj/item/clothing/under/suit/white_on_white = 1,
/obj/item/clothing/under/costume/sailor = 1,
/obj/item/clothing/under/costume/referee = 1,
/obj/item/clothing/mask/whistle = 1,
- /obj/item/clothing/head/delinquent = 1,
+ /obj/item/clothing/head/costume/delinquent = 1,
/obj/item/clothing/head/wig/random = 3,
- /obj/item/clothing/head/shrine_wig = 1,
+ /obj/item/clothing/head/costume/shrine_wig = 1,
/obj/item/clothing/suit/costume/shrine_maiden = 1,
/obj/item/clothing/suit/costume/changshan_red = 1,
/obj/item/clothing/suit/costume/changshan_blue = 1,
@@ -144,15 +143,15 @@
/obj/item/clothing/mask/gas/atmosprop = 3,
/obj/item/storage/backpack/henchmen = 5,
/obj/item/clothing/under/suit/henchmen = 5,
- /obj/item/clothing/head/jackbros = 5,
+ /obj/item/clothing/head/costume/jackbros = 5,
/obj/item/clothing/under/costume/jackbros = 5,
/obj/item/clothing/under/costume/deckers = 5,
)
contraband = list(
/obj/item/clothing/glasses/blindfold = 1,
/obj/item/clothing/glasses/sunglasses/gar = 2,
- /obj/item/clothing/head/powdered_wig = 1,
- /obj/item/clothing/head/tv_head = 1,
+ /obj/item/clothing/head/costume/powdered_wig = 1,
+ /obj/item/clothing/head/costume/tv_head = 1,
/obj/item/clothing/mask/muzzle = 2,
/obj/item/clothing/shoes/clown_shoes/ducky_shoes = 1,
/obj/item/clothing/shoes/clown_shoes/meown_shoes = 1,
@@ -161,7 +160,7 @@
)
premium = list(
/obj/item/clothing/suit/costume/pirate/captain = 2,
- /obj/item/clothing/head/pirate/captain = 2,
+ /obj/item/clothing/head/costume/pirate/captain = 2,
/obj/item/clothing/under/rank/civilian/clown/rainbow = 1,
/obj/item/clothing/head/helmet/roman/fake = 1,
/obj/item/clothing/head/helmet/roman/legionnaire/fake = 1,
@@ -169,12 +168,12 @@
/obj/item/clothing/shoes/roman = 1,
/obj/item/shield/riot/roman/fake = 1,
/obj/item/clothing/suit/chaplainsuit/clownpriest = 1,
- /obj/item/clothing/head/clownmitre = 1,
+ /obj/item/clothing/head/chaplain/clownmitre = 1,
/obj/item/skub = 1,
/obj/item/clothing/suit/hooded/mysticrobe = 1,
/obj/item/clothing/under/dress/wedding_dress = 1,
/obj/item/clothing/under/suit/tuxedo = 1,
- /obj/item/clothing/head/weddingveil = 1,
+ /obj/item/clothing/head/costume/weddingveil = 1,
/obj/item/storage/belt/cummerbund = 1,
)
refill_canister = /obj/item/vending_refill/autodrobe
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index b8c824f2e5f..c3bf088a252 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -12,7 +12,7 @@
"icon" = "hat-cowboy",
"products" = list(
/obj/item/clothing/head/wig/natural = 4,
- /obj/item/clothing/head/fancy = 4,
+ /obj/item/clothing/head/costume/fancy = 4,
/obj/item/clothing/head/beanie = 8,
/obj/item/clothing/head/beret/black = 3,
/obj/item/clothing/mask/bandana = 3,
@@ -23,14 +23,14 @@
/obj/item/clothing/neck/infinity_scarf = 6,
/obj/item/clothing/neck/tie = 6,
/obj/item/clothing/head/rasta = 3,
- /obj/item/clothing/head/kippah = 3,
- /obj/item/clothing/head/taqiyahred = 3,
- /obj/item/clothing/head/that = 3,
+ /obj/item/clothing/head/chaplain/kippah = 3,
+ /obj/item/clothing/head/chaplain/taqiyah/red = 3,
+ /obj/item/clothing/head/hats/tophat = 3,
/obj/item/clothing/head/fedora = 3,
- /obj/item/clothing/head/bowler = 3,
- /obj/item/clothing/head/cowboy_hat_white = 1,
- /obj/item/clothing/head/cowboy_hat_grey = 1,
- /obj/item/clothing/head/sombrero = 1,
+ /obj/item/clothing/head/hats/bowler = 3,
+ /obj/item/clothing/head/cowboy/white = 1,
+ /obj/item/clothing/head/cowboy/grey = 1,
+ /obj/item/clothing/head/costume/sombrero/green = 1,
),
),
@@ -127,7 +127,7 @@
"name" = "Special",
"icon" = "star",
"products" = list(
- /obj/item/clothing/head/football_helmet = 6,
+ /obj/item/clothing/head/costume/football_helmet = 6,
/obj/item/clothing/under/costume/football_suit = 6,
/obj/item/clothing/suit/costume/football_armor = 6,
@@ -139,11 +139,11 @@
/obj/item/clothing/under/ethereal_tunic = 3,
/obj/item/clothing/suit/costume/ianshirt = 1,
- /obj/item/clothing/head/irs = 20,
- /obj/item/clothing/head/tmc = 20,
- /obj/item/clothing/head/deckers = 20,
- /obj/item/clothing/head/yuri = 20,
- /obj/item/clothing/head/allies = 20,
+ /obj/item/clothing/head/costume/irs = 20,
+ /obj/item/clothing/head/costume/tmc = 20,
+ /obj/item/clothing/head/costume/deckers = 20,
+ /obj/item/clothing/head/costume/yuri = 20,
+ /obj/item/clothing/head/costume/allies = 20,
/obj/item/clothing/glasses/osi = 20,
/obj/item/clothing/glasses/phantom = 20,
/obj/item/clothing/mask/gas/driscoll = 20,
@@ -166,7 +166,7 @@
/obj/item/clothing/under/syndicate/tacticool = 1,
/obj/item/clothing/under/syndicate/tacticool/skirt = 1,
/obj/item/clothing/mask/balaclava = 1,
- /obj/item/clothing/head/ushanka = 1,
+ /obj/item/clothing/head/costume/ushanka = 1,
/obj/item/clothing/under/costume/soviet = 1,
/obj/item/storage/belt/fannypack/black = 2,
/obj/item/clothing/suit/jacket/letterman_syndie = 1,
@@ -176,7 +176,7 @@
/obj/item/clothing/under/rank/centcom/officer_skirt/replica = 1,
)
premium = list(/obj/item/clothing/under/suit/checkered = 1,
- /obj/item/clothing/head/mailman = 1,
+ /obj/item/clothing/head/costume/mailman = 1,
/obj/item/clothing/under/misc/mailman = 1,
/obj/item/clothing/suit/jacket/leather = 1,
/obj/item/clothing/suit/jacket/leather/biker = 1,
diff --git a/code/modules/vending/engineering.dm b/code/modules/vending/engineering.dm
index 54d203a4f61..bf6ad0a7133 100644
--- a/code/modules/vending/engineering.dm
+++ b/code/modules/vending/engineering.dm
@@ -10,7 +10,7 @@
/obj/item/clothing/under/rank/engineering/chief_engineer = 4,
/obj/item/clothing/under/rank/engineering/engineer = 4,
/obj/item/clothing/shoes/sneakers/orange = 4,
- /obj/item/clothing/head/hardhat = 4,
+ /obj/item/clothing/head/utility/hardhat = 4,
/obj/item/storage/belt/utility = 4,
/obj/item/clothing/glasses/meson/engine = 4,
/obj/item/clothing/gloves/color/yellow = 4,
@@ -22,7 +22,7 @@
/obj/item/t_scanner = 12,
/obj/item/stock_parts/cell = 8,
/obj/item/weldingtool = 8,
- /obj/item/clothing/head/welding = 8,
+ /obj/item/clothing/head/utility/welding = 8,
/obj/item/light/tube = 10,
/obj/item/clothing/suit/utility/fire = 4,
/obj/item/stock_parts/scanning_module = 5,
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index e5a18fa04e3..0427c1a31e1 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -58,11 +58,11 @@
/obj/item/clothing/suit/hooded/wintercoat/medical/paramedic = 4,
/obj/item/clothing/under/rank/medical/paramedic = 4,
/obj/item/clothing/under/rank/medical/paramedic/skirt = 4,
- /obj/item/clothing/head/nursehat = 4,
+ /obj/item/clothing/head/costume/nursehat = 4,
/obj/item/clothing/head/beret/medical = 4,
- /obj/item/clothing/head/surgerycap = 4,
- /obj/item/clothing/head/surgerycap/purple = 4,
- /obj/item/clothing/head/surgerycap/green = 4,
+ /obj/item/clothing/head/utility/surgerycap = 4,
+ /obj/item/clothing/head/utility/surgerycap/purple = 4,
+ /obj/item/clothing/head/utility/surgerycap/green = 4,
/obj/item/clothing/mask/bandana/striped/medical = 4,
/obj/item/clothing/under/rank/medical/doctor = 4,
/obj/item/clothing/under/rank/medical/doctor/skirt = 4,
@@ -103,8 +103,8 @@
/obj/item/clothing/shoes/workboots = 3,
/obj/item/clothing/head/beret/engi = 3,
/obj/item/clothing/mask/bandana/striped/engineering = 3,
- /obj/item/clothing/head/hardhat = 3,
- /obj/item/clothing/head/hardhat/weldhat = 3,
+ /obj/item/clothing/head/utility/hardhat = 3,
+ /obj/item/clothing/head/utility/hardhat/weldhat = 3,
)
refill_canister = /obj/item/vending_refill/wardrobe/engi_wardrobe
payment_department = ACCOUNT_ENG
@@ -157,7 +157,7 @@
)
premium = list(
/obj/item/clothing/under/rank/cargo/miner = 3,
- /obj/item/clothing/head/mailman = 1,
+ /obj/item/clothing/head/costume/mailman = 1,
/obj/item/clothing/under/misc/mailman = 1,
)
refill_canister = /obj/item/vending_refill/wardrobe/cargo_wardrobe
@@ -283,7 +283,7 @@
product_ads = "Guaranteed to prevent stains from spilled drinks!"
vend_reply = "Thank you for using the BarDrobe!"
products = list(
- /obj/item/clothing/head/that = 2,
+ /obj/item/clothing/head/hats/tophat = 2,
/obj/item/radio/headset/headset_srv = 2,
/obj/item/clothing/under/suit/sl = 2,
/obj/item/clothing/under/rank/civilian/bartender = 2,
@@ -329,7 +329,7 @@
/obj/item/clothing/suit/toggle/chef = 1,
/obj/item/clothing/under/rank/civilian/chef = 1,
/obj/item/clothing/under/rank/civilian/chef/skirt = 2,
- /obj/item/clothing/head/chefhat = 1,
+ /obj/item/clothing/head/utility/chefhat = 1,
/obj/item/clothing/under/rank/civilian/cookjorts = 2,
/obj/item/clothing/shoes/cookflops = 2,
/obj/item/reagent_containers/cup/rag = 1,
@@ -425,27 +425,27 @@
/obj/item/clothing/under/rank/civilian/chaplain/skirt = 2,
/obj/item/clothing/shoes/sneakers/black = 1,
/obj/item/clothing/suit/chaplainsuit/nun = 1,
- /obj/item/clothing/head/nun_hood = 1,
+ /obj/item/clothing/head/chaplain/nun_hood = 1,
/obj/item/clothing/suit/chaplainsuit/holidaypriest = 1,
/obj/item/clothing/suit/hooded/chaplainsuit/monkhabit = 1,
/obj/item/storage/fancy/candle_box = 2,
- /obj/item/clothing/head/kippah = 3,
+ /obj/item/clothing/head/chaplain/kippah = 3,
/obj/item/clothing/suit/chaplainsuit/whiterobe = 1,
- /obj/item/clothing/head/taqiyahwhite = 1,
- /obj/item/clothing/head/taqiyahred = 3,
+ /obj/item/clothing/head/chaplain/taqiyah/white = 1,
+ /obj/item/clothing/head/chaplain/taqiyah/red = 3,
/obj/item/clothing/suit/chaplainsuit/monkrobeeast = 1,
/obj/item/clothing/head/rasta = 1,
)
contraband = list(
/obj/item/toy/plush/ratplush = 1,
/obj/item/toy/plush/narplush = 1,
- /obj/item/clothing/head/medievaljewhat = 3,
+ /obj/item/clothing/head/chaplain/medievaljewhat = 3,
/obj/item/clothing/suit/chaplainsuit/clownpriest = 1,
- /obj/item/clothing/head/clownmitre = 1,
+ /obj/item/clothing/head/chaplain/clownmitre = 1,
)
premium = list(
/obj/item/clothing/suit/chaplainsuit/bishoprobe = 1,
- /obj/item/clothing/head/bishopmitre = 1,
+ /obj/item/clothing/head/chaplain/bishopmitre = 1,
)
refill_canister = /obj/item/vending_refill/wardrobe/chap_wardrobe
payment_department = ACCOUNT_SRV
@@ -586,9 +586,9 @@
/obj/item/clothing/suit/armor/centcom_formal = 3,
/obj/item/clothing/suit/space/officer = 3,
/obj/item/clothing/suit/hooded/wintercoat/centcom = 3,
- /obj/item/clothing/head/centcom_cap = 3,
- /obj/item/clothing/head/centhat = 3,
- /obj/item/clothing/head/intern = 3,
+ /obj/item/clothing/head/hats/centcom_cap = 3,
+ /obj/item/clothing/head/hats/centhat = 3,
+ /obj/item/clothing/head/hats/intern = 3,
)
refill_canister = /obj/item/vending_refill/wardrobe/cent_wardrobe
/obj/item/vending_refill/wardrobe/cent_wardrobe
diff --git a/code/modules/vending/youtool.dm b/code/modules/vending/youtool.dm
index 3b82e0c1788..819ddbe2208 100644
--- a/code/modules/vending/youtool.dm
+++ b/code/modules/vending/youtool.dm
@@ -26,7 +26,7 @@
/obj/item/storage/belt/utility = 2,
/obj/item/multitool = 2,
/obj/item/weldingtool/hugetank = 2,
- /obj/item/clothing/head/welding = 2,
+ /obj/item/clothing/head/utility/welding = 2,
/obj/item/clothing/gloves/color/yellow = 1,
)
refill_canister = /obj/item/vending_refill/youtool
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
deleted file mode 100644
index 1a7c6efb819..00000000000
Binary files a/icons/mob/clothing/head.dmi and /dev/null differ
diff --git a/icons/mob/clothing/head/animal_item_head.dmi b/icons/mob/clothing/head/animal_item_head.dmi
deleted file mode 100644
index 0f6bee3a7ca..00000000000
Binary files a/icons/mob/clothing/head/animal_item_head.dmi and /dev/null differ
diff --git a/icons/mob/clothing/head/beanie.dmi b/icons/mob/clothing/head/beanie.dmi
new file mode 100644
index 00000000000..76b3574d172
Binary files /dev/null and b/icons/mob/clothing/head/beanie.dmi differ
diff --git a/icons/mob/clothing/head/bio.dmi b/icons/mob/clothing/head/bio.dmi
new file mode 100644
index 00000000000..205ea7945a7
Binary files /dev/null and b/icons/mob/clothing/head/bio.dmi differ
diff --git a/icons/mob/clothing/head/chaplain.dmi b/icons/mob/clothing/head/chaplain.dmi
new file mode 100644
index 00000000000..7c34306918f
Binary files /dev/null and b/icons/mob/clothing/head/chaplain.dmi differ
diff --git a/icons/mob/clothing/head/costume.dmi b/icons/mob/clothing/head/costume.dmi
new file mode 100644
index 00000000000..7f4136ff134
Binary files /dev/null and b/icons/mob/clothing/head/costume.dmi differ
diff --git a/icons/mob/clothing/head/cowboy.dmi b/icons/mob/clothing/head/cowboy.dmi
new file mode 100644
index 00000000000..65d1892f6d9
Binary files /dev/null and b/icons/mob/clothing/head/cowboy.dmi differ
diff --git a/icons/mob/clothing/head/default.dmi b/icons/mob/clothing/head/default.dmi
new file mode 100644
index 00000000000..90a46331388
Binary files /dev/null and b/icons/mob/clothing/head/default.dmi differ
diff --git a/icons/mob/clothing/head/hats.dmi b/icons/mob/clothing/head/hats.dmi
new file mode 100644
index 00000000000..26612091a59
Binary files /dev/null and b/icons/mob/clothing/head/hats.dmi differ
diff --git a/icons/mob/clothing/head/helmet.dmi b/icons/mob/clothing/head/helmet.dmi
new file mode 100644
index 00000000000..c1eafe8cd39
Binary files /dev/null and b/icons/mob/clothing/head/helmet.dmi differ
diff --git a/icons/mob/clothing/head/pai_item_head.dmi b/icons/mob/clothing/head/pai_head.dmi
similarity index 100%
rename from icons/mob/clothing/head/pai_item_head.dmi
rename to icons/mob/clothing/head/pai_head.dmi
diff --git a/icons/mob/clothing/head/pets_head.dmi b/icons/mob/clothing/head/pets_head.dmi
new file mode 100644
index 00000000000..94d1b237564
Binary files /dev/null and b/icons/mob/clothing/head/pets_head.dmi differ
diff --git a/icons/mob/clothing/head/pets_held.dmi b/icons/mob/clothing/head/pets_held.dmi
deleted file mode 100644
index 1a8d30b6abf..00000000000
Binary files a/icons/mob/clothing/head/pets_held.dmi and /dev/null differ
diff --git a/icons/mob/clothing/head/pets_held_head.dmi b/icons/mob/clothing/head/pets_held_head.dmi
deleted file mode 100644
index 8ad6c482a1b..00000000000
Binary files a/icons/mob/clothing/head/pets_held_head.dmi and /dev/null differ
diff --git a/icons/mob/clothing/head/spacehelm.dmi b/icons/mob/clothing/head/spacehelm.dmi
new file mode 100644
index 00000000000..0b42f3b61a2
Binary files /dev/null and b/icons/mob/clothing/head/spacehelm.dmi differ
diff --git a/icons/mob/clothing/head/utility.dmi b/icons/mob/clothing/head/utility.dmi
new file mode 100644
index 00000000000..f1b8cbb9ba3
Binary files /dev/null and b/icons/mob/clothing/head/utility.dmi differ
diff --git a/icons/mob/clothing/head/wizard.dmi b/icons/mob/clothing/head/wizard.dmi
new file mode 100644
index 00000000000..e11123c11e3
Binary files /dev/null and b/icons/mob/clothing/head/wizard.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
deleted file mode 100644
index 26d66225a36..00000000000
Binary files a/icons/obj/clothing/hats.dmi and /dev/null differ
diff --git a/icons/obj/clothing/head/beanie.dmi b/icons/obj/clothing/head/beanie.dmi
new file mode 100644
index 00000000000..09a668918fa
Binary files /dev/null and b/icons/obj/clothing/head/beanie.dmi differ
diff --git a/icons/obj/clothing/head/bio.dmi b/icons/obj/clothing/head/bio.dmi
new file mode 100644
index 00000000000..4744e596034
Binary files /dev/null and b/icons/obj/clothing/head/bio.dmi differ
diff --git a/icons/obj/clothing/head/chaplain.dmi b/icons/obj/clothing/head/chaplain.dmi
new file mode 100644
index 00000000000..6a906bd4f01
Binary files /dev/null and b/icons/obj/clothing/head/chaplain.dmi differ
diff --git a/icons/obj/clothing/head/costume.dmi b/icons/obj/clothing/head/costume.dmi
new file mode 100644
index 00000000000..3b7710d53bc
Binary files /dev/null and b/icons/obj/clothing/head/costume.dmi differ
diff --git a/icons/obj/clothing/head/cowboy.dmi b/icons/obj/clothing/head/cowboy.dmi
new file mode 100644
index 00000000000..66c07672941
Binary files /dev/null and b/icons/obj/clothing/head/cowboy.dmi differ
diff --git a/icons/obj/clothing/head/default.dmi b/icons/obj/clothing/head/default.dmi
new file mode 100644
index 00000000000..6c781a70ad1
Binary files /dev/null and b/icons/obj/clothing/head/default.dmi differ
diff --git a/icons/obj/clothing/head/hats.dmi b/icons/obj/clothing/head/hats.dmi
new file mode 100644
index 00000000000..832e6e863fc
Binary files /dev/null and b/icons/obj/clothing/head/hats.dmi differ
diff --git a/icons/obj/clothing/head/helmet.dmi b/icons/obj/clothing/head/helmet.dmi
new file mode 100644
index 00000000000..45819f7886f
Binary files /dev/null and b/icons/obj/clothing/head/helmet.dmi differ
diff --git a/icons/obj/clothing/head/spacehelm.dmi b/icons/obj/clothing/head/spacehelm.dmi
new file mode 100644
index 00000000000..6c601932955
Binary files /dev/null and b/icons/obj/clothing/head/spacehelm.dmi differ
diff --git a/icons/obj/clothing/head/utility.dmi b/icons/obj/clothing/head/utility.dmi
new file mode 100644
index 00000000000..adbda30d831
Binary files /dev/null and b/icons/obj/clothing/head/utility.dmi differ
diff --git a/icons/obj/clothing/head/wizard.dmi b/icons/obj/clothing/head/wizard.dmi
new file mode 100644
index 00000000000..0f618a1abdb
Binary files /dev/null and b/icons/obj/clothing/head/wizard.dmi differ
diff --git a/tools/UpdatePaths/Scripts/70060_hats_repath.txt b/tools/UpdatePaths/Scripts/70060_hats_repath.txt
new file mode 100644
index 00000000000..546c9361b39
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/70060_hats_repath.txt
@@ -0,0 +1,124 @@
+#comment This replaces all hat paths https://github.com/tgstation/tgstation/pull/70060
+
+/obj/item/clothing/suit/bronze : /obj/item/clothing/suit/costume/bronze {@OLD}
+/obj/item/clothing/head/magus : /obj/item/clothing/head/wizard/magus {@OLD}
+/obj/item/clothing/head/kitty : /obj/item/clothing/head/costume/kitty {@OLD}
+/obj/item/clothing/head/hardhat/cakehat : /obj/item/clothing/head/utility/hardhat/cakehat {@OLD}
+/obj/item/clothing/head/powdered_wig : /obj/item/clothing/head/costume/powdered_wig {@OLD}
+/obj/item/clothing/head/hasturhood : /obj/item/clothing/head/costume/hasturhood {@OLD}
+/obj/item/clothing/head/cueball : /obj/item/clothing/head/costume/cueball {@OLD}
+/obj/item/clothing/head/snowman : /obj/item/clothing/head/costume/snowman {@OLD}
+/obj/item/clothing/head/witchwig : /obj/item/clothing/head/costume/witchwig {@OLD}
+/obj/item/clothing/head/maidheadband : /obj/item/clothing/head/costume/maidheadband {@OLD}
+/obj/item/clothing/head/chicken : /obj/item/clothing/head/costume/chicken {@OLD}
+/obj/item/clothing/head/griffin : /obj/item/clothing/head/costume/griffin {@OLD}
+/obj/item/clothing/head/xenos : /obj/item/clothing/head/costume/xenos {@OLD}
+/obj/item/clothing/head/lobsterhat : /obj/item/clothing/head/costume/lobsterhat {@OLD}
+/obj/item/clothing/head/drfreezehat : /obj/item/clothing/head/costume/drfreezehat {@OLD}
+/obj/item/clothing/head/shrine_wig : /obj/item/clothing/head/costume/shrine_wig {@OLD}
+/obj/item/clothing/head/cardborg : /obj/item/clothing/head/costume/cardborg {@OLD}
+/obj/item/clothing/head/bronze : /obj/item/clothing/head/costume/bronze {@OLD}
+/obj/item/clothing/head/fancy : /obj/item/clothing/head/costume/fancy {@OLD}
+/obj/item/clothing/head/football_helmet : /obj/item/clothing/head/costume/football_helmet {@OLD}
+/obj/item/clothing/head/tv_head : /obj/item/clothing/head/costume/tv_head {@OLD}
+/obj/item/clothing/head/tv_head/fov_less : /obj/item/clothing/head/costume/tv_head/fov_less {@OLD}
+/obj/item/clothing/head/irs : /obj/item/clothing/head/costume/irs {@OLD}
+/obj/item/clothing/head/tmc : /obj/item/clothing/head/costume/tmc {@OLD}
+/obj/item/clothing/head/deckers : /obj/item/clothing/head/costume/deckers {@OLD}
+/obj/item/clothing/head/yuri : /obj/item/clothing/head/costume/yuri {@OLD}
+/obj/item/clothing/head/allies : /obj/item/clothing/head/costume/allies {@OLD}
+/obj/item/clothing/head/crown : /obj/item/clothing/head/costume/crown {@OLD}
+/obj/item/clothing/head/crown/fancy : /obj/item/clothing/head/costume/crown/fancy {@OLD}
+/obj/item/clothing/head/garland : /obj/item/clothing/head/costume/garland {@OLD}
+/obj/item/clothing/head/hardhat : /obj/item/clothing/head/utility/hardhat {@OLD}
+/obj/item/clothing/head/hardhat/orange : /obj/item/clothing/head/utility/hardhat/orange {@OLD}
+/obj/item/clothing/head/hardhat/red : /obj/item/clothing/head/utility/hardhat/red {@OLD}
+/obj/item/clothing/head/hardhat/red/upgraded : /obj/item/clothing/head/utility/hardhat/red/upgraded {@OLD}
+/obj/item/clothing/head/hardhat/white : /obj/item/clothing/head/utility/hardhat/white {@OLD}
+/obj/item/clothing/head/hardhat/dblue : /obj/item/clothing/head/utility/hardhat/dblue {@OLD}
+/obj/item/clothing/head/hardhat/atmos : /obj/item/clothing/head/utility/hardhat/atmos {@OLD}
+/obj/item/clothing/head/hardhat/weldhat : /obj/item/clothing/head/utility/hardhat/weldhat {@OLD}
+/obj/item/clothing/head/hardhat/weldhat/orange : /obj/item/clothing/head/utility/hardhat/weldhat/orange {@OLD}
+/obj/item/clothing/head/hardhat/weldhat/white : /obj/item/clothing/head/utility/hardhat/weldhat/white {@OLD}
+/obj/item/clothing/head/hardhat/weldhat/dblue : /obj/item/clothing/head/utility/hardhat/weldhat/dblue {@OLD}
+/obj/item/clothing/head/hardhat/pumpkinhead : /obj/item/clothing/head/utility/hardhat/pumpkinhead {@OLD}
+/obj/item/clothing/head/hardhat/pumpkinhead/blumpkin : /obj/item/clothing/head/utility/hardhat/pumpkinhead/blumpkin {@OLD}
+/obj/item/clothing/head/hardhat/reindeer : /obj/item/clothing/head/utility/hardhat/reindeer {@OLD}
+/obj/item/clothing/head/centhat : /obj/item/clothing/head/hats/centhat {@OLD}
+/obj/item/clothing/head/constable : /obj/item/clothing/head/costume/constable {@OLD}
+/obj/item/clothing/head/spacepolice : /obj/item/clothing/head/costume/spacepolice {@OLD}
+/obj/item/clothing/head/canada : /obj/item/clothing/head/costume/canada {@OLD}
+/obj/item/clothing/head/redcoat : /obj/item/clothing/head/costume/redcoat {@OLD}
+/obj/item/clothing/head/mailman : /obj/item/clothing/head/costume/mailman {@OLD}
+/obj/item/clothing/head/plaguedoctorhat : /obj/item/clothing/head/bio_hood/plague {@OLD}
+/obj/item/clothing/head/nursehat : /obj/item/clothing/head/costume/nursehat {@OLD}
+/obj/item/clothing/head/bowler : /obj/item/clothing/head/hats/bowler {@OLD}
+/obj/item/clothing/head/bearpelt : /obj/item/clothing/head/costume/bearpelt {@OLD}
+/obj/item/clothing/head/hunter : /obj/item/clothing/head/cowboy {@OLD}
+/obj/item/clothing/head/cowboy_hat_black : /obj/item/clothing/head/cowboy/black {@OLD}
+/obj/item/clothing/head/cowboy_hat_white : /obj/item/clothing/head/cowboy/white {@OLD}
+/obj/item/clothing/head/cowboy_hat_grey : /obj/item/clothing/head/cowboy/grey {@OLD}
+/obj/item/clothing/head/cowboy_hat_red : /obj/item/clothing/head/cowboy/red {@OLD}
+/obj/item/clothing/head/cowboy_hat_brown : /obj/item/clothing/head/cowboy/brown {@OLD}
+/obj/item/clothing/head/santa : /obj/item/clothing/head/costume/santa {@OLD}
+/obj/item/clothing/head/jester : /obj/item/clothing/head/costume/jester {@OLD}
+/obj/item/clothing/head/jester/alt : /obj/item/clothing/head/costume/jester/alt {@OLD}
+/obj/item/clothing/head/rice_hat : /obj/item/clothing/head/costume/rice_hat {@OLD}
+/obj/item/clothing/head/lizard : /obj/item/clothing/head/costume/lizard {@OLD}
+/obj/item/clothing/head/scarecrow_hat : /obj/item/clothing/head/costume/scarecrow_hat {@OLD}
+/obj/item/clothing/head/pharaoh : /obj/item/clothing/head/costume/pharaoh {@OLD}
+/obj/item/clothing/head/nemes : /obj/item/clothing/head/costume/nemes {@OLD}
+/obj/item/clothing/head/delinquent : /obj/item/clothing/head/costume/delinquent {@OLD}
+/obj/item/clothing/head/intern : /obj/item/clothing/head/hats/intern {@OLD}
+/obj/item/clothing/head/coordinator : /obj/item/clothing/head/hats/coordinator {@OLD}
+/obj/item/clothing/head/jackbros : /obj/item/clothing/head/costume/jackbros {@OLD}
+/obj/item/clothing/head/weddingveil : /obj/item/clothing/head/costume/weddingveil {@OLD}
+/obj/item/clothing/head/centcom_cap : /obj/item/clothing/head/hats/centcom_cap {@OLD}
+/obj/item/clothing/head/human_leather : /obj/item/clothing/head/fedora/human_leather {@OLD}
+/obj/item/clothing/head/ushanka : /obj/item/clothing/head/costume/ushanka {@OLD}
+/obj/item/clothing/head/chefhat : /obj/item/clothing/head/utility/chefhat {@OLD}
+/obj/item/clothing/head/caphat : /obj/item/clothing/head/hats/caphat {@OLD}
+/obj/item/clothing/head/caphat/parade : /obj/item/clothing/head/hats/caphat/parade {@OLD}
+/obj/item/clothing/head/hopcap : /obj/item/clothing/head/hats/hopcap {@OLD}
+/obj/item/clothing/head/nun_hood : /obj/item/clothing/head/chaplain/nun_hood {@OLD}
+/obj/item/clothing/head/bishopmitre : /obj/item/clothing/head/chaplain/bishopmitre {@OLD}
+/obj/item/clothing/head/hos : /obj/item/clothing/head/hats/hos {@OLD}
+/obj/item/clothing/head/hos/syndicate : /obj/item/clothing/head/hats/hos/syndicate {@OLD}
+/obj/item/clothing/head/warden : /obj/item/clothing/head/hats/warden {@OLD}
+/obj/item/clothing/head/warden/police : /obj/item/clothing/head/hats/warden/police {@OLD}
+/obj/item/clothing/head/warden/red : /obj/item/clothing/head/hats/warden/red {@OLD}
+/obj/item/clothing/head/warden/drill : /obj/item/clothing/head/hats/warden/drill {@OLD}
+/obj/item/clothing/head/surgerycap : /obj/item/clothing/head/utility/surgerycap {@OLD}
+/obj/item/clothing/head/surgerycap/purple : /obj/item/clothing/head/utility/surgerycap/purple {@OLD}
+/obj/item/clothing/head/surgerycap/green : /obj/item/clothing/head/utility/surgerycap/green {@OLD}
+/obj/item/clothing/head/surgerycap/cmo : /obj/item/clothing/head/utility/surgerycap/cmo {@OLD}
+/obj/item/clothing/head/justice : /obj/item/clothing/head/costume/justice {@OLD}
+/obj/item/clothing/head/justice/blue : /obj/item/clothing/head/costume/justice/blue {@OLD}
+/obj/item/clothing/head/justice/yellow : /obj/item/clothing/head/costume/justice/yellow {@OLD}
+/obj/item/clothing/head/justice/green : /obj/item/clothing/head/costume/justice/green {@OLD}
+/obj/item/clothing/head/justice/pink : /obj/item/clothing/head/costume/justice/pink {@OLD}
+/obj/item/clothing/head/papersack : /obj/item/clothing/head/costume/papersack {@OLD}
+/obj/item/clothing/head/papersack/smiley : /obj/item/clothing/head/costume/papersack/smiley {@OLD}
+/obj/item/clothing/head/pirate : /obj/item/clothing/head/costume/pirate {@OLD}
+/obj/item/clothing/head/pirate/armored : /obj/item/clothing/head/costume/pirate/armored {@OLD}
+/obj/item/clothing/head/pirate/captain : /obj/item/clothing/head/costume/pirate/captain {@OLD}
+/obj/item/clothing/head/bandana : /obj/item/clothing/head/costume/pirate/bandana {@OLD}
+/obj/item/clothing/head/bandana/armored : /obj/item/clothing/head/costume/pirate/bandana/armored {@OLD}
+/obj/item/clothing/head/clownmitre : /obj/item/clothing/head/chaplain/clownmitre {@OLD}
+/obj/item/clothing/head/kippah : /obj/item/clothing/head/chaplain/kippah {@OLD}
+/obj/item/clothing/head/medievaljewhat : /obj/item/clothing/head/chaplain/medievaljewhat {@OLD}
+/obj/item/clothing/head/taqiyahwhite : /obj/item/clothing/head/chaplain/taqiyah/white {@OLD}
+/obj/item/clothing/head/taqiyahred : /obj/item/clothing/head/chaplain/taqiyah/red {@OLD}
+/obj/item/clothing/head/sombrero : /obj/item/clothing/head/costume/sombrero {@OLD}
+/obj/item/clothing/head/sombrero/green : /obj/item/clothing/head/costume/sombrero/green {@OLD}
+/obj/item/clothing/head/sombrero/shamebrero : /obj/item/clothing/head/costume/sombrero/shamebrero {@OLD}
+/obj/item/clothing/head/foilhat : /obj/item/clothing/head/costume/foilhat {@OLD}
+/obj/item/clothing/head/that : /obj/item/clothing/head/hats/tophat {@OLD}
+/obj/item/clothing/head/welding : /obj/item/clothing/head/utility/welding {@OLD}
+/obj/item/clothing/head/bomb_hood : /obj/item/clothing/head/utility/bomb_hood {@OLD}
+/obj/item/clothing/head/bomb_hood/security : /obj/item/clothing/head/utility/bomb_hood/security {@OLD}
+/obj/item/clothing/head/bomb_hood/white : /obj/item/clothing/head/utility/bomb_hood/white {@OLD}
+/obj/item/clothing/head/radiation : /obj/item/clothing/head/utility/radiation {@OLD}
+/obj/item/clothing/head/festive : /obj/item/clothing/head/costume/festive {@OLD}
+/obj/item/clothing/head/bunnyhead : /obj/item/clothing/head/costume/bunnyhead {@OLD}
+/obj/item/clothing/head/beekeeper_head : /obj/item/clothing/head/utility/beekeeper_head {@OLD}