Merge pull request #2149 from SinTwo/item_state

Item State Cleanup

code/defines/obj.dm

@@ -190,9 +190,8 @@ var/global/list/PDA_Manifest = list()
 
 /obj/item/weapon/beach_ball
 	icon = 'icons/misc/beach.dmi'
-	icon_state = "ball"
+	icon_state = "beachball"
 	name = "beach ball"
-	item_state = "beachball"
 	density = 0
 	anchored = 0
 	w_class = 4

code/defines/obj/weapon.dm

@@ -79,7 +79,10 @@
 	desc = "A cane used by a true gentlemen. Or a clown."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "cane"
-	item_state = "stick"
+	item_icons = list(
+			slot_l_hand_str = 'icons/mob/items/lefthand_melee.dmi',
+			slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi',
+			)
 	flags = CONDUCT
 	force = 5.0
 	throwforce = 7.0
@@ -135,7 +138,6 @@
 	desc = "A cane used by the blind."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "whitecane"
-	item_state = "whitecane"
 
 /obj/item/weapon/disk
 	name = "disk"
@@ -245,6 +247,10 @@
 	desc = "Apparently a staff used by the wizard."
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "staff"
+	item_icons = list(
+			slot_l_hand_str = 'icons/mob/items/lefthand_melee.dmi',
+			slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi',
+			)
 	force = 3.0
 	throwforce = 5.0
 	throw_speed = 1
@@ -263,14 +269,13 @@
 	desc = "An ebony can with an ivory tip."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "cane"
-	item_state = "stick"
 
 /obj/item/weapon/staff/stick
 	name = "stick"
 	desc = "A great tool to drag someone else's drinks across the bar."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "stick"
-	item_state = "stick"
+	item_state = "cane"
 	force = 3.0
 	throwforce = 5.0
 	throw_speed = 1
@@ -380,7 +385,6 @@
 	name = "rapid part exchange device"
 	desc = "Special mechanical module made to store, sort, and apply standard machine parts."
 	icon_state = "RPED"
-	item_state = "RPED"
 	w_class = 5
 	can_hold = list(/obj/item/weapon/stock_parts)
 	storage_slots = 50

code/game/gamemodes/changeling/powers/armblade.dm

@@ -28,7 +28,6 @@
 	desc = "A grotesque blade made out of bone and flesh that cleaves through people as a hot knife through butter."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "arm_blade"
-	item_state = "arm_blade"
 	w_class = 5.0
 	force = 40
 	sharp = 1

code/game/gamemodes/changeling/powers/armor.dm

@@ -71,7 +71,6 @@
 	name = "chitinous mass"
 	desc = "A tough, hard covering of black chitin."
 	icon_state = "lingarmor"
-	item_state = "lingarmor"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	armor = list(melee = 75, bullet = 60, laser = 60, energy = 60, bomb = 60, bio = 0, rad = 0) //It costs 3 points, so it should be very protective.
 	siemens_coefficient = 0.3
@@ -92,7 +91,6 @@
 	name = "chitinous mass"
 	desc = "A tough, hard covering of black chitin with transparent chitin in front."
 	icon_state = "lingarmorhelmet"
-	item_state = "lingarmorhelmet"
 	armor = list(melee = 75, bullet = 60, laser = 60,energy = 60, bomb = 60, bio = 0, rad = 0)
 	siemens_coefficient = 0.3
 	max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE

code/game/gamemodes/changeling/powers/fabricate_clothing.dm

@@ -33,6 +33,10 @@ var/global/list/changeling_fabricated_clothing = list(
 /obj/item/clothing/under/chameleon/changeling
 	name = "malformed flesh"
 	icon_state = "lingchameleon"
+	item_icons = list(
+			slot_l_hand_str = 'icons/mob/items/lefthand_uniforms.dmi',
+			slot_r_hand_str = 'icons/mob/items/righthand_uniforms.dmi',
+			)
 	item_state = "lingchameleon"
 	worn_state = "lingchameleon"
 	desc = "The flesh all around us has grown a new layer of cells that can shift appearance and create a biological fabric that cannot be distinguished from \
@@ -79,6 +83,10 @@ var/global/list/changeling_fabricated_clothing = list(
 /obj/item/clothing/suit/chameleon/changeling
 	name = "chitinous chest"
 	icon_state = "lingchameleon"
+	item_icons = list(
+			slot_l_hand_str = 'icons/mob/items/lefthand_suits.dmi',
+			slot_r_hand_str = 'icons/mob/items/righthand_suits.dmi',
+			)
 	item_state = "armor"
 	desc = "The cells in our chest are rapidly shifting, ready to reform into material that can resemble most pieces of clothing."
 	origin_tech = list()
@@ -101,6 +109,10 @@ var/global/list/changeling_fabricated_clothing = list(
 /obj/item/clothing/shoes/chameleon/changeling
 	name = "malformed feet"
 	icon_state = "lingchameleon"
+	item_icons = list(
+			slot_l_hand_str = 'icons/mob/items/lefthand_shoes.dmi',
+			slot_r_hand_str = 'icons/mob/items/righthand_shoes.dmi',
+			)
 	item_state = "black"
 	desc = "Our feet are overlayed with another layer of flesh and bone on top.  We can reform our feet to resemble various boots and shoes."
 	origin_tech = list()
@@ -123,6 +135,10 @@ var/global/list/changeling_fabricated_clothing = list(
 /obj/item/weapon/storage/backpack/chameleon/changeling
 	name = "backpack"
 	icon_state = "backpack"
+	item_icons = list(
+			slot_l_hand_str = 'icons/mob/items/lefthand_storage.dmi',
+			slot_r_hand_str = 'icons/mob/items/righthand_storage.dmi',
+			)
 	item_state = "backpack"
 	desc = "A large pouch imbedded in our back, it can shift form to resemble many common backpacks that other biologicals are fond of using."
 	origin_tech = list()
@@ -147,6 +163,10 @@ var/global/list/changeling_fabricated_clothing = list(
 /obj/item/clothing/gloves/chameleon/changeling
 	name = "malformed hands"
 	icon_state = "lingchameleon"
+	item_icons = list(
+			slot_l_hand_str = 'icons/mob/items/lefthand_gloves.dmi',
+			slot_r_hand_str = 'icons/mob/items/righthand_gloves.dmi',
+			)
 	item_state = "lingchameleon"
 	desc = "Our hands have a second layer of flesh on top.  We can reform our hands to resemble a large variety of fabrics and materials that biologicals \
 	tend to wear on their hands.  Remember that these won't protect your hands from harm."
@@ -171,6 +191,10 @@ var/global/list/changeling_fabricated_clothing = list(
 /obj/item/clothing/mask/chameleon/changeling
 	name = "chitin visor"
 	icon_state = "lingchameleon"
+	item_icons = list(
+			slot_l_hand_str = 'icons/mob/items/lefthand_masks.dmi',
+			slot_r_hand_str = 'icons/mob/items/righthand_masks.dmi',
+			)
 	item_state = "gas_alt"
 	desc = "A transparent visor of brittle chitin covers our face.  We can reform it to resemble various masks that biologicals use.  It can also utilize internal \
 	tanks.."
@@ -217,6 +241,10 @@ var/global/list/changeling_fabricated_clothing = list(
 	name = "waist pouch"
 	desc = "We can store objects in this, as well as shift it's appearance, so that it resembles various common belts."
 	icon_state = "lingchameleon"
+	item_icons = list(
+			slot_l_hand_str = 'icons/mob/items/lefthand_storage.dmi',
+			slot_r_hand_str = 'icons/mob/items/righthand_storage.dmi',
+			)
 	item_state = "utility"
 	origin_tech = list()
 	canremove = 0

code/game/gamemodes/cult/cult_items.dm

@@ -2,7 +2,6 @@
 	name = "cult blade"
 	desc = "An arcane weapon wielded by the followers of Nar-Sie."
 	icon_state = "cultblade"
-	item_state = "cultblade"
 	w_class = 4
 	force = 30
 	throwforce = 10
@@ -72,7 +71,6 @@
 	name = "cult robes"
 	desc = "A set of armored robes worn by the followers of Nar-Sie."
 	icon_state = "cultrobes"
-	item_state = "cultrobes"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	allowed = list(/obj/item/weapon/book/tome,/obj/item/weapon/melee/cultblade)
 	armor = list(melee = 50, bullet = 30, laser = 50, energy = 20, bomb = 25, bio = 10, rad = 0)
@@ -84,13 +82,12 @@
 
 /obj/item/clothing/suit/cultrobes/alt
 	icon_state = "cultrobesalt"
-	item_state = "cultrobesalt"
+	item_state = "cultrobes"
 
 /obj/item/clothing/suit/cultrobes/magusred
 	name = "magus robes"
 	desc = "A set of armored robes worn by the followers of Nar-Sie."
 	icon_state = "magusred"
-	item_state = "magusred"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
 
@@ -107,7 +104,6 @@
 /obj/item/clothing/suit/space/cult
 	name = "cult armour"
 	icon_state = "cult_armour"
-	item_state = "cult_armour"
 	desc = "A bulky suit of armour, bristling with spikes. It looks space-worthy."
 	w_class = 3
 	allowed = list(/obj/item/weapon/book/tome,/obj/item/weapon/melee/cultblade,/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/suit_cooling_unit)

code/game/machinery/computer3/laptop.dm

@@ -22,7 +22,6 @@
 	desc		= "A clamshell portable computer.  It is closed."
 	icon		= 'icons/obj/computer3.dmi'
 	icon_state	=  "laptop-closed"
-	item_state	=  "laptop-inhand"
 	pixel_x		= 2
 	pixel_y		= -3
 	w_class		= 3

code/game/objects/items/devices/flashlight.dm

@@ -3,7 +3,6 @@
 	desc = "A hand-held emergency light."
 	icon = 'icons/obj/lighting.dmi'
 	icon_state = "flashlight"
-	item_state = "flashlight"
 	w_class = 2
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
@@ -89,7 +88,7 @@
 	name = "penlight"
 	desc = "A pen-sized light, used by medical staff."
 	icon_state = "penlight"
-	item_state = ""
+	item_state = "pen"
 	flags = CONDUCT
 	slot_flags = SLOT_EARS
 	brightness_on = 2
@@ -99,7 +98,6 @@
 	name = "maglight"
 	desc = "A very, very heavy duty flashlight."
 	icon_state = "maglight"
-	item_state = "maglight"
 	force = 10
 	flags = CONDUCT
 	brightness_on = 4
@@ -113,7 +111,7 @@
 	name = "low-power flashlight"
 	desc = "A miniature lamp, that might be used by small robots."
 	icon_state = "penlight"
-	item_state = ""
+	item_state = null
 	flags = CONDUCT
 	brightness_on = 2
 	w_class = 1
@@ -124,7 +122,6 @@
 	name = "desk lamp"
 	desc = "A desk lamp with an adjustable mount."
 	icon_state = "lamp"
-	item_state = "lamp"
 	brightness_on = 5
 	w_class = 4
 	flags = CONDUCT
@@ -136,7 +133,6 @@
 /obj/item/device/flashlight/lamp/green
 	desc = "A classic green-shaded desk lamp."
 	icon_state = "lampgreen"
-	item_state = "lampgreen"
 	brightness_on = 5
 	light_color = "#FFC58F"
 

code/game/objects/items/devices/floor_painter.dm

@@ -2,7 +2,6 @@
 	name = "floor painter"
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "labeler1"
-	item_state = "flight"
 
 	var/decal =        "remove all decals"
 	var/paint_dir =    "precise"

code/game/objects/items/devices/locker_painter.dm

@@ -2,7 +2,6 @@
 	name = "closet painter"
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "labeler1"
-	item_state = "flight"
 
 	var/colour =        "plain"
 	var/colour_secure = "plain"

code/game/objects/items/devices/pipe_painter.dm

@@ -2,7 +2,6 @@
 	name = "pipe painter"
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "labeler1"
-	item_state = "flight"
 	var/list/modes
 	var/mode
 

code/game/objects/items/devices/radio/electropack.dm

@@ -2,6 +2,10 @@
 	name = "electropack"
 	desc = "Dance my monkeys! DANCE!!!"
 	icon_state = "electropack0"
+	item_icons = list(
+			slot_l_hand_str = 'icons/mob/items/lefthand_storage.dmi',
+			slot_r_hand_str = 'icons/mob/items/righthand_storage.dmi',
+			)
 	item_state = "electropack"
 	frequency = 1449
 	flags = CONDUCT

code/game/objects/items/devices/radio/encryptionkey.dm

@@ -4,7 +4,6 @@
 	desc = "An encryption key for a radio headset. Contains cypherkeys."
 	icon = 'icons/obj/radio.dmi'
 	icon_state = "cypherkey"
-	item_state = ""
 	w_class = 1
 	slot_flags = SLOT_EARS
 	var/translate_binary = 0

code/game/objects/items/devices/radio/headset.dm

@@ -3,7 +3,6 @@
 	desc = "An updated, modular intercom that fits over the head. Takes encryption keys"
 	var/radio_desc = ""
 	icon_state = "headset"
-	item_state = "headset"
 	matter = list(DEFAULT_WALL_MATERIAL = 75)
 	subspace_transmission = 1
 	canhear_range = 0 // can't hear headsets from very far away
@@ -71,7 +70,7 @@
 
 /obj/item/device/radio/headset/syndicate/alt
 	icon_state = "syndie_headset"
-	item_state = "syndie_headset"
+	item_state = "headset"
 	origin_tech = list(TECH_ILLEGAL = 3)
 	syndie = 1
 	ks1type = /obj/item/device/encryptionkey/syndicate
@@ -91,7 +90,7 @@
 	name = "security bowman headset"
 	desc = "This is used by your elite security force."
 	icon_state = "sec_headset_alt"
-	item_state = "sec_headset_alt"
+	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/headset_sec
 
 /obj/item/device/radio/headset/headset_eng
@@ -105,7 +104,7 @@
 	name = "engineering bowman headset"
 	desc = "When the engineers wish to chat like girls."
 	icon_state = "eng_headset_alt"
-	item_state = "eng_headset_alt"
+	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/headset_eng
 
 /obj/item/device/radio/headset/headset_rob
@@ -126,7 +125,7 @@
 	name = "medical bowman headset"
 	desc = "A headset for the trained staff of the medbay."
 	icon_state = "med_headset_alt"
-	item_state = "med_headset_alt"
+	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/headset_med
 
 /obj/item/device/radio/headset/headset_sci
@@ -154,7 +153,7 @@
 	name = "command bowman headset"
 	desc = "A headset with a commanding channel."
 	icon_state = "com_headset_alt"
-	item_state = "com_headset_alt"
+	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/headset_com
 
 
@@ -169,7 +168,7 @@
 	name = "captain's bowman headset"
 	desc = "The headset of the boss."
 	icon_state = "com_headset_alt"
-	item_state = "com_headset_alt"
+	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/heads/captain
 
 /obj/item/device/radio/headset/heads/ai_integrated //No need to care about icons, it should be hidden inside the AI anyway.
@@ -198,7 +197,7 @@
 	name = "research director's bowman headset"
 	desc = "Headset of the researching God."
 	icon_state = "com_headset_alt"
-	item_state = "com_headset_alt"
+	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/heads/rd
 
 /obj/item/device/radio/headset/heads/hos
@@ -212,7 +211,7 @@
 	name = "head of security's bowman headset"
 	desc = "The headset of the man who protects your worthless lifes."
 	icon_state = "com_headset_alt"
-	item_state = "com_headset_alt"
+	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/heads/hos
 
 /obj/item/device/radio/headset/heads/ce
@@ -226,7 +225,7 @@
 	name = "chief engineer's bowman headset"
 	desc = "The headset of the guy who is in charge of morons"
 	icon_state = "com_headset_alt"
-	item_state = "com_headset_alt"
+	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/heads/ce
 
 /obj/item/device/radio/headset/heads/cmo
@@ -240,7 +239,7 @@
 	name = "chief medical officer's bowman headset"
 	desc = "The headset of the highly trained medical chief."
 	icon_state = "com_headset_alt"
-	item_state = "com_headset_alt"
+	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/heads/cmo
 
 /obj/item/device/radio/headset/heads/hop
@@ -254,7 +253,7 @@
 	name = "head of personnel's bowman headset"
 	desc = "The headset of the guy who will one day be captain."
 	icon_state = "com_headset_alt"
-	item_state = "com_headset_alt"
+	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/heads/hop
 /*
 /obj/item/device/radio/headset/headset_mine
@@ -275,7 +274,7 @@
 	name = "supply bowman headset"
 	desc = "A bowman headset used by the QM and his slaves."
 	icon_state = "cargo_headset_alt"
-	item_state = "cargo_headset_alt"
+	item_state = "headset"
 	ks2type = /obj/item/device/encryptionkey/headset_cargo
 
 /obj/item/device/radio/headset/headset_service
@@ -297,7 +296,7 @@
 	name = "emergency response team bowman headset"
 	desc = "The headset of the boss's boss."
 	icon_state = "com_headset_alt"
-	item_state = "com_headset_alt"
+	item_state = "headset"
 //	freerange = 1
 	ks2type = /obj/item/device/encryptionkey/ert
 

code/game/objects/items/devices/radio/radio.dm

@@ -25,7 +25,7 @@ var/global/list/default_medbay_channels = list(
 	name = "station bounced radio"
 	suffix = "\[3\]"
 	icon_state = "walkietalkie"
-	item_state = "walkietalkie"
+	item_state = "radio"
 
 	var/on = 1 // 0 for off
 	var/last_transmission

code/game/objects/items/devices/scanners.dm

@@ -13,7 +13,7 @@ REAGENT SCANNER
 	name = "health analyzer"
 	desc = "A hand-held body scanner able to distinguish vital signs of the subject."
 	icon_state = "health"
-	item_state = "analyzer"
+	item_state = "healthanalyzer"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throwforce = 3

code/game/objects/items/devices/violin.dm

@@ -5,7 +5,6 @@
 	desc = "A wooden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
 	icon = 'icons/obj/musician.dmi'
 	icon_state = "violin"
-	item_state = "violin"
 	force = 10
 	var/datum/song/song
 	var/playing = 0

code/game/objects/items/latexballoon.dm

@@ -2,6 +2,10 @@
 	name = "latex glove"
 	desc = "A latex glove, usually used as a balloon."
 	icon_state = "latexballon"
+	item_icons = list(
+			slot_l_hand_str = 'icons/mob/items/lefthand_gloves.dmi',
+			slot_r_hand_str = 'icons/mob/items/righthand_gloves.dmi',
+			)
 	item_state = "lgloves"
 	force = 0
 	throwforce = 0

code/game/objects/items/toys.dm

@@ -34,7 +34,6 @@
 	desc = "A translucent balloon. There's nothing in it."
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "waterballoon-e"
-	item_state = "balloon-empty"
 
 /obj/item/toy/balloon/New()
 	var/datum/reagents/R = new/datum/reagents(10)
@@ -85,10 +84,8 @@
 /obj/item/toy/balloon/update_icon()
 	if(src.reagents.total_volume >= 1)
 		icon_state = "waterballoon"
-		item_state = "balloon"
 	else
 		icon_state = "waterballoon-e"
-		item_state = "balloon-empty"
 
 /obj/item/toy/syndicateballoon
 	name = "criminal balloon"
@@ -99,7 +96,6 @@
 	force = 0
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "syndballoon"
-	item_state = "syndballoon"
 	w_class = 4.0
 
 /obj/item/toy/nanotrasenballoon
@@ -111,7 +107,6 @@
 	force = 0
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "ntballoon"
-	item_state = "ntballoon"
 	w_class = 4.0
 
 /*
@@ -142,7 +137,6 @@
 	desc = "A weapon favored by many overactive children. Ages 8 and up."
 	icon = 'icons/obj/gun.dmi'
 	icon_state = "crossbow"
-	item_state = "crossbow"
 	item_icons = list(
 		icon_l_hand = 'icons/mob/items/lefthand_guns.dmi',
 		icon_r_hand = 'icons/mob/items/righthand_guns.dmi',
@@ -251,7 +245,6 @@
 	anchored = 1
 	density = 0
 
-
 /*
  * Toy swords
  */
@@ -260,7 +253,10 @@
 	desc = "A cheap, plastic replica of an energy sword. Realistic sounds! Ages 8 and up."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "sword0"
-	item_state = "sword0"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_melee.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi',
+		)
 	var/active = 0.0
 	w_class = 2.0
 	attack_verb = list("attacked", "struck", "hit")
@@ -271,13 +267,11 @@
 			user << "<span class='notice'>You extend the plastic blade with a quick flick of your wrist.</span>"
 			playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
 			src.icon_state = "swordblue"
-			src.item_state = "swordblue"
 			src.w_class = 4
 		else
 			user << "<span class='notice'>You push the plastic blade back down into the handle.</span>"
 			playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
 			src.icon_state = "sword0"
-			src.item_state = "sword0"
 			src.w_class = 2
 
 		if(istype(user,/mob/living/carbon/human))
@@ -293,7 +287,10 @@
 	desc = "Woefully underpowered in D20."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "katana"
-	item_state = "katana"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_material.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_material.dmi',
+		)
 	flags = CONDUCT
 	slot_flags = SLOT_BELT | SLOT_BACK
 	force = 5
@@ -863,7 +860,10 @@
 	desc = "An arcane weapon (made of foam) wielded by the followers of the hit Saturday morning cartoon \"King Nursee and the Acolytes of Heroism\"."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "cultblade"
-	item_state = "cultblade"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_melee.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi',
+		)
 	w_class = 4
 	attack_verb = list("attacked", "slashed", "stabbed", "poked")
 
@@ -883,7 +883,6 @@
 	name = "inflatable duck"
 	desc = "No bother to sink or swim when you can just float!"
 	icon_state = "inflatable"
-	item_state = "inflatable"
 	icon = 'icons/obj/clothing/belts.dmi'
 	slot_flags = SLOT_BELT
 

code/game/objects/items/weapons/candle.dm

@@ -3,7 +3,6 @@
 	desc = "a small pillar candle. Its specially-formulated fuel-oxidizer wax mixture allows continued combustion in airless environments."
 	icon = 'icons/obj/candle.dmi'
 	icon_state = "candle1"
-	item_state = "candle1"
 	w_class = 1
 	light_color = "#E09D37"
 	var/wax = 2000

code/game/objects/items/weapons/cosmetics.dm

@@ -75,7 +75,6 @@
 	slot_flags = SLOT_EARS
 	icon = 'icons/obj/items.dmi'
 	icon_state = "purplecomb"
-	item_state = "purplecomb"
 
 /obj/item/weapon/haircomb/attack_self(mob/living/user)
 	user.visible_message(text("<span class='notice'>[] uses [] to comb their hair with incredible style and sophistication. What a [].</span>", user, src, user.gender == FEMALE ? "lady" : "guy"))

code/game/objects/items/weapons/flamethrower.dm

@@ -3,6 +3,10 @@
 	desc = "You are a firestarter!"
 	icon = 'icons/obj/flamethrower.dmi'
 	icon_state = "flamethrowerbase"
+	item_icons = list(
+			slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi',
+			slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi',
+			)
 	item_state = "flamethrower_0"
 	flags = CONDUCT
 	force = 3.0

code/game/objects/items/weapons/grenades/anti_photon_grenade.dm

@@ -3,7 +3,6 @@
 	name = "photon disruption grenade"
 	icon = 'icons/obj/grenade.dmi'
 	icon_state = "emp"
-	item_state = "emp"
 	det_time = 20
 	origin_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 4)
 

code/game/objects/items/weapons/grenades/emgrenade.dm

@@ -14,7 +14,6 @@
 	name = "low yield emp grenade"
 	desc = "A weaker variant of the EMP grenade"
 	icon_state = "lyemp"
-	item_state = "lyempgrenade"
 	origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 3)
 
 	prime()

code/game/objects/items/weapons/grenades/explosive.dm

@@ -4,7 +4,6 @@
 	//icon = 'icons/obj/grenade.dmi'
 	//det_time = 50
 	//icon_state = "frggrenade"
-	//item_state = "frggrenade"
 	//origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 3)
 
 //obj/item/weapon/grenade/explosive/prime()
@@ -31,7 +30,7 @@
 	name = "fragmentation grenade"
 	desc = "A fragmentation grenade, optimized for harming personnel without causing massive structural damage."
 	icon_state = "frggrenade"
-	item_state = "frggrenade"
+	item_state = "grenade"
 
 	var/num_fragments = 50  //total number of fragments produced by the grenade
 	var/fragment_damage = 10

code/game/objects/items/weapons/material/bats.dm

@@ -3,7 +3,6 @@
 	desc = "HOME RUN!"
 	icon_state = "metalbat0"
 	base_icon = "metalbat"
-	item_state = "metalbat"
 	throwforce = 7
 	attack_verb = list("smashed", "beaten", "slammed", "smacked", "struck", "battered", "bonked")
 	hitsound = 'sound/weapons/genhit3.ogg'

code/game/objects/items/weapons/material/knives.dm

@@ -72,7 +72,6 @@
 	name = "meat hook"
 	desc = "A sharp, metal hook what sticks into things."
 	icon_state = "hook_knife"
-	item_state = "hook_knife"
 
 /obj/item/weapon/material/knife/ritual
 	name = "ritual knife"

code/game/objects/items/weapons/material/material_weapons.dm

@@ -10,6 +10,10 @@
 	w_class = 3
 	sharp = 0
 	edge = 0
+	item_icons = list(
+			slot_l_hand_str = 'icons/mob/items/lefthand_material.dmi',
+			slot_r_hand_str = 'icons/mob/items/righthand_material.dmi',
+			)
 
 	var/applies_material_colour = 1
 	var/unbreakable

code/game/objects/items/weapons/material/misc.dm

@@ -80,7 +80,6 @@
 	desc = "It's used for removing weeds or scratching your back."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "hoe"
-	item_state = "hoe"
 	force_divisor = 0.25 // 5 with weight 20 (steel)
 	thrown_force_divisor = 0.25 // as above
 	w_class = 2

code/game/objects/items/weapons/material/swords.dm

@@ -2,7 +2,6 @@
 	name = "claymore"
 	desc = "What are you standing around staring at this for? Get to killing!"
 	icon_state = "claymore"
-	item_state = "claymore"
 	slot_flags = SLOT_BELT
 	force_divisor = 0.7 // 42 when wielded with hardnes 60 (steel)
 	thrown_force_divisor = 0.5 // 10 when thrown with weight 20 (steel)
@@ -27,7 +26,6 @@
 	name = "katana"
 	desc = "Woefully underpowered in D20. This one looks pretty sharp."
 	icon_state = "katana"
-	item_state = "katana"
 	slot_flags = SLOT_BELT | SLOT_BACK
 
 /obj/item/weapon/material/sword/katana/suicide_act(mob/user)

code/game/objects/items/weapons/melee/misc.dm

@@ -2,7 +2,6 @@
 	name = "chain of command"
 	desc = "A tool used by great men to placate the frothing masses."
 	icon_state = "chain"
-	item_state = "chain"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	force = 10

code/game/objects/items/weapons/shields.dm

@@ -32,6 +32,10 @@
 /obj/item/weapon/shield
 	name = "shield"
 	var/base_block_chance = 50
+	item_icons = list(
+				slot_l_hand_str = 'icons/mob/items/lefthand_melee.dmi',
+				slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi',
+				)
 
 /obj/item/weapon/shield/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
 	if(user.incapacitated())

code/game/objects/items/weapons/storage/backpack.dm

@@ -1,4 +1,3 @@
-
 /*
  * Backpack
  */
@@ -6,17 +5,7 @@
 /obj/item/weapon/storage/backpack
 	name = "backpack"
 	desc = "You wear this on your back and put items into it."
-	item_icons = list(
-		slot_l_hand_str = 'icons/mob/items/lefthand_backpacks.dmi',
-		slot_r_hand_str = 'icons/mob/items/righthand_backpacks.dmi',
-		)
 	icon_state = "backpack"
-	item_state = null
-	//most backpacks use the default backpack state for inhand overlays
-	item_state_slots = list(
-		slot_l_hand_str = "backpack",
-		slot_r_hand_str = "backpack",
-		)
 	sprite_sheets = list(
 		"Teshari" = 'icons/mob/species/seromi/back.dmi'
 		)
@@ -91,31 +80,26 @@
 	name = "Giggles von Honkerton"
 	desc = "It's a backpack made by Honk! Co."
 	icon_state = "clownpack"
-	item_state_slots = null
 
 /obj/item/weapon/storage/backpack/medic
 	name = "medical backpack"
 	desc = "It's a backpack especially designed for use in a sterile environment."
 	icon_state = "medicalpack"
-	item_state_slots = null
 
 /obj/item/weapon/storage/backpack/security
 	name = "security backpack"
 	desc = "It's a very robust backpack."
 	icon_state = "securitypack"
-	item_state_slots = null
 
 /obj/item/weapon/storage/backpack/captain
 	name = "captain's backpack"
 	desc = "It's a special backpack made exclusively for officers."
 	icon_state = "captainpack"
-	item_state_slots = null
 
 /obj/item/weapon/storage/backpack/industrial
 	name = "industrial backpack"
 	desc = "It's a tough backpack for the daily grind of station life."
 	icon_state = "engiepack"
-	item_state_slots = null
 
 /obj/item/weapon/storage/backpack/toxins
 	name = "laboratory backpack"
@@ -150,10 +134,6 @@
 	name = "dufflebag"
 	desc = "A large dufflebag for holding extra things."
 	icon_state = "duffle"
-	item_state_slots = list(
-		slot_l_hand_str = "duffle",
-		slot_r_hand_str = "duffle",
-		)
 	slowdown = 1
 	max_storage_space = 36
 
@@ -161,74 +141,42 @@
 	name = "black dufflebag"
 	desc = "A large dufflebag for holding extra tactical supplies."
 	icon_state = "duffle_syndie"
-	item_state_slots = list(
-		slot_l_hand_str = "duffle_syndiemed",
-		slot_r_hand_str = "duffle_syndiemed",
-		)
 	slowdown = 0
 
 /obj/item/weapon/storage/backpack/dufflebag/syndie/med
 	name = "medical dufflebag"
 	desc = "A large dufflebag for holding extra tactical medical supplies."
 	icon_state = "duffle_syndiemed"
-	item_state_slots = list(
-		slot_l_hand_str = "duffle_syndiemed",
-		slot_r_hand_str = "duffle_syndiemed",
-		)
 
 /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo
 	name = "ammunition dufflebag"
 	desc = "A large dufflebag for holding extra weapons ammunition and supplies."
 	icon_state = "duffle_syndieammo"
-	item_state_slots = list(
-		slot_l_hand_str = "duffle_syndieammo",
-		slot_r_hand_str = "duffle_syndieammo",
-		)
 
 /obj/item/weapon/storage/backpack/dufflebag/captain
 	name = "captain's dufflebag"
 	desc = "A large dufflebag for holding extra captainly goods."
 	icon_state = "duffle_captain"
-	item_state_slots = list(
-		slot_l_hand_str = "duffle_captain",
-		slot_r_hand_str = "duffle_captain",
-		)
 
 /obj/item/weapon/storage/backpack/dufflebag/med
 	name = "medical dufflebag"
 	desc = "A large dufflebag for holding extra medical supplies."
 	icon_state = "duffle_med"
-	item_state_slots = list(
-		slot_l_hand_str = "duffle_med",
-		slot_r_hand_str = "duffle_med",
-		)
 
 /obj/item/weapon/storage/backpack/dufflebag/emt
 	name = "EMT dufflebag"
 	desc = "A large dufflebag for holding extra medical supplies. This one has reflective stripes!"
 	icon_state = "duffle_emt"
-	item_state_slots = list(
-		slot_l_hand_str = "duffle_emt",
-		slot_r_hand_str = "duffle_emt",
-		)
 
 /obj/item/weapon/storage/backpack/dufflebag/sec
 	name = "security dufflebag"
 	desc = "A large dufflebag for holding extra security supplies and ammunition."
 	icon_state = "duffle_sec"
-	item_state_slots = list(
-		slot_l_hand_str = "duffle_sec",
-		slot_r_hand_str = "duffle_sec",
-		)
 
 /obj/item/weapon/storage/backpack/dufflebag/eng
 	name = "industrial dufflebag"
 	desc = "A large dufflebag for holding extra tools and supplies."
 	icon_state = "duffle_eng"
-	item_state_slots = list(
-		slot_l_hand_str = "duffle_eng",
-		slot_r_hand_str = "duffle_eng",
-		)
 
 /*
  * Satchel Types
@@ -248,53 +196,49 @@
 	name = "satchel"
 	desc = "A trendy looking satchel."
 	icon_state = "satchel-norm"
+	item_state = "briefcase"
 
 /obj/item/weapon/storage/backpack/satchel/eng
 	name = "industrial satchel"
 	desc = "A tough satchel with extra pockets."
 	icon_state = "satchel-eng"
-	item_state_slots = list(
-		slot_l_hand_str = "engiepack",
-		slot_r_hand_str = "engiepack",
-		)
+	item_state = "engiepack"
 
 /obj/item/weapon/storage/backpack/satchel/med
 	name = "medical satchel"
 	desc = "A sterile satchel used in medical departments."
 	icon_state = "satchel-med"
-	item_state_slots = list(
-		slot_l_hand_str = "medicalpack",
-		slot_r_hand_str = "medicalpack",
-		)
+	item_state = "medicalpack"
 
 /obj/item/weapon/storage/backpack/satchel/vir
 	name = "virologist satchel"
 	desc = "A sterile satchel with virologist colours."
 	icon_state = "satchel-vir"
+	item_state = "medicalpack"
 
 /obj/item/weapon/storage/backpack/satchel/chem
 	name = "chemist satchel"
 	desc = "A sterile satchel with chemist colours."
 	icon_state = "satchel-chem"
+	item_state = "medicalpack"
 
 /obj/item/weapon/storage/backpack/satchel/gen
 	name = "geneticist satchel"
 	desc = "A sterile satchel with geneticist colours."
 	icon_state = "satchel-gen"
+	item_state = "medicalpack"
 
 /obj/item/weapon/storage/backpack/satchel/tox
 	name = "scientist satchel"
 	desc = "Useful for holding research materials."
 	icon_state = "satchel-tox"
+	item_state = "medicalpack"
 
 /obj/item/weapon/storage/backpack/satchel/sec
 	name = "security satchel"
 	desc = "A robust satchel for security related needs."
 	icon_state = "satchel-sec"
-	item_state_slots = list(
-		slot_l_hand_str = "securitypack",
-		slot_r_hand_str = "securitypack",
-		)
+	item_state = "securitypack"
 
 /obj/item/weapon/storage/backpack/satchel/hyd
 	name = "hydroponics satchel"
@@ -305,20 +249,14 @@
 	name = "captain's satchel"
 	desc = "An exclusive satchel for officers."
 	icon_state = "satchel-cap"
-	item_state_slots = list(
-		slot_l_hand_str = "satchel-cap",
-		slot_r_hand_str = "satchel-cap",
-		)
+	item_state = "captainpack"
 
 //ERT backpacks.
 /obj/item/weapon/storage/backpack/ert
 	name = "emergency response team backpack"
 	desc = "A spacious backpack with lots of pockets, used by members of the Emergency Response Team."
 	icon_state = "ert_commander"
-	item_state_slots = list(
-		slot_l_hand_str = "securitypack",
-		slot_r_hand_str = "securitypack",
-		)
+	item_state = "securitypack"
 
 //Commander
 /obj/item/weapon/storage/backpack/ert/commander

code/game/objects/items/weapons/storage/bags.dm

@@ -56,7 +56,6 @@
 	desc = "It's a very flimsy, very noisy alternative to a bag."
 	icon = 'icons/obj/trash.dmi'
 	icon_state = "plasticbag"
-	item_state = "plasticbag"
 
 	w_class = 4
 	max_w_class = 2

code/game/objects/items/weapons/storage/belt.dm

@@ -3,7 +3,6 @@
 	desc = "Can hold various things."
 	icon = 'icons/obj/clothing/belts.dmi'
 	icon_state = "utilitybelt"
-	item_state = "utility"
 	storage_slots = 7
 	max_storage_space = 28 //This should ensure belts always have enough room to store whatever.
 	max_w_class = 3
@@ -33,7 +32,6 @@
 	name = "tool-belt" //Carn: utility belt is nicer, but it bamboozles the text parsing.
 	desc = "Can hold various tools."
 	icon_state = "utilitybelt"
-	item_state = "utility"
 	can_hold = list(
 		///obj/item/weapon/combitool,
 		/obj/item/weapon/crowbar,
@@ -87,7 +85,6 @@
 	name = "medical belt"
 	desc = "Can hold various medical equipment."
 	icon_state = "medicalbelt"
-	item_state = "medical"
 	can_hold = list(
 		/obj/item/device/healthanalyzer,
 		/obj/item/weapon/dnainjector,
@@ -119,13 +116,11 @@
 	name = "EMT utility belt"
 	desc = "A sturdy black webbing belt with attached pouches."
 	icon_state = "emsbelt"
-	item_state = "emsbelt"
 
 /obj/item/weapon/storage/belt/security
 	name = "security belt"
 	desc = "Can hold security gear like handcuffs and flashes."
 	icon_state = "securitybelt"
-	item_state = "security"
 	max_w_class = 3
 	can_hold = list(
 		/obj/item/weapon/grenade,
@@ -156,7 +151,6 @@
 	name = "forensic utility belt"
 	desc = "A belt for holding forensics equipment."
 	icon_state = "securitybelt"
-	item_state = "security"
 	storage_slots = 7
 	max_w_class = 3
 	can_hold = list(
@@ -197,7 +191,6 @@
 	name = "soul stone belt"
 	desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away"
 	icon_state = "soulstonebelt"
-	item_state = "soulstonebelt"
 	storage_slots = 6
 	can_hold = list(
 		/obj/item/device/soulstone
@@ -217,7 +210,6 @@
 	name = "championship belt"
 	desc = "Proves to the world that you are the strongest!"
 	icon_state = "championbelt"
-	item_state = "champion"
 	storage_slots = 1
 	can_hold = list(
 		"/obj/item/clothing/mask/luchador"
@@ -227,7 +219,6 @@
 	name = "combat belt"
 	desc = "Can hold security gear like handcuffs and flashes, with more pouches for more storage."
 	icon_state = "swatbelt"
-	item_state = "swatbelt"
 	storage_slots = 9
 	max_w_class = 3
 	max_storage_space = 28
@@ -236,13 +227,11 @@
 	name = "combat belt"
 	desc = "Can hold security gear like handcuffs and flashes, with more pouches for more storage."
 	icon_state = "bandolier"
-	item_state = "bandolier"
 
 /obj/item/weapon/storage/belt/janitor
 	name = "janitorial belt"
 	desc = "A belt used to hold most janitorial supplies."
 	icon_state = "janibelt"
-	item_state = "janibelt"
 	storage_slots = 7
 	max_w_class = 3
 	can_hold = list(

code/game/objects/items/weapons/storage/boxes.dm

@@ -468,7 +468,6 @@
 	desc = "A small box of 'Space-Proof' premium matches."
 	icon = 'icons/obj/cigarettes.dmi'
 	icon_state = "matchbox"
-	item_state = "zippo"
 	w_class = 1
 	slot_flags = SLOT_BELT
 	can_hold = list(/obj/item/weapon/flame/match)

code/game/objects/items/weapons/storage/briefcase.dm

@@ -2,7 +2,6 @@
 	name = "briefcase"
 	desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional."
 	icon_state = "briefcase"
-	item_state = "briefcase"
 	flags = CONDUCT
 	force = 8.0
 	throw_speed = 1

code/game/objects/items/weapons/storage/fancy.dm

@@ -187,13 +187,11 @@
 	name = "\improper DromedaryCo packet"
 	desc = "A packet of six imported DromedaryCo cancer sticks. A label on the packaging reads, \"Wouldn't a slow death make a change?\""
 	icon_state = "Dpacket"
-	item_state = "Dpacket"
 
 /obj/item/weapon/storage/fancy/cigarettes/killthroat
 	name = "\improper AcmeCo packet"
 	desc = "A packet of six AcmeCo cigarettes. For those who somehow want to obtain the record for the most amount of cancerous tumors."
 	icon_state = "Bpacket"
-	item_state = "Bpacket" //Doesn't have an inhand state, but neither does dromedary, so, ya know..
 
 	New()
 		..()
@@ -205,37 +203,31 @@
 	name = "\improper pack of Lucky Stars"
 	desc = "A mellow blend made from synthetic, pod-grown tobacco. The commercial jingle is guaranteed to get stuck in your head."
 	icon_state = "LSpacket"
-	item_state = "Dpacket" //I actually don't mind cig packs not showing up in the hand. whotf doesn't just keep them in their pockets/coats //
 
 /obj/item/weapon/storage/fancy/cigarettes/jerichos
 	name = "\improper pack of Jerichos"
 	desc = "Typically seen dangling from the lips of Martian soldiers and border world hustlers. Tastes like hickory smoke, feels like warm liquid death down your lungs."
 	icon_state = "Jpacket"
-	item_state = "Dpacket"
 
 /obj/item/weapon/storage/fancy/cigarettes/menthols
 	name = "\improper pack of Temperamento Menthols"
 	desc = "With a sharp and natural organic menthol flavor, these Temperamentos are a favorite of NDV crews. Hardly anyone knows they make 'em in non-menthol!"
 	icon_state = "TMpacket"
-	item_state = "Dpacket"
 
 /obj/item/weapon/storage/fancy/cigarettes/carcinomas
 	name = "\improper pack of Carcinoma Angels"
 	desc = "This unknown brand was slated for the chopping block, until they were publicly endorsed by an old Earthling gonzo journalist. The rest is history. They sell a variety for cats, too."
 	icon_state = "CApacket"
-	item_state = "Dpacket"
 
 /obj/item/weapon/storage/fancy/cigarettes/professionals
 	name = "\improper pack of Professional 120s"
 	desc = "Let's face it - if you're smoking these, you're either trying to look upper-class or you're 80 years old. That's the only excuse. They taste disgusting, too."
 	icon_state = "P100packet"
-	item_state = "Dpacket"
 
 /obj/item/weapon/storage/fancy/cigar
 	name = "cigar case"
 	desc = "A case for holding your cigars when you are not smoking them."
 	icon_state = "cigarcase"
-	item_state = "cigarcase"
 	icon = 'icons/obj/cigarettes.dmi'
 	w_class = 1
 	throwforce = 2

code/game/objects/items/weapons/storage/storage.dm

@@ -8,6 +8,10 @@
 /obj/item/weapon/storage
 	name = "storage"
 	icon = 'icons/obj/storage.dmi'
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_storage.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_storage.dmi',
+		)
 	w_class = 3
 	show_messages = 1
 

code/game/objects/items/weapons/swords_axes_etc.dm

@@ -2,6 +2,7 @@
  * Contains:
  *		Sword
  *		Classic Baton
+ *		Telescopic Baton
  */
 
 /*
@@ -34,7 +35,6 @@
 	desc = "A compact yet rebalanced personal defense weapon. Can be concealed when folded."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "telebaton0"
-	item_state = "telebaton0"
 	slot_flags = SLOT_BELT
 	w_class = 2
 	force = 3
@@ -48,7 +48,6 @@
 		"<span class='warning'>You extend the baton.</span>",\
 		"You hear an ominous click.")
 		icon_state = "telebaton1"
-		item_state = "telebaton1"
 		w_class = 3
 		force = 15//quite robust
 		attack_verb = list("smacked", "struck", "slapped")
@@ -57,7 +56,6 @@
 		"<span class='notice'>You collapse the baton.</span>",\
 		"You hear a click.")
 		icon_state = "telebaton0"
-		item_state = "telebaton0"
 		w_class = 2
 		force = 3//not so robust now
 		attack_verb = list("hit", "punched")

code/game/objects/items/weapons/syndie.dm

@@ -8,7 +8,7 @@
 
 /obj/item/weapon/syndie/c4explosive
 	icon_state = "c-4small_0"
-	item_state = "c-4small"
+	item_state = "radio"
 	name = "normal-sized package"
 	desc = "A small wrapped package."
 	w_class = 3
@@ -18,7 +18,7 @@
 
 /obj/item/weapon/syndie/c4explosive/heavy
 	icon_state = "c-4large_0"
-	item_state = "c-4large"
+	item_state = "radio"
 	desc = "A mysterious package, it's quite heavy."
 	power = 2
 	size = "large"
@@ -52,7 +52,7 @@
 
 /obj/item/weapon/syndie/c4detonator
 	icon_state = "c-4detonator_0"
-	item_state = "c-4detonator"
+	item_state = "zippo"
 	name = "\improper Zippo lighter"  /*Sneaky, thanks Dreyfus.*/
 	desc = "The zippo."
 	w_class = 1

code/game/objects/items/weapons/tanks/jetpack.dm

@@ -6,6 +6,10 @@
 	icon_state = "jetpack"
 	gauge_icon = null
 	w_class = 4.0
+	item_icons = list(
+			slot_l_hand_str = 'icons/mob/items/lefthand_storage.dmi',
+			slot_r_hand_str = 'icons/mob/items/righthand_storage.dmi',
+			)
 	item_state = "jetpack"
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
 	var/datum/effect/effect/system/ion_trail_follow/ion_trail

code/game/objects/items/weapons/tanks/tank_types.dm

@@ -16,19 +16,16 @@
 	icon_state = "oxygen"
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
 
-
 	New()
 		..()
 		air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
 		return
 
-
 	examine(mob/user)
 		if(..(user, 0) && air_contents.gas["oxygen"] < 10)
 			user << text("<span class='warning'>The meter on \the [src] indicates you are almost out of oxygen!</span>")
 			//playsound(usr, 'sound/effects/alert.ogg', 50, 1)
 
-
 /obj/item/weapon/tank/oxygen/yellow
 	desc = "A tank of oxygen, this one is yellow."
 	icon_state = "oxygen_f"
@@ -37,7 +34,6 @@
 	desc = "A tank of oxygen, this one is red."
 	icon_state = "oxygen_fr"
 
-
 /*
  * Anesthetic
  */
@@ -64,7 +60,6 @@
 	desc = "Mixed anyone?"
 	icon_state = "oxygen"
 
-
 	examine(mob/user)
 		if(..(user, 0) && air_contents.gas["oxygen"] < 1 && loc==user)
 			user << "<span class='danger'>The meter on the [src.name] indicates you are almost out of air!</span>"
@@ -77,7 +72,6 @@
 
 	return
 	
-
 /*
  * Phoron
  */
@@ -89,7 +83,6 @@
 	flags = CONDUCT
 	slot_flags = null	//they have no straps!
 
-
 /obj/item/weapon/tank/phoron/New()
 	..()
 
@@ -124,14 +117,12 @@
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
 	volume = 2 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011)
 
-
 	New()
 		..()
 		src.air_contents.adjust_gas("oxygen", (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
 
 		return
 
-
 	examine(mob/user)
 		if(..(user, 0) && air_contents.gas["oxygen"] < 0.2 && loc==user)
 			user << text("<span class='danger'>The meter on the [src.name] indicates you are almost out of air!</span>")
@@ -157,7 +148,6 @@
 	icon_state = "oxygen_fr"
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
 
-
 /obj/item/weapon/tank/nitrogen/New()
 	..()
 

code/game/objects/items/weapons/weaponry.dm

@@ -1,4 +1,3 @@
-
 /obj/item/weapon/nullrod
 	name = "null rod"
 	desc = "A rod of pure obsidian, its very presence disrupts and dampens the powers of paranormal phenomenae."

code/game/objects/structures/bedsheet_bin.dm

@@ -9,7 +9,6 @@ LINEN BINS
 	desc = "A surprisingly soft linen bedsheet."
 	icon = 'icons/obj/items.dmi'
 	icon_state = "sheet"
-	item_state = "bedsheet"
 	slot_flags = SLOT_BACK
 	layer = 4.0
 	throwforce = 1
@@ -39,75 +38,59 @@ LINEN BINS
 
 /obj/item/weapon/bedsheet/blue
 	icon_state = "sheetblue"
-	item_state = "sheetblue"
 
 /obj/item/weapon/bedsheet/green
 	icon_state = "sheetgreen"
-	item_state = "sheetgreen"
 
 /obj/item/weapon/bedsheet/orange
 	icon_state = "sheetorange"
-	item_state = "sheetorange"
 
 /obj/item/weapon/bedsheet/purple
 	icon_state = "sheetpurple"
-	item_state = "sheetpurple"
 
 /obj/item/weapon/bedsheet/rainbow
 	icon_state = "sheetrainbow"
-	item_state = "sheetrainbow"
 
 /obj/item/weapon/bedsheet/red
 	icon_state = "sheetred"
-	item_state = "sheetred"
 
 /obj/item/weapon/bedsheet/yellow
 	icon_state = "sheetyellow"
-	item_state = "sheetyellow"
 
 /obj/item/weapon/bedsheet/mime
 	icon_state = "sheetmime"
-	item_state = "sheetmime"
 
 /obj/item/weapon/bedsheet/clown
 	icon_state = "sheetclown"
-	item_state = "sheetclown"
+	item_state = "sheetrainbow"
 
 /obj/item/weapon/bedsheet/captain
 	icon_state = "sheetcaptain"
-	item_state = "sheetcaptain"
 
 /obj/item/weapon/bedsheet/rd
 	icon_state = "sheetrd"
-	item_state = "sheetrd"
 
 /obj/item/weapon/bedsheet/medical
 	icon_state = "sheetmedical"
-	item_state = "sheetmedical"
 
 /obj/item/weapon/bedsheet/hos
 	icon_state = "sheethos"
-	item_state = "sheethos"
 
 /obj/item/weapon/bedsheet/hop
 	icon_state = "sheethop"
-	item_state = "sheethop"
 
 /obj/item/weapon/bedsheet/ce
 	icon_state = "sheetce"
-	item_state = "sheetce"
 
 /obj/item/weapon/bedsheet/brown
 	icon_state = "sheetbrown"
-	item_state = "sheetbrown"
 
 /obj/item/weapon/bedsheet/ian
 	icon_state = "sheetian"
-	item_state = "bedsheet"
 
 /obj/item/weapon/bedsheet/double
 	icon_state = "doublesheet"
-	item_state = "bedsheet"
+	item_state = "sheet"
 
 /obj/item/weapon/bedsheet/bluedouble
 	icon_state = "doublesheetblue"
@@ -125,54 +108,53 @@ LINEN BINS
 	icon_state = "doublesheetpurple"
 	item_state = "sheetpurple"
 
-/obj/item/weapon/bedsheet/doublerainbow //all the way across the sky.
+/obj/item/weapon/bedsheet/rainbowdouble //all the way across the sky.
 	icon_state = "doublesheetrainbow"
 	item_state = "sheetrainbow"
 
-/obj/item/weapon/bedsheet/doublered
+/obj/item/weapon/bedsheet/reddouble
 	icon_state = "doublesheetred"
 	item_state = "sheetred"
 
-/obj/item/weapon/bedsheet/doubleyellow
+/obj/item/weapon/bedsheet/yellowdouble
 	icon_state = "doublesheetyellow"
 	item_state = "sheetyellow"
 
-/obj/item/weapon/bedsheet/doublemime
+/obj/item/weapon/bedsheet/mimedouble
 	icon_state = "doublesheetmime"
 	item_state = "sheetmime"
 
-/obj/item/weapon/bedsheet/doubleclown
+/obj/item/weapon/bedsheet/clowndouble
 	icon_state = "doublesheetclown"
-	item_state = "sheetclown"
+	item_state = "sheetrainbow"
 
-/obj/item/weapon/bedsheet/doublecaptain
+/obj/item/weapon/bedsheet/captaindouble
 	icon_state = "doublesheetcaptain"
 	item_state = "sheetcaptain"
 
-/obj/item/weapon/bedsheet/doublerd
+/obj/item/weapon/bedsheet/rddouble
 	icon_state = "doublesheetrd"
 	item_state = "sheetrd"
 
-/obj/item/weapon/bedsheet/doublehos
+/obj/item/weapon/bedsheet/hosdouble
 	icon_state = "doublesheethos"
 	item_state = "sheethos"
 
-/obj/item/weapon/bedsheet/doublehop
+/obj/item/weapon/bedsheet/hopdouble
 	icon_state = "doublesheethop"
 	item_state = "sheethop"
 
-/obj/item/weapon/bedsheet/doublece
+/obj/item/weapon/bedsheet/cedouble
 	icon_state = "doublesheetce"
 	item_state = "sheetce"
 
-/obj/item/weapon/bedsheet/doublebrown
+/obj/item/weapon/bedsheet/browndouble
 	icon_state = "doublesheetbrown"
 	item_state = "sheetbrown"
 
-/obj/item/weapon/bedsheet/doubleian
+/obj/item/weapon/bedsheet/iandouble
 	icon_state = "doublesheetian"
-	item_state = "bedsheet"
-
+	item_state = "sheetian"
 
 /obj/structure/bedsheetbin
 	name = "linen bin"

code/game/objects/structures/watercloset.dm

@@ -328,9 +328,6 @@
 	desc = "Rubber ducky you're so fine, you make bathtime lots of fuuun. Rubber ducky I'm awfully fooooond of yooooouuuu~"	//thanks doohl
 	icon = 'icons/obj/watercloset.dmi'
 	icon_state = "rubberducky"
-	item_state = "rubberducky"
-
-
 
 /obj/structure/sink
 	name = "sink"
@@ -388,7 +385,6 @@
 	for(var/mob/V in viewers(src, null))
 		V.show_message("<span class='notice'>[user] washes their hands using \the [src].</span>")
 
-
 /obj/structure/sink/attackby(obj/item/O as obj, mob/user as mob)
 	if(busy)
 		user << "<span class='warning'>Someone's already washing here.</span>"
@@ -444,7 +440,6 @@
 		"<span class='notice'>[user] washes \a [I] using \the [src].</span>", \
 		"<span class='notice'>You wash \a [I] using \the [src].</span>")
 
-
 /obj/structure/sink/kitchen
 	name = "kitchen sink"
 	icon_state = "sink_alt"

code/game/objects/weapons.dm

@@ -7,3 +7,9 @@
 	spawn(0)
 		..()
 	return
+
+/obj/item/weapon/melee
+	item_icons = list(
+			slot_l_hand_str = 'icons/mob/items/lefthand_melee.dmi',
+			slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi',
+			)

code/modules/clothing/chameleon.dm

@@ -38,7 +38,6 @@
 //starts off as black
 	name = "black jumpsuit"
 	icon_state = "black"
-	item_state = "bl_suit"
 	worn_state = "black"
 	desc = "It's a plain jumpsuit. It seems to have a small dial on the wrist."
 	origin_tech = list(TECH_ILLEGAL = 3)
@@ -47,7 +46,7 @@
 /obj/item/clothing/under/chameleon/New()
 	..()
 	if(!clothing_choices)
-		var/blocked = list(src.type, /obj/item/clothing/under/cloud, /obj/item/clothing/under/gimmick)//Prevent infinite loops and bad jumpsuits.
+		var/blocked = list(src.type, /obj/item/clothing/under/gimmick)//Prevent infinite loops and bad jumpsuits.
 		clothing_choices = generate_chameleon_choices(/obj/item/clothing/under, blocked)
 
 /obj/item/clothing/under/chameleon/emp_act(severity)
@@ -112,7 +111,6 @@
 /obj/item/clothing/suit/chameleon
 	name = "armor"
 	icon_state = "armor"
-	item_state = "armor"
 	desc = "It appears to be a vest of standard armor, except this is embedded with a hidden holographic cloaker, allowing it to change it's appearance, but offering no protection.. It seems to have a small dial inside."
 	origin_tech = list(TECH_ILLEGAL = 3)
 	var/global/list/clothing_choices
@@ -147,7 +145,6 @@
 /obj/item/clothing/shoes/chameleon
 	name = "black shoes"
 	icon_state = "black"
-	item_state = "black"
 	desc = "They're comfy black shoes, with clever cloaking technology built in. It seems to have a small dial on the back of each shoe."
 	origin_tech = list(TECH_ILLEGAL = 3)
 	var/global/list/clothing_choices
@@ -162,7 +159,6 @@
 	name = "black shoes"
 	desc = "A pair of black shoes."
 	icon_state = "black"
-	item_state = "black"
 	update_icon()
 	update_clothing_icon()
 
@@ -183,7 +179,6 @@
 /obj/item/weapon/storage/backpack/chameleon
 	name = "backpack"
 	icon_state = "backpack"
-	item_state = "backpack"
 	desc = "A backpack outfitted with cloaking tech. It seems to have a small dial inside, kept away from the storage."
 	origin_tech = list(TECH_ILLEGAL = 3)
 	var/global/list/clothing_choices
@@ -198,7 +193,6 @@
 	name = "backpack"
 	desc = "You wear this on your back and put items into it."
 	icon_state = "backpack"
-	item_state = "backpack"
 	update_icon()
 	if (ismob(src.loc))
 		var/mob/M = src.loc
@@ -226,7 +220,6 @@
 /obj/item/clothing/gloves/chameleon
 	name = "black gloves"
 	icon_state = "black"
-	item_state = "bgloves"
 	desc = "It looks like a pair of gloves, but it seems to have a small dial inside."
 	origin_tech = list(TECH_ILLEGAL = 3)
 	var/global/list/clothing_choices
@@ -261,7 +254,6 @@
 /obj/item/clothing/mask/chameleon
 	name = "gas mask"
 	icon_state = "gas_alt"
-	item_state = "gas_alt"
 	desc = "It looks like a plain gask mask, but on closer inspection, it seems to have a small dial inside."
 	origin_tech = list(TECH_ILLEGAL = 3)
 	var/global/list/clothing_choices
@@ -333,7 +325,6 @@
 	desc = "Can hold various things.  It also has a small dial inside one of the pouches."
 	icon = 'icons/obj/clothing/belts.dmi'
 	icon_state = "utilitybelt"
-	item_state = "utility"
 	origin_tech = list(TECH_ILLEGAL = 3)
 	var/list/clothing_choices = list()
 
@@ -346,7 +337,6 @@
 	name = "belt"
 	desc = "Can hold various things."
 	icon_state = "utilitybelt"
-	item_state = "utility"
 	update_icon()
 	if(ismob(src.loc))
 		var/mob/M = src.loc

code/modules/clothing/clothing.dm

@@ -169,45 +169,13 @@
 		icon_state = O.icon_state
 		set_dir(O.dir)
 
-/obj/item/clothing/ears/earmuffs
-	name = "earmuffs"
-	desc = "Protects your hearing from loud noises, and quiet ones as well."
-	icon_state = "earmuffs"
-	item_state = "earmuffs"
-	slot_flags = SLOT_EARS | SLOT_TWOEARS
-	ear_protection = 2
-
-/obj/item/clothing/ears/earmuffs/headphones
-	name = "headphones"
-	desc = "Unce unce unce unce."
-	var/headphones_on = 0
-	icon_state = "headphones_off"
-	item_state = "headphones"
-	slot_flags = SLOT_EARS | SLOT_TWOEARS
-
-/obj/item/clothing/ears/earmuffs/headphones/verb/togglemusic()
-	set name = "Toggle Headphone Music"
-	set category = "Object"
-	set src in usr
-	if(!istype(usr, /mob/living)) return
-	if(usr.stat) return
-	
-	var/base_icon = copytext(icon_state,1,(length(icon_state) - 3 + headphones_on))
-
-	if(headphones_on)
-		icon_state = "[base_icon]_off"
-		headphones_on = 0
-		usr << "<span class='notice'>You turn the music off.</span>"
-	else
-		icon_state = "[base_icon]_on"
-		headphones_on = 1
-		usr << "<span class='notice'>You turn the music on.</span>"
-
-	update_clothing_icon()
-
 //Gloves
 /obj/item/clothing/gloves
 	name = "gloves"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_gloves.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_gloves.dmi',
+		)
 	gender = PLURAL //Carn: for grammarically correct text-parsing
 	w_class = 2.0
 	icon = 'icons/obj/clothing/gloves.dmi'
@@ -371,6 +339,10 @@
 /obj/item/clothing/mask
 	name = "mask"
 	icon = 'icons/obj/clothing/masks.dmi'
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_masks.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_masks.dmi',
+		)
 	body_parts_covered = HEAD
 	slot_flags = SLOT_MASK
 	body_parts_covered = FACE|EYES
@@ -395,6 +367,10 @@
 /obj/item/clothing/shoes
 	name = "shoes"
 	icon = 'icons/obj/clothing/shoes.dmi'
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_shoes.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_shoes.dmi',
+		)
 	desc = "Comfortable-looking shoes."
 	gender = PLURAL //Carn: for grammarically correct text-parsing
 	siemens_coefficient = 0.9
@@ -473,6 +449,10 @@
 //Suit
 /obj/item/clothing/suit
 	icon = 'icons/obj/clothing/suits.dmi'
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_suits.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_suits.dmi',
+		)
 	name = "suit"
 	var/fire_resist = T0C+100
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS

code/modules/clothing/ears/ears.dm

@@ -1,7 +1,45 @@
+/*
+	Earmuffs
+*/
+/obj/item/clothing/ears/earmuffs
+	name = "earmuffs"
+	desc = "Protects your hearing from loud noises, and quiet ones as well."
+	icon_state = "earmuffs"
+	item_state = "earmuffs"
+	slot_flags = SLOT_EARS | SLOT_TWOEARS
+	ear_protection = 2
+
+/obj/item/clothing/ears/earmuffs/headphones
+	name = "headphones"
+	desc = "Unce unce unce unce."
+	var/headphones_on = 0
+	icon_state = "headphones_off"
+	item_state = "headphones"
+	slot_flags = SLOT_EARS | SLOT_TWOEARS
+
+/obj/item/clothing/ears/earmuffs/headphones/verb/togglemusic()
+	set name = "Toggle Headphone Music"
+	set category = "Object"
+	set src in usr
+	if(!istype(usr, /mob/living)) return
+	if(usr.stat) return
+
+	var/base_icon = copytext(icon_state,1,(length(icon_state) - 3 + headphones_on))
+
+	if(headphones_on)
+		icon_state = "[base_icon]_off"
+		headphones_on = 0
+		usr << "<span class='notice'>You turn the music off.</span>"
+	else
+		icon_state = "[base_icon]_on"
+		headphones_on = 1
+		usr << "<span class='notice'>You turn the music on.</span>"
+
+	update_clothing_icon()
+
 /*
 	Skrell tentacle wear
 */
-
 /obj/item/clothing/ears/skrell
 	name = "skrell tentacle wear"
 	desc = "Some stuff worn by skrell to adorn their head tentacles."
@@ -14,132 +52,132 @@
 	name = "Gold headtail chains"
 	desc = "A delicate golden chain worn by female skrell to decorate their head tails."
 	icon_state = "skrell_chain"
-	item_state = "skrell_chain"
+	item_state = "egg5" //just a small colored item, remove item_state's if undesirable.
 
 /obj/item/clothing/ears/skrell/chain/silver
 	name = "Silver headtail chains"
 	desc = "A delicate silver chain worn by female skrell to decorate their head tails."
 	icon_state = "skrell_chain_sil"
-	item_state = "skrell_chain_sil"
+	item_state = "egg"
 
 /obj/item/clothing/ears/skrell/chain/bluejewels
 	name = "Blue jeweled golden headtail chains"
 	desc = "A delicate golden chain adorned with blue jewels worn by female skrell to decorate their head tails."
 	icon_state = "skrell_chain_bjewel"
-	item_state = "skrell_chain_bjewel"
+	item_state = "egg2"
 
 /obj/item/clothing/ears/skrell/chain/redjewels
 	name = "Red jeweled golden headtail chains"
 	desc = "A delicate golden chain adorned with red jewels worn by female skrell to decorate their head tails."
 	icon_state = "skrell_chain_rjewel"
-	item_state = "skrell_chain_rjewel"
+	item_state = "egg4"
 
 /obj/item/clothing/ears/skrell/chain/ebony
 	name = "Ebony headtail chains"
 	desc = "A delicate ebony chain worn by female skrell to decorate their head tails."
 	icon_state = "skrell_chain_ebony"
-	item_state = "skrell_chain_ebony"
+	item_state = "egg6"
 
 /obj/item/clothing/ears/skrell/band
 	name = "Gold headtail bands"
 	desc = "Golden metallic bands worn by male skrell to adorn their head tails."
 	icon_state = "skrell_band"
-	item_state = "skrell_band"
+	item_state = "egg5"
 
 /obj/item/clothing/ears/skrell/band/silver
 	name = "Silver headtail bands"
 	desc = "Silver metallic bands worn by male skrell to adorn their head tails."
 	icon_state = "skrell_band_sil"
-	item_state = "skrell_band_sil"
+	item_state = "egg"
 
 /obj/item/clothing/ears/skrell/band/bluejewels
 	name = "Blue jeweled golden headtail bands"
 	desc = "Golden metallic bands adorned with blue jewels worn by male skrell to adorn their head tails."
 	icon_state = "skrell_band_bjewel"
-	item_state = "skrell_band_bjewel"
+	item_state = "egg2"
 
 /obj/item/clothing/ears/skrell/band/redjewels
 	name = "Red jeweled golden headtail bands"
 	desc = "Golden metallic bands adorned with red jewels worn by male skrell to adorn their head tails."
 	icon_state = "skrell_band_rjewel"
-	item_state = "skrell_band_rjewel"
+	item_state = "egg4"
 
 /obj/item/clothing/ears/skrell/band/ebony
 	name = "Ebony headtail bands"
 	desc = "Ebony bands worn by male skrell to adorn their head tails."
 	icon_state = "skrell_band_ebony"
-	item_state = "skrell_band_ebony"
+	item_state = "egg6"
 
 /obj/item/clothing/ears/skrell/colored/band
 	name = "Colored headtail bands"
 	desc = "Metallic bands worn by male skrell to adorn their head tails."
 	icon_state = "skrell_band_sil"
-	item_state = "skrell_band_sil"
+	item_state = "egg"
 
 /obj/item/clothing/ears/skrell/colored/chain
 	name = "Colored headtail chains"
 	desc = "A delicate chain worn by female skrell to decorate their head tails."
 	icon_state = "skrell_chain_sil"
-	item_state = "skrell_chain_sil"
+	item_state = "egg"
 
 /obj/item/clothing/ears/skrell/cloth_female
 	name = "red headtail cloth"
 	desc = "A cloth shawl worn by female skrell draped around their head tails."
 	icon_state = "skrell_cloth_female"
-	item_state = "skrell_cloth_female"
+	item_state = "egg4"
 
 /obj/item/clothing/ears/skrell/cloth_female/black
 	name = "black headtail cloth"
 	icon_state = "skrell_cloth_black_female"
-	item_state = "skrell_cloth_black_female"
+	item_state = "egg6"
 
 /obj/item/clothing/ears/skrell/cloth_female/blue
 	name = "blue headtail cloth"
 	icon_state = "skrell_cloth_blue_female"
-	item_state = "skrell_cloth_blue_female"
+	item_state = "egg2"
 
 /obj/item/clothing/ears/skrell/cloth_female/green
 	name = "green headtail cloth"
 	icon_state = "skrell_cloth_green_female"
-	item_state = "skrell_cloth_green_female"
+	item_state = "egg3"
 
 /obj/item/clothing/ears/skrell/cloth_female/pink
 	name = "pink headtail cloth"
 	icon_state = "skrell_cloth_pink_female"
-	item_state = "skrell_cloth_pink_female"
+	item_state = "egg1"
 
 /obj/item/clothing/ears/skrell/cloth_female/lightblue
 	name = "light blue headtail cloth"
 	icon_state = "skrell_cloth_lblue_female"
-	item_state = "skrell_cloth_lblue_female"
+	item_state = "egg2"
 
 /obj/item/clothing/ears/skrell/cloth_male
 	name = "red headtail cloth"
 	desc = "A cloth band worn by male skrell around their head tails."
 	icon_state = "skrell_cloth_male"
-	item_state = "skrell_cloth_male"
+	item_state = "egg4"
 
 /obj/item/clothing/ears/skrell/cloth_male/black
 	name = "black headtail cloth"
 	icon_state = "skrell_cloth_black_male"
-	item_state = "skrell_cloth_black_male"
+	item_state = "egg6"
 
 /obj/item/clothing/ears/skrell/cloth_male/blue
 	name = "blue headtail cloth"
 	icon_state = "skrell_cloth_blue_male"
-	item_state = "skrell_cloth_blue_male"
+	item_state = "egg2"
 
 /obj/item/clothing/ears/skrell/cloth_male/green
 	name = "green headtail cloth"
 	icon_state = "skrell_cloth_green_male"
-	item_state = "skrell_cloth_green_male"
+	item_state = "egg3"
 
 /obj/item/clothing/ears/skrell/cloth_male/pink
 	name = "pink headtail cloth"
 	icon_state = "skrell_cloth_pink_male"
-	item_state = "skrell_cloth_pink_male"
+	item_state = "egg1"
 
 /obj/item/clothing/ears/skrell/cloth_male/lightblue
 	name = "light blue headtail cloth"
 	icon_state = "skrell_cloth_lblue_male"
-	item_state = "skrell_cloth_lblue_male"
+	item_state = "egg2"

code/modules/clothing/glasses/glasses.dm

@@ -53,7 +53,7 @@ BLIND     // can't see anything
 	name = "Optical Meson Scanner"
 	desc = "Used for seeing walls, floors, and stuff through anything."
 	icon_state = "meson"
-	item_state = "glasses"
+	item_state = "meson"
 	action_button_name = "Toggle Goggles"
 	origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2)
 	toggleable = 1
@@ -100,7 +100,7 @@ BLIND     // can't see anything
 	name = "eyepatch"
 	desc = "Yarr."
 	icon_state = "eyepatch"
-	item_state = "eyepatch"
+	item_state = "blindfold"
 	body_parts_covered = 0
 	var/eye = null
 
@@ -152,20 +152,19 @@ BLIND     // can't see anything
 	name = "Prescription Glasses"
 	desc = "Made by Uncool. Co."
 	icon_state = "hipster_glasses"
-	item_state = "hipster_glasses"
 
 /obj/item/clothing/glasses/threedglasses
 	desc = "A long time ago, people used these glasses to makes images from screens threedimensional."
 	name = "3D glasses"
 	icon_state = "3d"
-	item_state = "3d"
+	item_state = "glasses"
 	body_parts_covered = 0
 
 /obj/item/clothing/glasses/gglasses
 	name = "Green Glasses"
 	desc = "Forest green glasses, like the kind you'd wear when hatching a nasty scheme."
 	icon_state = "gglasses"
-	item_state = "gglasses"
+	item_state = "glasses"
 	body_parts_covered = 0
 
 /obj/item/clothing/glasses/sunglasses
@@ -213,7 +212,6 @@ BLIND     // can't see anything
 	name = "superior welding goggles"
 	desc = "Welding goggles made from more expensive materials, strangely smells like potatoes."
 	icon_state = "rwelding-g"
-	item_state = "rwelding-g"
 
 /obj/item/clothing/glasses/sunglasses/blindfold
 	name = "blindfold"
@@ -237,7 +235,6 @@ BLIND     // can't see anything
 /obj/item/clothing/glasses/sunglasses/big
 	desc = "Strangely ancient technology used to help provide rudimentary eye cover. Larger than average enhanced shielding blocks many flashes."
 	icon_state = "bigsunglasses"
-	item_state = "bigsunglasses"
 	
 /obj/item/clothing/glasses/fakesunglasses //Sunglasses without flash immunity
 	desc = "A pair of designer sunglasses. Doesn't seem like it'll block flashes."
@@ -293,6 +290,7 @@ BLIND     // can't see anything
 	name = "Optical Meson Scanner"
 	desc = "Used for seeing walls, floors, and stuff through anything."
 	icon_state = "meson"
+	item_state = "meson"
 	origin_tech = list(TECH_MAGNET = 3, TECH_ILLEGAL = 4)
 
 /obj/item/clothing/glasses/thermal/plain
@@ -304,6 +302,7 @@ BLIND     // can't see anything
 	name = "Thermoncle"
 	desc = "A monocle thermal."
 	icon_state = "thermoncle"
+	item_state = "sunglasses"
 	toggleable = 1
 	action_button_name = "Toggle Monocle"
 	flags = null //doesn't protect eyes because it's a monocle, duh
@@ -314,7 +313,7 @@ BLIND     // can't see anything
 	name = "Optical Thermal Eyepatch"
 	desc = "An eyepatch with built-in thermal optics"
 	icon_state = "eyepatch"
-	item_state = "eyepatch"
+	item_state = "blindfold"
 	body_parts_covered = 0
 	toggleable = 1
 	action_button_name = "Toggle Eyepatch"
@@ -323,4 +322,4 @@ BLIND     // can't see anything
 	name = "Optical Thermal Implants"
 	desc = "A set of implantable lenses designed to augment your vision"
 	icon_state = "thermalimplants"
-	item_state = "syringe_kit"
+	item_state = "sunglasses"

code/modules/clothing/glasses/hud.dm

@@ -8,12 +8,11 @@
 	proc
 		process_hud(var/mob/M)	return
 
-
-
 /obj/item/clothing/glasses/hud/health
 	name = "Health Scanner HUD"
 	desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."
 	icon_state = "healthhud"
+	item_state = "headset"
 	body_parts_covered = 0
 
 /obj/item/clothing/glasses/hud/health/prescription
@@ -21,7 +20,7 @@
 	desc = "A medical HUD integrated with a set of prescription glasses"
 	prescription = 1
 	icon_state = "healthhudpresc"
-	item_state = "healthhudpresc"
+	item_state = "glasses"
 
 /obj/item/clothing/glasses/hud/health/process_hud(var/mob/M)
 	process_med_hud(M, 1)
@@ -30,6 +29,7 @@
 	name = "Security HUD"
 	desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and security records."
 	icon_state = "securityhud"
+	item_state = "headset"
 	body_parts_covered = 0
 	var/global/list/jobs[0]
 
@@ -38,13 +38,13 @@
 	desc = "A security HUD integrated with a set of prescription glasses"
 	prescription = 1
 	icon_state = "sechudpresc"
-	item_state = "sechudpresc"
+	item_state = "glasses"
 
 /obj/item/clothing/glasses/hud/security/jensenshades
 	name = "Augmented shades"
 	desc = "Polarized bioneural eyewear, designed to augment your vision."
 	icon_state = "jensenshades"
-	item_state = "jensenshades"
+	item_state = "sunglasses"
 	vision_flags = SEE_MOBS
 	see_invisible = SEE_INVISIBLE_NOLIGHTING
 

code/modules/clothing/gloves/arm_guards.dm

@@ -18,6 +18,7 @@
 	name = "ablative arm guards"
 	desc = "These arm guards will protect your hands and arms from energy weapons."
 	icon_state = "arm_guards_laser"
+	item_state = "swat"
 	siemens_coefficient = 0.4 //This is worse than the other ablative pieces, to avoid this from becoming the poor warden's insulated gloves.
 	armor = list(melee = 10, bullet = 10, laser = 80, energy = 50, bomb = 0, bio = 0, rad = 0)
 
@@ -25,6 +26,7 @@
 	name = "bullet resistant arm guards"
 	desc = "These arm guards will protect your hands and arms from ballistic weapons."
 	icon_state = "arm_guards_bullet"
+	item_state = "swat"
 	siemens_coefficient = 0.7
 	armor = list(melee = 10, bullet = 80, laser = 10, energy = 50, bomb = 0, bio = 0, rad = 0)
 
@@ -32,6 +34,7 @@
 	name = "riot arm guards"
 	desc = "These arm guards will protect your hands and arms from close combat weapons."
 	icon_state = "arm_guards_riot"
+	item_state = "swat"
 	siemens_coefficient = 0.5
 	armor = list(melee = 80, bullet = 10, laser = 10, energy = 50, bomb = 0, bio = 0, rad = 0)
 
@@ -39,5 +42,6 @@
 	name = "combat arm guards"
 	desc = "These arm guards will protect your hands and arms from a variety of weapons."
 	icon_state = "arm_guards_combat"
+	item_state = "swat"
 	siemens_coefficient = 0.6
 	armor = list(melee = 50, bullet = 50, laser = 50, energy = 30, bomb = 30, bio = 0, rad = 0)

code/modules/clothing/gloves/boxing.dm

@@ -2,7 +2,7 @@
 	name = "boxing gloves"
 	desc = "Because you really needed another excuse to punch your crewmates."
 	icon_state = "boxing"
-	item_state = "boxing"
+	item_state = "red"
 
 /obj/item/clothing/gloves/boxing/attackby(obj/item/weapon/W, mob/user)
 	if(istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/weapon/scalpel))
@@ -12,18 +12,18 @@
 
 /obj/item/clothing/gloves/boxing/green
 	icon_state = "boxinggreen"
-	item_state = "boxinggreen"
+	item_state = "green"
 
 /obj/item/clothing/gloves/boxing/blue
 	icon_state = "boxingblue"
-	item_state = "boxingblue"
+	item_state = "blue"
 
 /obj/item/clothing/gloves/boxing/yellow
 	icon_state = "boxingyellow"
-	item_state = "boxingyellow"
+	item_state = "yellow"
 
 /obj/item/clothing/gloves/white
 	name = "white gloves"
 	desc = "These look pretty fancy."
 	icon_state = "latex"
-	item_state = "lgloves"
+	item_state = "white"

code/modules/clothing/gloves/color.dm

@@ -2,7 +2,6 @@
 	desc = "These gloves will protect the wearer from electric shock."
 	name = "insulated gloves"
 	icon_state = "yellow"
-	item_state = "ygloves"
 	siemens_coefficient = 0
 	permeability_coefficient = 0.05
 
@@ -10,7 +9,6 @@
 	desc = "These gloves are cheap copies of the coveted gloves, no way this can end badly."
 	name = "budget insulated gloves"
 	icon_state = "yellow"
-	item_state = "ygloves"
 	siemens_coefficient = 1			//Set to a default of 1, gets overridden in New()
 	permeability_coefficient = 0.05
 
@@ -22,7 +20,6 @@
 	desc = "These work gloves are thick and fire-resistant."
 	name = "black gloves"
 	icon_state = "black"
-	item_state = "bgloves"
 	siemens_coefficient = 0.50
 	permeability_coefficient = 0.05
 
@@ -35,61 +32,51 @@
 	name = "orange gloves"
 	desc = "A pair of gloves, they don't look special in any way."
 	icon_state = "orange"
-	item_state = "orangegloves"
 
 /obj/item/clothing/gloves/red
 	name = "red gloves"
 	desc = "A pair of gloves, they don't look special in any way."
 	icon_state = "red"
-	item_state = "redgloves"
 
 /obj/item/clothing/gloves/rainbow
 	name = "rainbow gloves"
 	desc = "A pair of gloves, they don't look special in any way."
 	icon_state = "rainbow"
-	item_state = "rainbowgloves"
 
 /obj/item/clothing/gloves/blue
 	name = "blue gloves"
 	desc = "A pair of gloves, they don't look special in any way."
 	icon_state = "blue"
-	item_state = "bluegloves"
 
 /obj/item/clothing/gloves/purple
 	name = "purple gloves"
 	desc = "A pair of gloves, they don't look special in any way."
 	icon_state = "purple"
-	item_state = "purplegloves"
 
 /obj/item/clothing/gloves/green
 	name = "green gloves"
 	desc = "A pair of gloves, they don't look special in any way."
 	icon_state = "green"
-	item_state = "greengloves"
 
 /obj/item/clothing/gloves/grey
 	name = "grey gloves"
 	desc = "A pair of gloves, they don't look special in any way."
 	icon_state = "gray"
-	item_state = "graygloves"
 
 /obj/item/clothing/gloves/light_brown
 	name = "light brown gloves"
 	desc = "A pair of gloves, they don't look special in any way."
 	icon_state = "lightbrown"
-	item_state = "lightbrowngloves"
 
 /obj/item/clothing/gloves/brown
 	name = "brown gloves"
 	desc = "A pair of gloves, they don't look special in any way."
 	icon_state = "brown"
-	item_state = "browngloves"
 
 /obj/item/clothing/gloves/evening
 	desc = "A pair of gloves that reach past the elbow.  Fancy!"
 	name = "evening gloves"
 	icon_state = "evening_gloves"
-	item_state = "graygloves"
 
 	cold_protection = HANDS
 	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE

code/modules/clothing/gloves/miscellaneous.dm

@@ -2,7 +2,7 @@
 	desc = "Regal blue gloves, with a nice gold trim. Swanky."
 	name = "captain's gloves"
 	icon_state = "captain"
-	item_state = "egloves"
+	item_state = "blue"
 
 /obj/item/clothing/gloves/cyborg
 	desc = "beep boop borp"
@@ -15,7 +15,7 @@
 	desc = "These tactical gloves are somewhat fire and impact-resistant."
 	name = "\improper SWAT Gloves"
 	icon_state = "black"
-	item_state = "swat_gl"
+	item_state = "swat"
 	siemens_coefficient = 0.50
 	permeability_coefficient = 0.05
 
@@ -28,7 +28,7 @@
 	desc = "These tactical gloves are somewhat fire and impact resistant."
 	name = "combat gloves"
 	icon_state = "black"
-	item_state = "swat_gl"
+	item_state = "swat"
 	siemens_coefficient = 0
 	permeability_coefficient = 0.05
 	cold_protection = HANDS
@@ -40,7 +40,7 @@
 	name = "latex gloves"
 	desc = "Sterile latex gloves."
 	icon_state = "latex"
-	item_state = "lgloves"
+	item_state = "white"
 	siemens_coefficient = 1.0 //thin latex gloves, much more conductive than fabric gloves (basically a capacitor for AC)
 	permeability_coefficient = 0.01
 	germ_level = 0
@@ -48,6 +48,6 @@
 	desc = "These leather work gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin."
 	name = "botanist's leather gloves"
 	icon_state = "leather"
-	item_state = "ggloves"
+	item_state = "lightbrown"
 	permeability_coefficient = 0.05
 	siemens_coefficient = 0.50 //thick work gloves

code/modules/clothing/head/collectable.dm

@@ -23,40 +23,30 @@
 	name = "collectable xenomorph helmet!"
 	desc = "Hiss hiss hiss!"
 	icon_state = "xenom"
-	item_state_slots = list(
-		slot_l_hand_str = "xenos_helm",
-		slot_r_hand_str = "xenos_helm",
-		)
+	item_state = "xenos_helm"
 	body_parts_covered = HEAD|FACE|EYES
 
 /obj/item/clothing/head/collectable/chef
 	name = "collectable chef's hat"
 	desc = "A rare Chef's Hat meant for hat collectors!"
 	icon_state = "chefhat"
-	item_state = "chefhat"
 
 /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 Librarians."
 	icon_state = "paper"
-	item_state = "paper"
 	body_parts_covered = 0
 
 /obj/item/clothing/head/collectable/tophat
 	name = "collectable top hat"
 	desc = "A top hat worn by only the most prestigious hat collectors."
 	icon_state = "tophat"
-	item_state = "tophat"
 	body_parts_covered = 0
 
 /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_state = "captain"
-	item_state_slots = list(
-		slot_l_hand_str = "caphat",
-		slot_r_hand_str = "caphat",
-		)
 	body_parts_covered = 0
 
 /obj/item/clothing/head/collectable/police
@@ -75,22 +65,19 @@
 	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_state = "welding"
-	item_state = "welding"
 	body_parts_covered = HEAD|FACE|EYES
 
 /obj/item/clothing/head/collectable/slime
 	name = "collectable slime hat"
 	desc = "Just like a real Brain Slug!"
 	icon_state = "headslime"
+	item_state = "greenbandana"
 
 /obj/item/clothing/head/collectable/flatcap
 	name = "collectable flat cap"
 	desc = "A Collectible farmer's Flat Cap!"
 	icon_state = "flat_cap"
-	item_state_slots = list(
-		slot_l_hand_str = "detective",
-		slot_r_hand_str = "detective",
-		)
+	item_state = "detective"
 
 /obj/item/clothing/head/collectable/pirate
 	name = "collectable pirate hat"

code/modules/clothing/head/helmet.dm

@@ -2,10 +2,6 @@
 	name = "helmet"
 	desc = "Standard Security gear. Protects the head from impacts."
 	icon_state = "helmet"
-	item_state_slots = list(
-		slot_l_hand_str = "helmet",
-		slot_r_hand_str = "helmet",
-		)
 	flags = THICKMATERIAL
 	armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 10, bio = 0, rad = 0)
 	flags_inv = HIDEEARS|HIDEEYES
@@ -21,6 +17,7 @@
 	name = "riot helmet"
 	desc = "It's a helmet specifically designed to protect against close range attacks."
 	icon_state = "riot"
+	item_state = "swat"
 	armor = list(melee = 80, bullet = 10, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
 	flags_inv = HIDEEARS
 	siemens_coefficient = 0.7
@@ -39,6 +36,7 @@
 	name = "ablative helmet"
 	desc = "It's a helmet specifically designed to protect against energy projectiles."
 	icon_state = "helmet_reflec"
+	item_state = "helmet"
 	armor = list(melee = 10, bullet = 10, laser = 80 ,energy = 50, bomb = 0, bio = 0, rad = 0)
 	flags_inv = HIDEEARS
 	siemens_coefficient = 0.1
@@ -47,6 +45,7 @@
 	name = "bullet-resistant helmet"
 	desc = "It's a helmet specifically designed to protect against ballistic projectiles."
 	icon_state = "helmet_bulletproof"
+	item_state = "helmet"
 	armor = list(melee = 10, bullet = 80, laser = 10 ,energy = 10, bomb = 0, bio = 0, rad = 0)
 	flags_inv = HIDEEARS
 	siemens_coefficient = 0.7
@@ -55,6 +54,7 @@
 	name = "combat helmet"
 	desc = "It's a general purpose combat helmet, designed to protect against typical dangers to your head."
 	icon_state = "helmet_combat"
+	item_state = "helmet"
 	armor = list(melee = 50, bullet = 50, laser = 50 ,energy = 30, bomb = 30, bio = 0, rad = 0)
 	flags_inv = HIDEEARS
 	siemens_coefficient = 0.6
@@ -82,6 +82,7 @@
 	name = "gladiator helmet"
 	desc = "Ave, Imperator, morituri te salutant."
 	icon_state = "gladiator"
+	item_state = "vhelmet" //why not
 	flags = BLOCKHAIR
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
 	siemens_coefficient = 1
@@ -90,6 +91,7 @@
 	name = "tactical helmet"
 	desc = "An armored helmet capable of being fitted with a multitude of attachments."
 	icon_state = "swathelm"
+	item_state = "swat"
 	sprite_sheets = list(
 		"Tajara" = 'icons/mob/species/tajaran/helmet.dmi',
 		"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
@@ -103,6 +105,7 @@
 	name = "Augment Array"
 	desc = "A helmet with optical and cranial augments coupled to it."
 	icon_state = "v62"
+	item_state = "head_m"
 	armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
 	flags_inv = HIDEEARS|HIDEEYES
 	cold_protection = HEAD
@@ -114,10 +117,7 @@
 	name = "emergency response team helmet"
 	desc = "An in-atmosphere helmet worn by members of the NanoTrasen Emergency Response Team. Protects the head from impacts."
 	icon_state = "erthelmet_cmd"
-	item_state_slots = list(
-		slot_l_hand_str = "syndicate-helm-green",
-		slot_r_hand_str = "syndicate-helm-green",
-		)
+	item_state = "syndicate-helm-green"
 	armor = list(melee = 62, bullet = 50, laser = 50,energy = 35, bomb = 10, bio = 2, rad = 0)
 
 //Commander

code/modules/clothing/head/jobs.dm

@@ -4,17 +4,12 @@
 	name = "chef's hat"
 	desc = "It's a hat used by chefs to keep hair out of your food. Judging by the food in the mess, they don't work."
 	icon_state = "chefhat"
-	item_state = "chefhat"
 
 //Captain
 /obj/item/clothing/head/caphat
 	name = "captain's hat"
 	icon_state = "captain"
 	desc = "It's good being the king."
-	item_state_slots = list(
-		slot_l_hand_str = "caphat",
-		slot_r_hand_str = "caphat",
-		)
 	body_parts_covered = 0
 
 /obj/item/clothing/head/caphat/cap
@@ -37,7 +32,7 @@
 /obj/item/clothing/head/chaplain_hood
 	name = "chaplain's hood"
 	desc = "It's hood that covers the head. It keeps you warm during the space winters."
-	icon_state = "chaplain_hood"
+	icon_state = "beret_black"
 	flags_inv = BLOCKHAIR
 	body_parts_covered = HEAD
 
@@ -46,6 +41,7 @@
 	name = "nun hood"
 	desc = "Maximum piety in this star system."
 	icon_state = "nun_hood"
+	item_state = "beret_black"
 	flags_inv = BLOCKHAIR
 	body_parts_covered = HEAD
 
@@ -61,74 +57,101 @@
 	name = "security beret"
 	desc = "A beret with the security insignia emblazoned on it. For officers that are more inclined towards style than safety."
 	icon_state = "beret_officer"
+	item_state = "beret"
+	
 /obj/item/clothing/head/beret/sec/navy/officer
 	name = "officer beret"
 	desc = "A navy blue beret with an officer's rank emblem. For officers that are more inclined towards style than safety."
 	icon_state = "beret_navy_officer"
+	item_state = "beret_navy"
+	
 /obj/item/clothing/head/beret/sec/navy/hos
 	name = "officer beret"
 	desc = "A navy blue beret with a head of security's rank emblem. For officers that are more inclined towards style than safety."
 	icon_state = "beret_navy_hos"
+	item_state = "beret_navy"
+	
 /obj/item/clothing/head/beret/sec/navy/warden
 	name = "warden beret"
 	desc = "A navy blue beret with a warden's rank emblem. For officers that are more inclined towards style than safety."
 	icon_state = "beret_navy_warden"
+	item_state = "beret_navy"
+	
 /obj/item/clothing/head/beret/sec/corporate/officer
 	name = "officer beret"
 	desc = "A corporate black beret with an officer's rank emblem. For officers that are more inclined towards style than safety."
 	icon_state = "beret_corporate_officer"
+	item_state = "beret_black"
+	
 /obj/item/clothing/head/beret/sec/corporate/hos
 	name = "officer beret"
 	desc = "A corporate black beret with a head of security's rank emblem. For officers that are more inclined towards style than safety."
 	icon_state = "beret_corporate_hos"
+	item_state = "beret_black"
+	
 /obj/item/clothing/head/beret/sec/corporate/warden
 	name = "warden beret"
 	desc = "A corporate black beret with a warden's rank emblem. For officers that are more inclined towards style than safety."
 	icon_state = "beret_corporate_warden"
+	item_state = "beret_black"
+	
 /obj/item/clothing/head/beret/engineering
 	name = "engineering beret"
 	desc = "A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety."
 	icon_state = "beret_engineering"
+	
 /obj/item/clothing/head/beret/purple
 	name = "purple beret"
 	desc = "A stylish, if purple, beret."
 	icon_state = "beret_purple"
+	
 /obj/item/clothing/head/beret/centcom/officer
 	name = "officers beret"
 	desc = "A dark blue beret adorned with a silver patch. Worn by NanoTrasen Officials."
 	icon_state = "beret_centcom_officer"
+	item_state = "beret_white"
+	
 /obj/item/clothing/head/beret/centcom/captain
 	name = "captains beret"
 	desc = "A white beret adorned with a blue patch. Worn by NanoTrasen command staff."
 	icon_state = "beret_centcom_captain"
+	item_state = "beret_white"
+
 /obj/item/clothing/head/beret/sec/gov
 	name = "officer beret"
 	desc = "A black beret with a gold emblem."
 	icon_state = "beret_corporate_hos"
+	item_state = "beret_black"
 
 //Medical
 /obj/item/clothing/head/surgery
 	name = "surgical cap"
 	desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs."
 	icon_state = "surgcap_blue"
+	item_state = "beret_blue"
 	flags_inv = BLOCKHEADHAIR
 
 /obj/item/clothing/head/surgery/purple
 	desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is deep purple."
 	icon_state = "surgcap_purple"
+	item_state = "beret_purple"
 
 /obj/item/clothing/head/surgery/blue
 	desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is baby blue."
 	icon_state = "surgcap_blue"
+	item_state = "beret_blue"
 
 /obj/item/clothing/head/surgery/green
 	desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is dark green."
 	icon_state = "surgcap_green"
+	item_state = "beret_green"
 
 /obj/item/clothing/head/surgery/black
 	desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is black."
 	icon_state = "surgcap_black"
+	item_state = "beret_black"
 
 /obj/item/clothing/head/surgery/navyblue
 	desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is navy blue."
 	icon_state = "surgcap_navyblue"
+	item_state = "beret_navy"

code/modules/clothing/head/misc.dm

@@ -1,12 +1,6 @@
-
-
 /obj/item/clothing/head/centhat
 	name = "\improper CentComm. hat"
 	icon_state = "centcom"
-	item_state_slots = list(
-		slot_l_hand_str = "centhat",
-		slot_r_hand_str = "centhat",
-		)
 	desc = "It's good to be emperor."
 	siemens_coefficient = 0.9
 	body_parts_covered = 0
@@ -37,25 +31,25 @@
 	name = "powdered wig"
 	desc = "A powdered wig."
 	icon_state = "pwig"
-	item_state = "pwig"
 
 /obj/item/clothing/head/that
 	name = "top-hat"
 	desc = "It's an amish looking hat."
 	icon_state = "tophat"
-	item_state = "tophat"
 	siemens_coefficient = 0.9
 	body_parts_covered = 0
 
 /obj/item/clothing/head/redcoat
 	name = "redcoat's hat"
 	icon_state = "redcoat"
+	item_state = "pirate"
 	desc = "<i>'I guess it's a redhead.'</i>"
 	body_parts_covered = 0
 
 /obj/item/clothing/head/mailman
 	name = "station cap"
 	icon_state = "mailman"
+	item_state = "hopcap"
 	desc = "<i>Choo-choo</i>!"
 	body_parts_covered = 0
 
@@ -63,6 +57,7 @@
 	name = "plague doctor's hat"
 	desc = "These were once used by Plague doctors. They're pretty much useless."
 	icon_state = "plaguedoctor"
+	item_state = "tophat"
 	permeability_coefficient = 0.01
 	siemens_coefficient = 0.9
 	body_parts_covered = 0
@@ -71,6 +66,7 @@
 	name = "hastur's hood"
 	desc = "It's unspeakably stylish"
 	icon_state = "hasturhood"
+	item_state = "enginering_beret"
 	flags_inv = BLOCKHAIR
 	body_parts_covered = HEAD|FACE|EYES
 
@@ -83,10 +79,7 @@
 
 /obj/item/clothing/head/syndicatefake
 	name = "red space-helmet replica"
-	item_state_slots = list(
-		slot_l_hand_str = "syndicate-helm-black-red",
-		slot_r_hand_str = "syndicate-helm-black-red",
-		)
+	item_state = "syndicate-helm-black-red"
 	icon_state = "syndicate"
 	desc = "A plastic replica of a bloodthirsty mercenary's space helmet, you'll look just like a real murderous criminal operative in this! This is a toy, it is not made for use in space!"
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
@@ -97,7 +90,6 @@
 	name = "cueball helmet"
 	desc = "A large, featureless white orb mean to be worn on your head. How do you even see out of this thing?"
 	icon_state = "cueball"
-	item_state = "cueball"
 	flags_inv = BLOCKHAIR
 	body_parts_covered = HEAD|FACE|EYES
 
@@ -105,7 +97,6 @@
 	name = "green bandana"
 	desc = "It's a green bandana with some fine nanotech lining."
 	icon_state = "greenbandana"
-	item_state = "greenbandana"
 	flags_inv = 0
 	body_parts_covered = 0
 
@@ -113,14 +104,13 @@
 	name = "cardborg helmet"
 	desc = "A helmet made out of a box."
 	icon_state = "cardborg_h"
-	item_state = "cardborg_h"
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
 	body_parts_covered = HEAD|FACE|EYES
 
 /obj/item/clothing/head/justice
 	name = "justice hat"
 	desc = "fight for what's righteous!"
-	icon_state = "justicered"
+	icon_state = "justicered" //Does this even exist?
 	flags_inv = BLOCKHAIR
 	body_parts_covered = HEAD|EYES
 
@@ -146,11 +136,8 @@
 	name = "flat cap"
 	desc = "A working man's cap."
 	icon_state = "flat_cap"
-	item_state_slots = list(
-		slot_l_hand_str = "det_hat",
-		slot_r_hand_str = "det_hat",
-		)
-	siemens_coefficient = 0.9
+	item_state = "detective"
+	siemens_coefficient = 0.9 //...what?
 
 /obj/item/clothing/head/pirate
 	name = "pirate hat"
@@ -162,17 +149,20 @@
 	name = "pirate hat"
 	desc = "Yarr."
 	icon_state = "hgpiratecap"
+	item_state = "hoscap"
 	body_parts_covered = 0
 
 /obj/item/clothing/head/bandana
 	name = "pirate bandana"
 	desc = "Yarr."
 	icon_state = "bandana"
+	item_state = "redbandana"
 
 /obj/item/clothing/head/bowler
 	name = "bowler-hat"
 	desc = "Gentleman, elite aboard!"
 	icon_state = "bowler"
+	item_state = "tophat"
 	body_parts_covered = 0
 
 //stylish bs12 hats
@@ -180,27 +170,32 @@
 /obj/item/clothing/head/bowlerhat
 	name = "bowler hat"
 	icon_state = "bowler_hat"
+	item_state = "tophat"
 	desc = "For the gentleman of distinction."
 	body_parts_covered = 0
 
 /obj/item/clothing/head/beaverhat
 	name = "beaver hat"
 	icon_state = "beaver_hat"
+	item_state = "tophat"
 	desc = "Soft felt makes this hat both comfortable and elegant."
 
 /obj/item/clothing/head/boaterhat
 	name = "boater hat"
 	icon_state = "boater_hat"
+	item_state = "tophat"
 	desc = "The ultimate in summer fashion."
 
 /obj/item/clothing/head/fedora
 	name = "fedora"
 	icon_state = "fedora"
+	item_state = "detective"
 	desc = "A sharp, stylish hat."
 
 /obj/item/clothing/head/feathertrilby
 	name = "feather trilby"
 	icon_state = "feather_trilby"
+	item_state = "detective"
 	desc = "A sharp, stylish hat with a feather."
 
 /obj/item/clothing/head/fez
@@ -208,13 +203,10 @@
 	icon_state = "fez"
 	desc = "You should wear a fez. Fezzes are cool."
 	
-//end bs12 hats
-
 /obj/item/clothing/head/cowboy_hat
 	name = "cowboy hat"
 	desc = "For those that have spurs that go jingle jangle jingle."
 	icon_state = "cowboyhat"
-	item_state = "cowboy_hat"
 	body_parts_covered = 0
 
 /obj/item/clothing/head/witchwig
@@ -228,10 +220,6 @@
 	name = "chicken suit head"
 	desc = "Bkaw!"
 	icon_state = "chickenhead"
-	item_state_slots = list(
-		slot_l_hand_str = "chickensuit",
-		slot_r_hand_str = "chickensuit",
-		)
 	flags_inv = BLOCKHAIR
 	siemens_coefficient = 0.7
 	body_parts_covered = HEAD|FACE|EYES
@@ -240,16 +228,14 @@
 	name = "bear pelt hat"
 	desc = "Fuzzy."
 	icon_state = "bearpelt"
+	item_state = "beret_black"
 	flags_inv = BLOCKHAIR
 	siemens_coefficient = 0.7
 
 /obj/item/clothing/head/xenos
 	name = "xenos helmet"
 	icon_state = "xenos"
-	item_state_slots = list(
-		slot_l_hand_str = "xenos_helm",
-		slot_r_hand_str = "xenos_helm",
-		)
+	item_state = "xenos_helm"
 	desc = "A helmet made out of chitinous alien hide."
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
 	siemens_coefficient = 2.0
@@ -259,10 +245,7 @@
 	name = "natural philosopher's wig"
 	desc = "A stylish monstrosity unearthed from Earth's Renaissance period. With this most distinguish'd wig, you'll be ready for your next soiree!"
 	icon_state = "philosopher_wig"
-	item_state_slots = list(
-		slot_l_hand_str = "pwig",
-		slot_r_hand_str = "pwig",
-		)
+	item_state = "pwig"
 	flags_inv = BLOCKHAIR
 	siemens_coefficient = 2.0 //why is it so conductive?!
 	body_parts_covered = 0
@@ -277,6 +260,7 @@
 	name = "hijab"
 	desc = "A veil that is wrapped to cover the head and chest"
 	icon_state = "hijab"
+	item_state = "beret_white"
 	body_parts_covered = 0
 	flags_inv = BLOCKHAIR
 
@@ -290,5 +274,6 @@
 	name = "turban"
 	desc = "A cloth used to wind around the head"
 	icon_state = "turban"
+	item_state = "beret_white"
 	body_parts_covered = 0
 	flags_inv = BLOCKHAIR

code/modules/clothing/head/misc_special.dm

@@ -15,10 +15,7 @@
 	name = "welding helmet"
 	desc = "A head-mounted face cover designed to protect the wearer completely from space-arc eye."
 	icon_state = "welding"
-	item_state_slots = list(
-		slot_l_hand_str = "welding",
-		slot_r_hand_str = "welding",
-		)
+	item_state = "welding"
 	matter = list(DEFAULT_WALL_MATERIAL = 3000, "glass" = 1000)
 	var/up = 0
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
@@ -64,7 +61,6 @@
 	name = "cake-hat"
 	desc = "It's tasty looking!"
 	icon_state = "cake0"
-	item_state = "cake0"
 	var/onfire = 0
 	body_parts_covered = HEAD
 
@@ -83,18 +79,16 @@
 		location.hotspot_expose(700, 1)
 
 /obj/item/clothing/head/cakehat/attack_self(mob/user as mob)
-	src.onfire = !( src.onfire )
-	if (src.onfire)
-		src.force = 3
-		src.damtype = "fire"
-		src.icon_state = "cake1"
-		src.item_state = "cake1"
+	onfire = !(onfire)
+	if (onfire)
+		force = 3
+		damtype = "fire"
+		icon_state = "cake1"
 		processing_objects.Add(src)
 	else
-		src.force = null
-		src.damtype = "brute"
-		src.icon_state = "cake0"
-		src.item_state = "cake0"
+		force = null
+		damtype = "brute"
+		icon_state = "cake0"
 	return
 
 
@@ -151,6 +145,7 @@
 	name = "chicken mask"
 	desc = "You can hear the distant sounds of rhythmic electronica."
 	icon_state = "richard"
+	item_state = "chickenhead"
 	body_parts_covered = HEAD|FACE
 	flags_inv = BLOCKHAIR
 
@@ -158,10 +153,12 @@
 	name = "santa hat"
 	desc = "It's a festive christmas hat, in red!"
 	icon_state = "santahatnorm"
+	item_state = "santahat"
 	body_parts_covered = 0
 
 /obj/item/clothing/head/santa/green
 	name = "green santa hat"
 	desc = "It's a festive christmas hat, in green!"
 	icon_state = "santahatgreen"
+	item_state = "santahatgreen"
 	body_parts_covered = 0

code/modules/clothing/head/soft_caps.dm

@@ -2,26 +2,23 @@
 	name = "cargo cap"
 	desc = "It's a peaked cap in a tasteless yellow color."
 	icon_state = "cargosoft"
-	item_state_slots = list(
-		slot_l_hand_str = "helmet", //probably a placeholder
-		slot_r_hand_str = "helmet",
-		)
+	item_state = "cargosoft"
 	var/flipped = 0
 	siemens_coefficient = 0.9
 	body_parts_covered = 0
 
 /obj/item/clothing/head/soft/dropped()
-	src.icon_state = initial(icon_state)
-	src.flipped=0
+	icon_state = initial(icon_state)
+	flipped=0
 	..()
 
 /obj/item/clothing/head/soft/attack_self(mob/user)
-	src.flipped = !src.flipped
-	if(src.flipped)
+	flipped = !flipped
+	if(flipped)
 		icon_state = "[icon_state]_flipped"
 		user << "You flip the hat backwards."
 	else
-		src.icon_state = initial(icon_state)
+		icon_state = initial(icon_state)
 		user << "You flip the hat back in normal position."
 	update_clothing_icon()	//so our mob-overlays update
 
@@ -29,58 +26,70 @@
 	name = "red cap"
 	desc = "It's a baseball hat in a tasteless red color."
 	icon_state = "redsoft"
+	item_state = "redsoft"
 
 /obj/item/clothing/head/soft/blue
 	name = "blue cap"
 	desc = "It's a peaked cap in a tasteless blue color."
 	icon_state = "bluesoft"
+	item_state = "bluesoft"
 
 /obj/item/clothing/head/soft/green
 	name = "green cap"
 	desc = "It's a peaked cap in a tasteless green color."
 	icon_state = "greensoft"
+	item_state = "greensoft"
 
 /obj/item/clothing/head/soft/yellow
 	name = "yellow cap"
 	desc = "It's a peaked cap in a tasteless yellow color."
 	icon_state = "yellowsoft"
+	item_state = "yellowsoft"
 
 /obj/item/clothing/head/soft/grey
 	name = "grey cap"
 	desc = "It's a peaked cap in a tasteful grey color."
 	icon_state = "greysoft"
+	item_state = "greysoft"
 
 /obj/item/clothing/head/soft/orange
 	name = "orange cap"
 	desc = "It's a peaked cap in a tasteless orange color."
 	icon_state = "orangesoft"
+	item_state = "orangesoft"
 
 /obj/item/clothing/head/soft/mime
 	name = "white cap"
 	desc = "It's a peaked cap in a tasteless white color."
 	icon_state = "mimesoft"
+	item_state = "mimesoft"
 
 /obj/item/clothing/head/soft/purple
 	name = "purple cap"
 	desc = "It's a peaked cap in a tasteless purple color."
 	icon_state = "purplesoft"
+	item_state = "purplesoft"
 
 /obj/item/clothing/head/soft/rainbow
 	name = "rainbow cap"
 	desc = "It's a peaked cap in a bright rainbow of colors."
 	icon_state = "rainbowsoft"
+	item_state = "rainbowsoft"
 
 /obj/item/clothing/head/soft/sec
 	name = "security cap"
 	desc = "It's a field cap in tasteful red color."
 	icon_state = "secsoft"
+	item_state = "secsoft"
 
 /obj/item/clothing/head/soft/sec/corp
 	name = "corporate security cap"
 	desc = "It's field cap in corporate colors."
 	icon_state = "corpsoft"
+	item_state = "corpsoft"
 
 /obj/item/clothing/head/soft/black
 	name = "black cap"
 	desc = "It's a peaked cap in a tasteful black color."
 	icon_state = "blacksoft"
+	item_state = "blacksoft"

code/modules/clothing/masks/boxing.dm

@@ -2,7 +2,7 @@
 	name = "balaclava"
 	desc = "LOADSAMONEY"
 	icon_state = "balaclava"
-	item_state = "balaclava"
+	item_state = "bandblack"
 	flags_inv = HIDEFACE|BLOCKHAIR
 	body_parts_covered = FACE|HEAD
 	w_class = 2
@@ -15,7 +15,7 @@
 	name = "green balaclava"
 	desc = "Designed to both hide identities and keep your face comfy and warm."
 	icon_state = "swatclava"
-	item_state = "balaclava"
+	item_state = "bandgreen"
 	flags_inv = HIDEFACE|BLOCKHAIR
 	w_class = 2
 	sprite_sheets = list(
@@ -27,7 +27,6 @@
 	name = "Luchador Mask"
 	desc = "Worn by robust fighters, flying high to defeat their foes!"
 	icon_state = "luchag"
-	item_state = "luchag"
 	flags_inv = HIDEFACE|BLOCKHAIR
 	body_parts_covered = HEAD|FACE
 	w_class = 2
@@ -37,10 +36,8 @@
 	name = "Tecnicos Mask"
 	desc = "Worn by robust fighters who uphold justice and fight honorably."
 	icon_state = "luchador"
-	item_state = "luchador"
 
 /obj/item/clothing/mask/luchador/rudos
 	name = "Rudos Mask"
 	desc = "Worn by robust fighters who are willing to do anything to win."
 	icon_state = "luchar"
-	item_state = "luchar"

code/modules/clothing/masks/gasmask.dm

@@ -32,7 +32,7 @@
 	name = "plague doctor mask"
 	desc = "A modernised version of the classic design, this mask will not only filter out phoron but it can also be connected to an air supply."
 	icon_state = "plaguedoctor"
-	item_state = "gas_mask"
+	item_state = "gas"
 	armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 90, rad = 0)
 	body_parts_covered = HEAD|FACE|EYES
 
@@ -59,7 +59,7 @@
 	name = "sexy-clown wig and mask"
 	desc = "A feminine clown mask for the dabbling crossdressers or female entertainers."
 	icon_state = "sexyclown"
-	item_state = "sexyclown"
+	item_state = "clown_hat"
 
 /obj/item/clothing/mask/gas/mime
 	name = "mime mask"
@@ -71,19 +71,18 @@
 	name = "monkey mask"
 	desc = "A mask used when acting as a monkey."
 	icon_state = "monkeymask"
-	item_state = "monkeymask"
 	body_parts_covered = HEAD|FACE|EYES
 
 /obj/item/clothing/mask/gas/sexymime
 	name = "sexy mime mask"
 	desc = "A traditional female mime's mask."
 	icon_state = "sexymime"
-	item_state = "sexymime"
+	item_state = "mime"
 
 /obj/item/clothing/mask/gas/death_commando
 	name = "Death Commando Mask"
 	icon_state = "death_commando_mask"
-	item_state = "death_commando_mask"
+	item_state = "swat"
 	siemens_coefficient = 0.2
 
 /obj/item/clothing/mask/gas/cyborg

code/modules/clothing/masks/miscellaneous.dm

@@ -2,7 +2,6 @@
 	name = "muzzle"
 	desc = "To stop that awful noise."
 	icon_state = "muzzle"
-	item_state = "muzzle"
 	body_parts_covered = FACE
 	w_class = 2
 	gas_transfer_coefficient = 0.90
@@ -84,7 +83,6 @@
 	name = "blue neck scarf"
 	desc = "A blue neck scarf."
 	icon_state = "blueneckscarf"
-	item_state = "blueneckscarf"
 	body_parts_covered = FACE
 	item_flags = FLEXIBLEMATERIAL
 	w_class = 2
@@ -94,7 +92,6 @@
 	name = "red scarf"
 	desc = "A red and white checkered neck scarf."
 	icon_state = "redwhite_scarf"
-	item_state = "redwhite_scarf"
 	body_parts_covered = FACE
 	item_flags = FLEXIBLEMATERIAL
 	w_class = 2
@@ -104,7 +101,6 @@
 	name = "green scarf"
 	desc = "A green neck scarf."
 	icon_state = "green_scarf"
-	item_state = "green_scarf"
 	body_parts_covered = FACE
 	item_flags = FLEXIBLEMATERIAL
 	w_class = 2
@@ -114,7 +110,6 @@
 	name = "ninja scarf"
 	desc = "A stealthy, dark scarf."
 	icon_state = "ninja_scarf"
-	item_state = "ninja_scarf"
 	body_parts_covered = FACE
 	item_flags = FLEXIBLEMATERIAL
 	w_class = 2
@@ -125,7 +120,6 @@
 	name = "pig mask"
 	desc = "A rubber pig mask."
 	icon_state = "pig"
-	item_state = "pig"
 	flags_inv = HIDEFACE|BLOCKHAIR
 	w_class = 2
 	siemens_coefficient = 0.9
@@ -135,7 +129,6 @@
 	name = "horse head mask"
 	desc = "A mask made of soft vinyl and latex, representing the head of a horse."
 	icon_state = "horsehead"
-	item_state = "horsehead"
 	flags_inv = HIDEFACE|BLOCKHAIR
 	body_parts_covered = HEAD|FACE|EYES
 	w_class = 2
@@ -151,7 +144,7 @@
 	name = "camera MIU"
 	desc = "Allows for direct mental connection to accessible camera networks."
 	icon_state = "s-ninja"
-	item_state = "s-ninja"
+	item_state = "mime"
 	flags_inv = HIDEFACE
 	body_parts_covered = 0
 	var/mob/observer/eye/aiEye/eye
@@ -195,13 +188,11 @@
 			flags_inv = flags_inv & ~HIDEFACE
 			slot_flags = SLOT_HEAD
 			icon_state = "[icon_state]_up"
-			item_state = "[item_state]_up"
 			usr << "You tie the bandana so that it can be worn on the head."
 		else
 			flags_inv = initial(flags_inv)
 			slot_flags = initial(slot_flags)
 			icon_state = initial(icon_state)
-			item_state = initial(item_state)
 			usr << "You tie the bandana so that it can be worn on the face."
 
 /obj/item/clothing/mask/bandana/verb/toggle()
@@ -216,23 +207,28 @@
 	name = "red bandana"
 	desc = "A fine red bandana with nanotech lining."
 	icon_state = "bandred"
+	item_state = "bandred"
 
 /obj/item/clothing/mask/bandana/blue
 	name = "blue bandana"
 	desc = "A fine blue bandana with nanotech lining."
 	icon_state = "bandblue"
+	item_state = "bandblue"
 
 /obj/item/clothing/mask/bandana/green
 	name = "green bandana"
 	desc = "A fine green bandana with nanotech lining."
 	icon_state = "bandgreen"
+	item_state = "bandgreen"
 
 /obj/item/clothing/mask/bandana/gold
 	name = "gold bandana"
 	desc = "A fine gold bandana with nanotech lining."
 	icon_state = "bandgold"
+	item_state = "bandgold"
 
 /obj/item/clothing/mask/bandana/skull
 	name = "skull bandana"
 	desc = "A fine black bandana with nanotech lining and a skull emblem."
 	icon_state = "bandskull"
+	item_state = "bandskull"

code/modules/clothing/shoes/colour.dm

@@ -8,7 +8,6 @@
 	heat_protection = FEET
 	max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE
 
-
 /obj/item/clothing/shoes/brown
 	name = "brown shoes"
 	desc = "A pair of brown shoes."
@@ -30,10 +29,6 @@
 	name = "purple shoes"
 	icon_state = "purple"
 
-/obj/item/clothing/shoes/brown
-	name = "brown shoes"
-	icon_state = "brown"
-
 /obj/item/clothing/shoes/red
 	name = "red shoes"
 	desc = "Stylish red shoes."
@@ -58,36 +53,43 @@
 	name = "black flats"
 	desc = "Sleek black flats."
 	icon_state = "flatsblack"
+	item_state = "black"
 
 /obj/item/clothing/shoes/flats/white
 	name = "white flats"
 	desc = "Shiny white flats."
 	icon_state = "flatswhite"
+	item_state = "white"
 
 /obj/item/clothing/shoes/flats/red
 	name = "red flats"
 	desc = "Ruby red flats."
 	icon_state = "flatsred"
+	item_state = "red"
 
 /obj/item/clothing/shoes/flats/purple
 	name = "purple flats"
 	desc = "Royal purple flats."
 	icon_state = "flatspurple"
+	item_state = "purple"
 
 /obj/item/clothing/shoes/flats/blue
 	name = "blue flats"
 	desc = "Sleek blue flats."
 	icon_state = "flatsblue"
+	item_state = "blue"
 
 /obj/item/clothing/shoes/flats/brown
 	name = "brown flats"
 	desc = "Sleek brown flats."
 	icon_state = "flatsbrown"
+	item_state = "brown"
 
 /obj/item/clothing/shoes/flats/orange
 	name = "orange flats"
 	desc = "Radiant orange flats."
 	icon_state = "flatsorange"
+	item_state = "orange"
 
 /obj/item/clothing/shoes/orange
 	name = "orange shoes"
@@ -95,23 +97,23 @@
 	var/obj/item/weapon/handcuffs/chained = null
 
 /obj/item/clothing/shoes/orange/proc/attach_cuffs(var/obj/item/weapon/handcuffs/cuffs, mob/user as mob)
-	if (src.chained) return
+	if (chained) return
 
 	user.drop_item()
 	cuffs.loc = src
-	src.chained = cuffs
-	src.slowdown = 15
-	src.icon_state = "orange1"
+	chained = cuffs
+	slowdown = 15
+	icon_state = "orange1"
 
 /obj/item/clothing/shoes/orange/proc/remove_cuffs(mob/user as mob)
-	if (!src.chained) return
+	if (!chained) return
 
-	user.put_in_hands(src.chained)
-	src.chained.add_fingerprint(user)
+	user.put_in_hands(chained)
+	chained.add_fingerprint(user)
 
-	src.slowdown = initial(slowdown)
-	src.icon_state = "orange"
-	src.chained = null
+	slowdown = initial(slowdown)
+	icon_state = "orange"
+	chained = null
 
 /obj/item/clothing/shoes/orange/attack_self(mob/user as mob)
 	..()

code/modules/clothing/shoes/jobs.dm

@@ -11,7 +11,6 @@
 	name = "jackboots"
 	desc = "Standard-issue Security combat boots for combat scenarios or combat situations. All combat, all the time."
 	icon_state = "jackboots"
-	item_state = "jackboots"
 	force = 3
 	armor = list(melee = 30, bullet = 10, laser = 10, energy = 15, bomb = 20, bio = 0, rad = 0)
 	siemens_coefficient = 0.7
@@ -20,15 +19,13 @@
 /obj/item/clothing/shoes/jackboots/toeless
 	name = "toe-less jackboots"
 	desc = "Modified pair of jackboots, particularly friendly to those species whose toes hold claws."
-	item_state = "digiboots"
-	icon_state = "digiboots"
+	item_state = "jackboots"
 	species_restricted = null
 
 /obj/item/clothing/shoes/workboots
 	name = "workboots"
 	desc = "A pair of steel-toed work boots designed for use in industrial settings. Safety first."
 	icon_state = "workboots"
-	item_state = "workboots"
 	armor = list(melee = 40, bullet = 0, laser = 0, energy = 15, bomb = 20, bio = 0, rad = 20)
 	siemens_coefficient = 0.7
 	can_hold_knife = 1

code/modules/clothing/shoes/leg_guards.dm

@@ -18,6 +18,7 @@
 	name = "ablative leg guards"
 	desc = "These will protect your legs and feet from energy weapons."
 	icon_state = "leg_guards_laser"
+	item_state = "jackboots"
 	siemens_coefficient = 0.1
 	armor = list(melee = 10, bullet = 10, laser = 80, energy = 50, bomb = 0, bio = 0, rad = 0)
 
@@ -25,6 +26,7 @@
 	name = "bullet resistant leg guards"
 	desc = "These will protect your legs and feet from ballistic weapons."
 	icon_state = "leg_guards_bullet"
+	item_state = "jackboots"
 	siemens_coefficient = 0.7
 	armor = list(melee = 10, bullet = 80, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
 
@@ -32,6 +34,7 @@
 	name = "riot leg guards"
 	desc = "These will protect your legs and feet from close combat weapons."
 	icon_state = "leg_guards_riot"
+	item_state = "jackboots"
 	siemens_coefficient = 0.5
 	armor = list(melee = 80, bullet = 10, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
 
@@ -39,5 +42,6 @@
 	name = "combat leg guards"
 	desc = "These will protect your legs and feet from a variety of weapons."
 	icon_state = "leg_guards_combat"
+	item_state = "jackboots"
 	siemens_coefficient = 0.6
 	armor = list(melee = 50, bullet = 50, laser = 50, energy = 30, bomb = 30, bio = 0, rad = 0)

code/modules/clothing/shoes/magboots.dm

@@ -2,6 +2,7 @@
 	desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. They're large enough to be worn over other footwear."
 	name = "magboots"
 	icon_state = "magboots0"
+	item_state = "magboots"
 	species_restricted = null
 	force = 3
 	overshoes = 1

code/modules/clothing/shoes/miscellaneous.dm

@@ -2,7 +2,6 @@
 	desc = "A pair of brown shoes. They seem to have extra grip."
 	name = "brown shoes"
 	icon_state = "brown"
-	item_state = "brown"
 	permeability_coefficient = 0.05
 	item_flags = NOSLIP
 	origin_tech = list(TECH_ILLEGAL = 3)
@@ -12,12 +11,13 @@
 
 /obj/item/clothing/shoes/mime
 	name = "mime shoes"
-	icon_state = "mime"
+	icon_state = "white"
 
 /obj/item/clothing/shoes/swat
 	name = "\improper SWAT shoes"
 	desc = "When you want to turn up the heat."
 	icon_state = "swat"
+	item_state = "swat"
 	force = 3
 	armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
 	item_flags = NOSLIP
@@ -125,7 +125,6 @@
 	desc = "The prankster's standard-issue clowning shoes. Damn they're huge!"
 	name = "clown shoes"
 	icon_state = "clown"
-	item_state = "clown_shoes"
 	slowdown = SHOES_SLOWDOWN+1
 	force = 0
 	var/footstep = 1	//used for squeeks whilst walking
@@ -167,7 +166,6 @@
 	name = "bunny slippers"
 	desc = "Fluffy!"
 	icon_state = "slippers"
-	item_state = "slippers"
 	force = 0
 	species_restricted = null
 	w_class = 2
@@ -176,7 +174,7 @@
 	name = "worn bunny slippers"
 	desc = "Fluffy..."
 	icon_state = "slippers_worn"
-	item_state = "slippers_worn"
+	item_state = "slippers"
 	force = 0
 	w_class = 2
 
@@ -189,6 +187,7 @@
 	desc = "Help you swim good."
 	name = "swimming fins"
 	icon_state = "flippers"
+	item_state = "galoshes"
 	item_flags = NOSLIP
 	slowdown = SHOES_SLOWDOWN+1
 	species_restricted = null
@@ -197,7 +196,6 @@
 	name = "winter boots"
 	desc = "Boots lined with 'synthetic' animal fur."
 	icon_state = "winterboots"
-	item_state = "winterboots"
 	cold_protection = FEET|LEGS
 	min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE
 	heat_protection = FEET|LEGS

code/modules/clothing/spacesuits/alien.dm

@@ -23,8 +23,6 @@
 
 /obj/item/clothing/suit/space/skrell/white
 	icon_state = "skrell_suit_white"
-	item_state = "skrell_suit_white"
 
 /obj/item/clothing/suit/space/skrell/black
 	icon_state = "skrell_suit_black"
-	item_state = "skrell_suit_black"

code/modules/clothing/spacesuits/captain.dm

@@ -1,29 +0,0 @@
-//Captain's Spacesuit
-/obj/item/clothing/head/helmet/space/capspace
-	name = "space helmet"
-	icon_state = "capspace"
-	item_state = "capspace"
-	desc = "A special helmet designed for work in a hazardous, low-pressure environment. Only for the most fashionable of military figureheads."
-	item_flags = STOPPRESSUREDAMAGE
-	flags_inv = HIDEFACE|BLOCKHAIR
-	permeability_coefficient = 0.01
-	armor = list(melee = 65, bullet = 50, laser = 50,energy = 25, bomb = 50, bio = 100, rad = 50)
-
-//Captain's space suit This is not the proper path but I don't currently know enough about how this all works to mess with it.
-/obj/item/clothing/suit/armor/captain
-	name = "Captain's armor"
-	desc = "A bulky, heavy-duty piece of exclusive corporate armor. YOU are in charge!"
-	icon_state = "caparmor"
-	item_state = "capspacesuit"
-	w_class = 5
-	gas_transfer_coefficient = 0.01
-	permeability_coefficient = 0.02
-	item_flags = STOPPRESSUREDAMAGE
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
-	allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
-	slowdown = 1.5
-	armor = list(melee = 65, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50)
-	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
-	cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
-	min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
-	siemens_coefficient = 0.7

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -2,9 +2,9 @@
 /obj/item/clothing/head/helmet/space/capspace
 	name = "space helmet"
 	icon_state = "capspace"
-	item_state = "capspace"
 	desc = "A special helmet designed for work in a hazardous, low-pressure environment. Only for the most fashionable of military figureheads."
-	flags_inv = HIDEFACE
+	item_flags = STOPPRESSUREDAMAGE
+	flags_inv = HIDEFACE|BLOCKHAIR
 	permeability_coefficient = 0.01
 	armor = list(melee = 65, bullet = 50, laser = 50,energy = 25, bomb = 50, bio = 100, rad = 50)
 
@@ -13,8 +13,7 @@
 	name = "Captain's armor"
 	desc = "A bulky, heavy-duty piece of exclusive corporate armor. YOU are in charge!"
 	icon_state = "caparmor"
-	item_state = "capspacesuit"
-	w_class = 4
+	w_class = 5
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.02
 	item_flags = STOPPRESSUREDAMAGE
@@ -32,10 +31,7 @@
 	name = "deathsquad helmet"
 	desc = "That's not red paint. That's real blood."
 	icon_state = "deathsquad"
-	item_state_slots = list(
-		slot_l_hand_str = "syndicate-helm-black-red",
-		slot_r_hand_str = "syndicate-helm-black-red",
-		)
+	item_state = "syndicate-helm-black-red"
 	armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 100, rad = 60)
 	item_flags = STOPPRESSUREDAMAGE | THICKMATERIAL
 	flags_inv = BLOCKHAIR
@@ -46,6 +42,7 @@
 	name = "officer's beret"
 	desc = "An armored beret commonly used by special operations officers."
 	icon_state = "beret_badge"
+	item_state = "beret"
 	armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 30, rad = 30)
 	item_flags = STOPPRESSUREDAMAGE
 	flags_inv = BLOCKHAIR
@@ -56,7 +53,6 @@
 	name = "Santa's hat"
 	desc = "Ho ho ho. Merrry X-mas!"
 	icon_state = "santahat"
-	item_state = "santahat"
 	item_flags = STOPPRESSUREDAMAGE
 	flags_inv = BLOCKHAIR
 	body_parts_covered = HEAD
@@ -65,7 +61,6 @@
 	name = "Santa's suit"
 	desc = "Festive!"
 	icon_state = "santa"
-	item_state = "santa"
 	slowdown = 0
 	item_flags = STOPPRESSUREDAMAGE
 	allowed = list(/obj/item) //for stuffing exta special presents
@@ -75,7 +70,6 @@
 	name = "pirate hat"
 	desc = "Yarr."
 	icon_state = "pirate"
-	item_state = "pirate"
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
 	item_flags = STOPPRESSUREDAMAGE
 	flags_inv = BLOCKHAIR
@@ -86,7 +80,6 @@
 	name = "pirate coat"
 	desc = "Yarr."
 	icon_state = "pirate"
-	item_state = "pirate"
 	w_class = 3
 	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
 	slowdown = 0
@@ -97,14 +90,12 @@
 //Orange emergency space suit
 /obj/item/clothing/head/helmet/space/emergency
 	name = "Emergency Space Helmet"
-	icon_state = "emergencyhelm"
-	item_state = "emergencyhelm"
+	icon_state = "syndicate-helm-orange"
 	desc = "A simple helmet with a built in light, smells like mothballs."
 
 
 /obj/item/clothing/suit/space/emergency
 	name = "Emergency Softsuit"
 	icon_state = "syndicate-orange"
-	item_state = "syndicate-orange"
 	desc = "A thin, ungainly softsuit colored in blaze orange for rescuers to easily locate, looks pretty fragile."
 	slowdown = 4

code/modules/clothing/spacesuits/spacesuits.dm

@@ -7,10 +7,6 @@
 	icon_state = "space"
 	desc = "A special helmet designed for work in a hazardous, low-pressure environment."
 	item_flags = STOPPRESSUREDAMAGE | THICKMATERIAL | AIRTIGHT
-	item_state_slots = list(
-		slot_l_hand_str = "s_helmet",
-		slot_r_hand_str = "s_helmet",
-		)
 	permeability_coefficient = 0.01
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
@@ -50,7 +46,6 @@
 	name = "Space suit"
 	desc = "A suit that protects against low pressure environments. \""+station_short+"\" is written in large block letters on the back."
 	icon_state = "space"
-	item_state = "s_suit"
 	w_class = 5 // So you can't fit this in your bag and be prepared at all times.
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.02

code/modules/clothing/spacesuits/syndi.dm

@@ -2,7 +2,6 @@
 /obj/item/clothing/head/helmet/space/syndicate
 	name = "red space helmet"
 	icon_state = "syndicate"
-	item_state = "syndicate"
 	desc = "A crimson helmet sporting clean lines and durable plating. Engineered to look menacing."
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
 	siemens_coefficient = 0.6
@@ -10,7 +9,6 @@
 /obj/item/clothing/suit/space/syndicate
 	name = "red space suit"
 	icon_state = "syndicate"
-	item_state = "space_suit_syndicate"
 	desc = "A crimson spacesuit sporting clean lines and durable plating. Robust, reliable, and slightly suspicious."
 	w_class = 3
 	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
@@ -18,154 +16,122 @@
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
 	siemens_coefficient = 0.6
 
-
 //Green syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/green
 	name = "green space helmet"
 	desc = "A green helmet sporting clean lines and durable plating. Engineered to look menacing."
 	icon_state = "syndicate-helm-green"
-	item_state = "syndicate-helm-green"
 
 /obj/item/clothing/suit/space/syndicate/green
 	name = "green space suit"
 	desc = "A green spacesuit sporting clean lines and durable plating. Robust, reliable, and slightly suspicious."
 	icon_state = "syndicate-green"
-	item_state = "syndicate-green"
-
 
 //Dark green syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/green/dark
 	name = "dark green space helmet"
 	desc = "A dark green helmet sporting clean lines and durable plating. Engineered to look menacing."
 	icon_state = "syndicate-helm-green-dark"
-	item_state = "syndicate-helm-green-dark"
 
 /obj/item/clothing/suit/space/syndicate/green/dark
 	name = "dark green space suit"
 	desc = "A dark green spacesuit sporting clean lines and durable plating. Robust, reliable, and slightly suspicious."
 	icon_state = "syndicate-green-dark"
-	item_state = "syndicate-green-dark"
-
 	
 //Orange syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/orange
 	name = "orange space helmet"
 	desc = "An orange helmet sporting clean lines and durable plating. Engineered to look menacing."
 	icon_state = "syndicate-helm-orange"
-	item_state = "syndicate-helm-orange"
 
 /obj/item/clothing/suit/space/syndicate/orange
 	name = "orange space suit"
 	desc = "An orange spacesuit sporting clean lines and durable plating. Robust, reliable, and slightly suspicious."
 	icon_state = "syndicate-orange"
-	item_state = "syndicate-orange"
-
 
 //Blue syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/blue
 	name = "blue space helmet"
 	desc = "A blue helmet sporting clean lines and durable plating. Engineered to look menacing."
 	icon_state = "syndicate-helm-blue"
-	item_state = "syndicate-helm-blue"
 
 /obj/item/clothing/suit/space/syndicate/blue
 	name = "blue space suit"
 	desc = "A blue spacesuit sporting clean lines and durable plating. Robust, reliable, and slightly suspicious."
 	icon_state = "syndicate-blue"
-	item_state = "syndicate-blue"
-
 
 //Black syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/black
 	name = "black space helmet"
 	desc = "A black helmet sporting durable plating. Engineered to look menacing."
 	icon_state = "syndicate-helm-black"
-	item_state = "syndicate-helm-black"
 
 /obj/item/clothing/suit/space/syndicate/black
 	name = "black space suit"
 	desc = "A black spacesuit sporting durable plating. Robust, reliable, and slightly suspicious."
 	icon_state = "syndicate-black"
-	item_state = "syndicate-black"
-
 
 //Black-green syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/black/green
 	name = "black and green space helmet"
 	desc = "A black helmet sporting a single green stripe and durable plating. Engineered to look menacing."
 	icon_state = "syndicate-helm-black-green"
-	item_state = "syndicate-helm-black-green"
 
 /obj/item/clothing/suit/space/syndicate/black/green
 	name = "black and green space suit"
 	desc = "A black spacesuit sporting green stripes and durable plating. Robust, reliable, and slightly suspicious."
 	icon_state = "syndicate-black-green"
-	item_state = "syndicate-black-green"
-
 
 //Black-blue syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/black/blue
 	name = "black and blue space helmet"
 	desc = "A black helmet sporting a single blue stripe and durable plating. Engineered to look menacing."
 	icon_state = "syndicate-helm-black-blue"
-	item_state = "syndicate-helm-black-blue"
 
 /obj/item/clothing/suit/space/syndicate/black/blue
 	name = "black and blue space suit"
 	desc = "A black spacesuit sporting blue stripes and durable plating. Robust, reliable, and slightly suspicious."
 	icon_state = "syndicate-black-blue"
-	item_state = "syndicate-black-blue"
-
 
 //Black medical syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/black/med
 	name = "black medical space helmet"
 	desc = "A black helmet sporting a medical cross and durable plating. Hopefully the wearer abides by space geneva."
 	icon_state = "syndicate-helm-black-med"
-	item_state_slots = list(slot_head_str = "syndicate-helm-black-med")
 
 /obj/item/clothing/suit/space/syndicate/black/med
 	name = "black medical space suit"
 	desc = "A black spacesuit sporting a medical cross and durable plating. Robust, reliable, and slightly suspicious."
 	icon_state = "syndicate-black-med"
-	item_state = "syndicate-black"
-
 
 //Black-orange syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/black/orange
 	name = "black and orange space helmet"
 	icon_state = "syndicate-helm-black-orange"
-	item_state_slots = list(slot_head_str = "syndicate-helm-black-orange")
 
 /obj/item/clothing/suit/space/syndicate/black/orange
 	name = "black and orange space suit"
 	desc = "A black spacesuit sporting orange stripes and durable plating. Robust, reliable, and slightly suspicious."
 	icon_state = "syndicate-black-orange"
-	item_state = "syndicate-black"
-
 
 //Black-red syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/black/red
 	name = "black and red space helmet"
 	desc = "A black helmet sporting a single red stripe and durable plating. Engineered to look menacing."
 	icon_state = "syndicate-helm-black-red"
-	item_state = "syndicate-helm-black-red"
 	
 /obj/item/clothing/suit/space/syndicate/black/red
 	name = "black and red space suit"
 	desc = "A black spacesuit sporting red stripes and durable plating. Robust, reliable, and slightly suspicious."
 	icon_state = "syndicate-black-red"
-	item_state = "syndicate-black-red"
 
 //Black with yellow/red engineering syndicate space suit
 /obj/item/clothing/head/helmet/space/syndicate/black/engie
 	name = "black engineering space helmet"
 	desc = "A black helmet sporting red and yellow stripes and durable plating. Engineered to look well... engineering-ish."
 	icon_state = "syndicate-helm-black-engie"
-	item_state_slots = list(slot_head_str = "syndicate-helm-black-engie")
 
 /obj/item/clothing/suit/space/syndicate/black/engie
 	name = "black engineering space suit"
 	desc = "A black spacesuit sporting red and yellow stripes and durable plating. Robust, reliable, and slightly suspicious."
 	icon_state = "syndicate-black-engie"
-	item_state = "syndicate-black"

code/modules/clothing/spacesuits/void/merc.dm

@@ -3,7 +3,7 @@
 	name = "blood-red voidsuit helmet"
 	desc = "An advanced helmet designed for work in special operations. Property of Gorlex Marauders."
 	icon_state = "rig0-syndie"
-	item_state = "rig0-syndie"
+	item_state = "syndie_helm"
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60)
 	siemens_coefficient = 0.6
 	species_restricted = list("Human")

code/modules/clothing/spacesuits/void/station.dm

@@ -1,13 +1,10 @@
 // Station voidsuits
-//Engineering rig
+//Engineering
 /obj/item/clothing/head/helmet/space/void/engineering
 	name = "engineering voidsuit helmet"
 	desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding."
 	icon_state = "rig0-engineering"
-	item_state_slots = list(
-		slot_l_hand_str = "eng_helm",
-		slot_r_hand_str = "eng_helm",
-		)
+	item_state = "eng_helm"
 	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 80)
 
 /obj/item/clothing/suit/space/void/engineering
@@ -19,83 +16,71 @@
 	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 80)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
 
-//Mining rig
+//Mining
 /obj/item/clothing/head/helmet/space/void/mining
 	name = "mining voidsuit helmet"
 	desc = "A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating."
 	icon_state = "rig0-mining"
-	item_state_slots = list(
-		slot_l_hand_str = "mining_helm",
-		slot_r_hand_str = "mining_helm",
-		)
+	item_state = "mining_helm"
 	armor = list(melee = 50, bullet = 5, laser = 20,energy = 5, bomb = 55, bio = 100, rad = 20)
 	light_overlay = "helmet_light_dual"
 
 /obj/item/clothing/suit/space/void/mining
-	icon_state = "rig-mining"
 	name = "mining voidsuit"
 	desc = "A special suit that protects against hazardous, low pressure environments. Has reinforced plating."
+	icon_state = "rig-mining"
 	item_state = "mining_voidsuit"
 	armor = list(melee = 50, bullet = 5, laser = 20,energy = 5, bomb = 55, bio = 100, rad = 20)
 
-//Medical Rig
+//Medical
 /obj/item/clothing/head/helmet/space/void/medical
 	name = "medical voidsuit helmet"
 	desc = "A special helmet designed for work in a hazardous, low pressure environment. Has minor radiation shielding."
 	icon_state = "rig0-medical"
-	item_state_slots = list(
-		slot_l_hand_str = "medical_helm",
-		slot_r_hand_str = "medical_helm",
-		)
+	item_state = "medical_helm"
 	armor = list(melee = 30, bullet = 5, laser = 20,energy = 5, bomb = 25, bio = 100, rad = 50)
 
 /obj/item/clothing/suit/space/void/medical
-	icon_state = "rig-medical"
 	name = "medical voidsuit"
 	desc = "A special suit that protects against hazardous, low pressure environments. Has minor radiation shielding."
+	icon_state = "rig-medical"
 	item_state = "medical_voidsuit"
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical)
 	armor = list(melee = 30, bullet = 5, laser = 20,energy = 5, bomb = 25, bio = 100, rad = 50)
 
-	//Security
+//Security
 /obj/item/clothing/head/helmet/space/void/security
 	name = "security voidsuit helmet"
 	desc = "A special helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor."
 	icon_state = "rig0-sec"
-	item_state_slots = list(
-		slot_l_hand_str = "sec_helm",
-		slot_r_hand_str = "sec_helm",
-		)
+	item_state = "sec_helm"
 	armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10)
 	siemens_coefficient = 0.7
 	light_overlay = "helmet_light_dual"
 
 /obj/item/clothing/suit/space/void/security
-	icon_state = "rig-sec"
 	name = "security voidsuit"
 	desc = "A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor."
+	icon_state = "rig-sec"
 	item_state = "sec_voidsuit"
 	armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10)
 	allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/melee/baton)
 	siemens_coefficient = 0.7
 
-//Atmospherics Rig (BS12)
+//Atmospherics
 /obj/item/clothing/head/helmet/space/void/atmos
 	desc = "A special helmet designed for work in a hazardous, low pressure environments. Has improved thermal protection and minor radiation shielding."
 	name = "atmospherics voidsuit helmet"
 	icon_state = "rig0-atmos"
-	item_state_slots = list(
-		slot_l_hand_str = "atmos_helm",
-		slot_r_hand_str = "atmos_helm",
-		)
+	item_state = "atmos_helm"
 	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 50)
 	max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
 	light_overlay = "helmet_light_dual"
 
 /obj/item/clothing/suit/space/void/atmos
+	name = "atmos voidsuit"
 	desc = "A special suit that protects against hazardous, low pressure environments. Has improved thermal protection and minor radiation shielding."
 	icon_state = "rig-atmos"
-	name = "atmos voidsuit"
 	item_state = "atmos_voidsuit"
 	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 50)
 	max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE

code/modules/clothing/spacesuits/void/void.dm

@@ -3,7 +3,7 @@
 	name = "void helmet"
 	desc = "A high-tech dark red space suit helmet. Used for AI satellite maintenance."
 	icon_state = "void"
-
+	item_state = "syndicate"
 	heat_protection = HEAD
 	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 20)
 	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
@@ -30,7 +30,7 @@
 /obj/item/clothing/suit/space/void
 	name = "voidsuit"
 	icon_state = "void"
-	item_state = "void"
+	item_state = "space_suit_syndicate"
 	desc = "A high-tech dark red space suit. Used for AI satellite maintenance."
 	slowdown = 1
 	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 20)

code/modules/clothing/spacesuits/void/wizard.dm

@@ -3,10 +3,7 @@
 	name = "gem-encrusted voidsuit helmet"
 	desc = "A bizarre gem-encrusted helmet that radiates magical energies."
 	icon_state = "rig0-wiz"
-	item_state_slots = list(
-		slot_l_hand_str = "wiz_helm",
-		slot_r_hand_str = "wiz_helm",
-		)
+	item_state = "wiz_helm"
 	unacidable = 1 //No longer shall our kind be foiled by lone chemists with spray bottles!
 	armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60)
 	siemens_coefficient = 0.7

code/modules/clothing/suits/alien.dm

@@ -1,30 +1,26 @@
 //Unathi clothing.
-
 /obj/item/clothing/suit/unathi/robe
 	name = "roughspun robes"
 	desc = "A traditional Unathi garment."
 	icon_state = "robe-unathi"
-	item_state = "robe-unathi"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
 
 /obj/item/clothing/suit/unathi/mantle
 	name = "hide mantle"
 	desc = "A rather grisly selection of cured hides and skin, sewn together to form a ragged mantle."
 	icon_state = "mantle-unathi"
-	item_state = "mantle-unathi"
 	body_parts_covered = UPPER_TORSO
 
 //Taj clothing.
-
 /obj/item/clothing/suit/tajaran/furs
 	name = "heavy furs"
 	desc = "A traditional Zhan-Khazan garment."
 	icon_state = "zhan_furs"
-	item_state = "zhan_furs"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
 
 /obj/item/clothing/head/tajaran/scarf
 	name = "headscarf"
 	desc = "A scarf of coarse fabric. Seems to have ear-holes."
 	icon_state = "zhan_scarf"
+	item_state = "beret_white"
 	body_parts_covered = HEAD|FACE

code/modules/clothing/suits/armor.dm

@@ -1,4 +1,3 @@
-
 /obj/item/clothing/suit/armor
 	allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/flashlight/maglight)
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
@@ -25,7 +24,6 @@
 	name = "armor"
 	desc = "An armored vest that protects against some damage."
 	icon_state = "armor"
-	item_state = "armor"
 	blood_overlay_type = "armor"
 	armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 10, bio = 0, rad = 0)
 
@@ -33,7 +31,7 @@
 	name = "security armor"
 	desc = "An armored vest that protects against some damage. This one has a NanoTrasen corporate badge."
 	icon_state = "armoralt"
-	item_state = "armoralt"
+	item_state = "armor"
 
 /obj/item/clothing/suit/armor/vest/security
 	name = "security armor"
@@ -45,14 +43,12 @@
 	name = "Warden's jacket"
 	desc = "An armoured jacket with silver rank pips and livery."
 	icon_state = "warden_jacket"
-	item_state = "armor"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
 
 /obj/item/clothing/suit/armor/vest/warden/alt
 	name = "Warden's jacket"
 	desc = "An armoured jacket with silver rank pips and livery."
 	icon_state = "warden_alt"
-	item_state = "warden_alt"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
 
 
@@ -60,7 +56,7 @@
 	name = "riot vest"
 	desc = "A vest with heavy padding to protect against melee attacks."
 	icon_state = "riot"
-	item_state = "swat_suit"
+	item_state = "swat"
 	slowdown = 1
 	armor = list(melee = 80, bullet = 10, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
 	flags_inv = HIDEJUMPSUIT
@@ -88,7 +84,6 @@
 	name = "ablative armor vest"
 	desc = "A vest that excels in protecting the wearer against energy projectiles."
 	icon_state = "armor_reflec"
-	item_state = "armor_reflec"
 	blood_overlay_type = "armor"
 	armor = list(melee = 10, bullet = 10, laser = 80, energy = 50, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.1
@@ -118,7 +113,6 @@
 	name = "combat vest"
 	desc = "A vest that protects the wearer from several common types of weaponry."
 	icon_state = "combat"
-	item_state = "combat"
 	blood_overlay_type = "armor"
 	armor = list(melee = 50, bullet = 50, laser = 50, energy = 30, bomb = 30, bio = 0, rad = 0)
 	siemens_coefficient = 0.6
@@ -127,7 +121,7 @@
 	name = "tactical armor"
 	desc = "A suit of armor most often used by Special Weapons and Tactics squads. Includes padded vest with pockets along with shoulder and kneeguards."
 	icon_state = "swatarmor"
-	item_state = "armor"
+	item_state = "swat"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	slowdown = 1
 	armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0)
@@ -137,7 +131,7 @@
 	name = "swat suit"
 	desc = "A heavily armored suit that protects against moderate damage. Used in special operations."
 	icon_state = "deathsquad"
-	item_state = "swat_suit"
+	item_state = "swat"
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
 	item_flags = STOPPRESSUREDAMAGE | THICKMATERIAL
@@ -156,7 +150,7 @@
 	name = "officer jacket"
 	desc = "An armored jacket used in special operations."
 	icon_state = "detective"
-	item_state = "det_suit"
+	item_state = "detective"
 	blood_overlay_type = "coat"
 	flags_inv = 0
 	body_parts_covered = UPPER_TORSO|ARMS
@@ -179,7 +173,7 @@
 	desc = "Someone separated our Research Director from their own head!"
 	var/active = 0.0
 	icon_state = "reactiveoff"
-	item_state = "reactiveoff"
+	item_state = "armor_reflec_old"
 	blood_overlay_type = "armor"
 	slowdown = 1
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
@@ -208,22 +202,19 @@
 	return 0
 
 /obj/item/clothing/suit/armor/reactive/attack_self(mob/user as mob)
-	src.active = !( src.active )
-	if (src.active)
+	active = !( active )
+	if (active)
 		user << "\blue The reactive armor is now active."
-		src.icon_state = "reactive"
-		src.item_state = "reactive"
+		icon_state = "reactive"
 	else
 		user << "\blue The reactive armor is now inactive."
-		src.icon_state = "reactiveoff"
-		src.item_state = "reactiveoff"
-		src.add_fingerprint(user)
+		icon_state = "reactiveoff"
+		add_fingerprint(user)
 	return
 
 /obj/item/clothing/suit/armor/reactive/emp_act(severity)
 	active = 0
-	src.icon_state = "reactiveoff"
-	src.item_state = "reactiveoff"
+	icon_state = "reactiveoff"
 	..()
 
 //Non-hardsuit ERT armor.
@@ -263,7 +254,7 @@
 	name = "armor vest"
 	desc = "A simple kevlar plate carrier."
 	icon_state = "kvest"
-	item_state = "kvest"
+	item_state = "armor"
 	armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 10, bio = 0, rad = 0)
 	allowed = list(/obj/item/weapon/gun,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/flashlight/maglight)
 
@@ -280,7 +271,7 @@
 	name = "officer armor vest"
 	desc = "A simple kevlar plate carrier. This one has a security holobadge clipped to the chest."
 	icon_state = "officervest_nobadge"
-	item_state = "officervest_nobadge"
+	item_state = "armor"
 	icon_badge = "officervest_badge"
 	icon_nobadge = "officervest_nobadge"
 
@@ -288,7 +279,7 @@
 	name = "warden armor vest"
 	desc = "A simple kevlar plate carrier. This one has a silver badge clipped to the chest."
 	icon_state = "wardenvest_nobadge"
-	item_state = "wardenvest_nobadge"
+	item_state = "armor"
 	icon_badge = "wardenvest_badge"
 	icon_nobadge = "wardenvest_nobadge"
 
@@ -296,7 +287,7 @@
 	name = "head of security armor vest"
 	desc = "A simple kevlar plate carrier. This one has a gold badge clipped to the chest."
 	icon_state = "hosvest_nobadge"
-	item_state = "hosvest_nobadge"
+	item_state = "armor"
 	icon_badge = "hosvest_badge"
 	icon_nobadge = "hosvest_nobadge"
 
@@ -304,7 +295,7 @@
 	name = "PCRC armor vest"
 	desc = "A simple kevlar plate carrier belonging to Proxima Centauri Risk Control. This one has a PCRC crest clipped to the chest."
 	icon_state = "pcrcvest_nobadge"
-	item_state = "pcrcvest_nobadge"
+	item_state = "armor"
 	icon_badge = "pcrcvest_badge"
 	icon_nobadge = "pcrcvest_nobadge"
 
@@ -312,7 +303,7 @@
 	name = "detective armor vest"
 	desc = "A simple kevlar plate carrier in a vintage brown, it has a badge clipped to the chest that reads, 'Private investigator'."
 	icon_state = "detectivevest_nobadge"
-	item_state = "detectivevest_nobadge"
+	item_state = "armor"
 	icon_badge = "detectivevest_badge"
 	icon_nobadge = "detectivevest_nobadge"
 
@@ -320,7 +311,7 @@
 	name = "heavy armor vest"
 	desc = "A heavy kevlar plate carrier with webbing attached."
 	icon_state = "webvest"
-	item_state = "webvest"
+	item_state = "swat"
 	armor = list(melee = 50, bullet = 40, laser = 40, energy = 25, bomb = 25, bio = 0, rad = 0)
 	slowdown = 1
 
@@ -328,7 +319,7 @@
 	name = "officer heavy armor vest"
 	desc = "A heavy kevlar plate carrier with webbing attached. This one has a security holobadge clipped to the chest."
 	icon_state = "officerwebvest_nobadge"
-	item_state = "officerwebvest_nobadge"
+	item_state = "swat"
 	icon_badge = "officerwebvest_badge"
 	icon_nobadge = "officerwebvest_nobadge"
 
@@ -336,7 +327,7 @@
 	name = "warden heavy armor vest"
 	desc = "A heavy kevlar plate carrier with webbing attached. This one has a silver badge clipped to the chest."
 	icon_state = "wardenwebvest_nobadge"
-	item_state = "wardenwebvest_nobadge"
+	item_state = "swat"
 	icon_badge = "wardenwebvest_badge"
 	icon_nobadge = "wardenwebvest_nobadge"
 
@@ -344,7 +335,7 @@
 	name = "head of security heavy armor vest"
 	desc = "A heavy kevlar plate carrier with webbing attached. This one has a gold badge clipped to the chest."
 	icon_state = "hoswebvest_nobadge"
-	item_state = "hoswebvest_nobadge"
+	item_state = "swat"
 	icon_badge = "hoswebvest_badge"
 	icon_nobadge = "hoswebvest_nobadge"
 
@@ -352,7 +343,7 @@
 	name = "PCRC heavy armor vest"
 	desc = "A heavy kevlar plate carrier belonging to Proxima Centauri Risk Control with webbing attached. This one has a PCRC crest clipped to the chest."
 	icon_state = "pcrcwebvest_nobadge"
-	item_state = "pcrcwebvest_nobadge"
+	item_state = "swat"
 	icon_badge = "pcrcwebvest_badge"
 	icon_nobadge = "pcrcwebvest_nobadge"
 
@@ -361,18 +352,17 @@
 	name = "heavy armor vest"
 	desc = "A high-quality heavy kevlar plate carrier in a fetching tan. The vest is surprisingly flexible, and possibly made of an advanced material."
 	icon_state = "mercwebvest"
-	item_state = "mercwebvest"
+	item_state = "swat"
 	armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0)
 	slowdown = 0
 
 //All of the armor below is mostly unused
 
-
 /obj/item/clothing/suit/armor/centcomm
 	name = "Cent. Com. armor"
 	desc = "A suit that protects against some damage."
 	icon_state = "centcom"
-	item_state = "centcom"
+	item_state = "armor"
 	w_class = 4//bulky item
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
@@ -385,7 +375,7 @@
 	name = "heavy armor"
 	desc = "A heavily armored suit that protects against moderate damage."
 	icon_state = "heavy"
-	item_state = "swat_suit"
+	item_state = "swat"
 	armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0)
 	w_class = 4//bulky item
 	gas_transfer_coefficient = 0.90
@@ -403,12 +393,10 @@
 	name = "Thunderdome suit (red)"
 	desc = "Reddish armor."
 	icon_state = "tdred"
-	item_state = "tdred"
 	siemens_coefficient = 1
 
 /obj/item/clothing/suit/armor/tdome/green
 	name = "Thunderdome suit (green)"
 	desc = "Pukish armor."
 	icon_state = "tdgreen"
-	item_state = "tdgreen"
 	siemens_coefficient = 1

code/modules/clothing/suits/bio.dm

@@ -2,10 +2,6 @@
 /obj/item/clothing/head/bio_hood
 	name = "bio hood"
 	icon_state = "bio"
-	item_state_slots = list(
-		slot_l_hand_str = "bio_hood",
-		slot_r_hand_str = "bio_hood",
-		)
 	desc = "A hood that protects the head and face from biological comtaminants."
 	permeability_coefficient = 0.01
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20)
@@ -17,7 +13,6 @@
 	name = "bio suit"
 	desc = "A suit that protects against biological contamination."
 	icon_state = "bio"
-	item_state = "bio_suit"
 	w_class = 4//bulky item
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
@@ -28,14 +23,15 @@
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
 	siemens_coefficient = 0.9
 
-
 //Standard biosuit, orange stripe
 /obj/item/clothing/head/bio_hood/general
 	icon_state = "bio_general"
+	item_state = "bio"
 	body_parts_covered = HEAD|FACE|EYES
 
 /obj/item/clothing/suit/bio_suit/general
 	icon_state = "bio_general"
+	item_state = "bio"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	flags_inv = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL
 
@@ -66,7 +62,6 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	flags_inv = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL
 
-
 //Scientist's biosuit, white with a pink-ish hue
 /obj/item/clothing/head/bio_hood/scientist
 	icon_state = "bio_scientist"
@@ -85,11 +80,10 @@
 /obj/item/clothing/head/bio_hood/cmo
 	icon_state = "bio_cmo"
 
-
 //Plague Dr mask can be found in clothing/masks/gasmask.dm
 /obj/item/clothing/suit/bio_suit/plaguedoctorsuit
 	name = "Plague doctor suit"
 	desc = "It protected doctors from the Black Death, back then. You bet your arse it's gonna help you against viruses."
 	icon_state = "plaguedoctor"
-	item_state = "bio_suit"
+	item_state = "bio"
 	flags_inv = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL

code/modules/clothing/suits/jobs.dm

@@ -7,7 +7,7 @@
 	name = "apron"
 	desc = "A basic blue apron."
 	icon_state = "apron"
-	item_state = "apron"
+	item_state = "overalls"
 	blood_overlay_type = "armor"
 	body_parts_covered = 0
 	allowed = list (/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/analyzer/plant_analyzer,/obj/item/seeds,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/material/minihoe)
@@ -17,7 +17,6 @@
 	name = "captain's parade tunic"
 	desc = "Worn by a Captain to show their class."
 	icon_state = "captunic"
-	item_state = "captunic"
 	body_parts_covered = UPPER_TORSO|ARMS
 	flags_inv = HIDEJUMPSUIT
 
@@ -25,7 +24,6 @@
 	name = "captain's uniform jacket"
 	desc = "A less formal jacket for everyday captain use."
 	icon_state = "capjacket"
-	item_state = "capjacket"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	flags_inv = HIDEJUMPSUIT
 
@@ -34,7 +32,7 @@
 	name = "chaplain hoodie"
 	desc = "This suit says to you 'hush'!"
 	icon_state = "chaplain_hoodie"
-	item_state = "chaplain_hoodie"
+	item_state = "suit_black"
 	body_parts_covered = UPPER_TORSO|ARMS
 
 //Chaplain
@@ -42,7 +40,6 @@
 	name = "nun robe"
 	desc = "Maximum piety in this star system."
 	icon_state = "nun"
-	item_state = "nun"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	flags_inv = HIDESHOES|HIDEJUMPSUIT
 
@@ -51,7 +48,6 @@
 	name = "chef's apron"
 	desc = "An apron used by a high class chef."
 	icon_state = "chef"
-	item_state = "chef"
 	gas_transfer_coefficient = 0.90
 	permeability_coefficient = 0.50
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
@@ -62,7 +58,6 @@
 	name = "classic chef's apron"
 	desc = "A basic, dull, white chef's apron."
 	icon_state = "apronchef"
-	item_state = "apronchef"
 	blood_overlay_type = "armor"
 	body_parts_covered = 0
 
@@ -71,21 +66,21 @@
 	name = "security officer's jacket"
 	desc = "This jacket is for those special occasions when a security officer actually feels safe."
 	icon_state = "officerbluejacket"
-	item_state = "officerbluejacket"
+	item_state = "suit_navy"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
 /obj/item/clothing/suit/security/navywarden
 	name = "warden's jacket"
 	desc = "Perfectly suited for the warden that wants to leave an impression of style on those who visit the brig."
 	icon_state = "wardenbluejacket"
-	item_state = "wardenbluejacket"
+	item_state = "suit_navy"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
 /obj/item/clothing/suit/security/navyhos
 	name = "head of security's jacket"
 	desc = "This piece of clothing was specifically designed for asserting superior authority."
 	icon_state = "hosbluejacket"
-	item_state = "hosbluejacket"
+	item_state = "suit_navy"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
 //Detective
@@ -93,7 +88,6 @@
 	name = "brown trenchcoat"
 	desc = "A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. The coat is externally impact resistant - perfect for your next act of autodefenestration!"
 	icon_state = "detective"
-	item_state = "det_suit"
 	blood_overlay_type = "coat"
 	body_parts_covered = UPPER_TORSO|ARMS
 	allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter,/obj/item/device/taperecorder,/obj/item/device/uv_light)
@@ -102,12 +96,12 @@
 /obj/item/clothing/suit/storage/det_trench/grey
 	name = "grey trenchcoat"
 	icon_state = "detective2"
+	item_state = "leather_jacket"
 
 //Forensics
 /obj/item/clothing/suit/storage/forensics
 	name = "jacket"
 	desc = "A forensics technician jacket."
-	item_state = "det_suit"
 	body_parts_covered = UPPER_TORSO|ARMS
 	allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/taperecorder,/obj/item/device/uv_light)
 	armor = list(melee = 10, bullet = 10, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0)
@@ -116,6 +110,7 @@
 	name = "red jacket"
 	desc = "A red forensics technician jacket."
 	icon_state = "forensics_red"
+	item_state = "suit_red"
 
 /obj/item/clothing/suit/storage/forensics/red/long
 	name = "long red jacket"
@@ -126,6 +121,7 @@
 	name = "blue jacket"
 	desc = "A blue forensics technician jacket."
 	icon_state = "forensics_blue"
+	item_state = "suit_navy"
 
 /obj/item/clothing/suit/storage/forensics/blue/long
 	name = "long blue jacket"
@@ -137,7 +133,6 @@
 	name = "hazard vest"
 	desc = "A high-visibility vest used in work zones."
 	icon_state = "hazard"
-	item_state = "hazard"
 	blood_overlay_type = "armor"
 	allowed = list (/obj/item/device/analyzer, /obj/item/device/flashlight, /obj/item/device/multitool, /obj/item/device/pipe_painter, /obj/item/device/radio, /obj/item/device/t_scanner, \
 	/obj/item/weapon/crowbar, /obj/item/weapon/screwdriver, /obj/item/weapon/weldingtool, /obj/item/weapon/wirecutters, /obj/item/weapon/wrench, /obj/item/weapon/tank/emergency_oxygen, \
@@ -149,7 +144,7 @@
 	name = "blue suit jacket"
 	desc = "A snappy dress jacket."
 	icon_state = "suitjacket_blue_open"
-	item_state = "suitjacket_blue_open"
+	item_state = "suit_blue"
 	icon_open = "suitjacket_blue_open"
 	icon_closed = "suitjacket_blue"
 	blood_overlay_type = "coat"
@@ -159,7 +154,7 @@
 	name = "purple suit jacket"
 	desc = "A snappy dress jacket."
 	icon_state = "suitjacket_purp_open"
-	item_state = "suitjacket_purp_open"
+	item_state = "suit_purple"
 	icon_open = "suitjacket_purp_open"
 	icon_closed = "suitjacket_purp"
 	blood_overlay_type = "coat"
@@ -170,14 +165,12 @@
 	name = "black suit jacket"
 	desc = "A smooth black jacket."
 	icon_state = "ia_jacket_open"
-	item_state = "ia_jacket"
+	item_state = "suit_black"
 	icon_open = "ia_jacket_open"
 	icon_closed = "ia_jacket"
 	blood_overlay_type = "coat"
 	body_parts_covered = UPPER_TORSO|ARMS
 
-
-
 //Medical
 /obj/item/clothing/suit/storage/toggle/fr_jacket
 	name = "first responder jacket"
@@ -195,7 +188,7 @@
 	name = "\improper EMS jacket"
 	desc = "A dark blue, martian-pattern, EMS jacket. It sports high-visibility reflective stripes and a star of life on the back."
 	icon_state = "ems_jacket_closed"
-	item_state = "ems_jacket_closed"
+	item_state = "ems_jacket"
 	icon_open = "ems_jacket_open"
 	icon_closed = "ems_jacket_closed"
 

code/modules/clothing/suits/labcoat.dm

@@ -2,7 +2,7 @@
 	name = "labcoat"
 	desc = "A suit that protects against minor chemical spills."
 	icon_state = "labcoat_open"
-	item_state = "labcoat" //Is this even used for anything?
+	item_state = "labcoat"
 	icon_open = "labcoat_open"
 	icon_closed = "labcoat"
 	blood_overlay_type = "coat"
@@ -14,65 +14,65 @@
 	name = "red labcoat"
 	desc = "A suit that protects against minor chemical spills. This one is red."
 	icon_state = "red_labcoat_open"
-	item_state = "red_labcoat"
 	icon_open = "red_labcoat_open"
 	icon_closed = "red_labcoat"
+	item_state = "red_labcoat"
 
 /obj/item/clothing/suit/storage/toggle/labcoat/blue
 	name = "blue labcoat"
 	desc = "A suit that protects against minor chemical spills. This one is blue."
 	icon_state = "blue_labcoat_open"
-	item_state = "blue_labcoat"
 	icon_open = "blue_labcoat_open"
 	icon_closed = "blue_labcoat"
+	item_state = "blue_labcoat"
 
 /obj/item/clothing/suit/storage/toggle/labcoat/purple
 	name = "purple labcoat"
 	desc = "A suit that protects against minor chemical spills. This one is purple."
 	icon_state = "purple_labcoat_open"
-	item_state = "purple_labcoat"
 	icon_open = "purple_labcoat_open"
 	icon_closed = "purple_labcoat"
+	item_state = "purple_labcoat"
 
 /obj/item/clothing/suit/storage/toggle/labcoat/orange
 	name = "orange labcoat"
 	desc = "A suit that protects against minor chemical spills. This one is orange."
 	icon_state = "orange_labcoat_open"
-	item_state = "orange_labcoat"
 	icon_open = "orange_labcoat_open"
 	icon_closed = "orange_labcoat"
+	item_state = "orange_labcoat"
 
 /obj/item/clothing/suit/storage/toggle/labcoat/green
 	name = "green labcoat"
 	desc = "A suit that protects against minor chemical spills. This one is green."
 	icon_state = "green_labcoat_open"
-	item_state = "green_labcoat"
 	icon_open = "green_labcoat_open"
 	icon_closed = "green_labcoat"
+	item_state = "green_labcoat"
 
 /obj/item/clothing/suit/storage/toggle/labcoat/yellow
 	name = "yellow labcoat"
 	desc = "A suit that protects against minor chemical spills. This one is yellow."
 	icon_state = "yellow_labcoat_open"
-	item_state = "yellow_labcoat"
 	icon_open = "yellow_labcoat_open"
 	icon_closed = "yellow_labcoat"
+	item_state = "yellow_labcoat"
 
 /obj/item/clothing/suit/storage/toggle/labcoat/pink
 	name = "pink labcoat"
 	desc = "A suit that protects against minor chemical spills. This one is pink."
 	icon_state = "pink_labcoat_open"
-	item_state = "pink_labcoat"
 	icon_open = "pink_labcoat_open"
 	icon_closed = "pink_labcoat"
+	item_state = "pink_labcoat"
 
 /obj/item/clothing/suit/storage/toggle/labcoat/cmo
 	name = "chief medical officer's labcoat"
 	desc = "Bluer than the standard model."
 	icon_state = "labcoat_cmo_open"
-	item_state = "labcoat_cmo"
 	icon_open = "labcoat_cmo_open"
 	icon_closed = "labcoat_cmo"
+	item_state = "cmo_labcoat"
 
 /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt
 	name = "chief medical officer labcoat"
@@ -80,14 +80,15 @@
 	icon_state = "labcoat_cmoalt_open"
 	icon_open = "labcoat_cmoalt_open"
 	icon_closed = "labcoat_cmoalt"
+	item_state = "cmo_labcoat"
 
 /obj/item/clothing/suit/storage/toggle/labcoat/mad
 	name = "The Mad's labcoat"
 	desc = "It makes you look capable of konking someone on the noggin and shooting them into space."
 	icon_state = "labgreen_open"
-	item_state = "labgreen"
 	icon_open = "labgreen_open"
 	icon_closed = "labgreen"
+	item_state = "green_labcoat"
 
 /obj/item/clothing/suit/storage/toggle/labcoat/genetics
 	name = "Geneticist labcoat"
@@ -95,6 +96,7 @@
 	icon_state = "labcoat_gen_open"
 	icon_open = "labcoat_gen_open"
 	icon_closed = "labcoat_gen"
+	item_state = "genetics_labcoat"
 
 /obj/item/clothing/suit/storage/toggle/labcoat/chemist
 	name = "Chemist labcoat"
@@ -102,6 +104,7 @@
 	icon_state = "labcoat_chem_open"
 	icon_open = "labcoat_chem_open"
 	icon_closed = "labcoat_chem"
+	item_state = "chemist_labcoat"
 
 /obj/item/clothing/suit/storage/toggle/labcoat/virologist
 	name = "Virologist labcoat"
@@ -109,6 +112,7 @@
 	icon_state = "labcoat_vir_open"
 	icon_open = "labcoat_vir_open"
 	icon_closed = "labcoat_vir"
+	item_state = "virologist_labcoat"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 0)
 
 /obj/item/clothing/suit/storage/toggle/labcoat/science
@@ -117,11 +121,12 @@
 	icon_state = "labcoat_tox_open"
 	icon_open = "labcoat_tox_open"
 	icon_closed = "labcoat_tox"
+	item_state = "science_labcoat"
 
 /obj/item/clothing/suit/storage/toggle/labcoat/emt
 	name = "EMT's labcoat"
 	desc = "A dark blue labcoat with reflective strips for emergency medical technicians."
 	icon_state = "labcoat_emt_open"
-	item_state = "labcoat_emt"
 	icon_open = "labcoat_emt_open"
 	icon_closed = "labcoat_emt"
+	item_state = "emt_labcoat"

code/modules/clothing/suits/miscellaneous.dm

@@ -5,6 +5,8 @@
  *		Misc
  */
 
+// -S2-note- Needs categorizing and sorting.
+
 /*
  * Lasertag
  */
@@ -12,7 +14,7 @@
 	name = "blue laser tag armour"
 	desc = "Blue Pride, Station Wide."
 	icon_state = "bluetag"
-	item_state = "bluetag"
+	item_state = "tdblue"
 	blood_overlay_type = "armor"
 	body_parts_covered = UPPER_TORSO
 	allowed = list (/obj/item/weapon/gun/energy/lasertag/blue)
@@ -22,7 +24,7 @@
 	name = "red laser tag armour"
 	desc = "Reputed to go faster."
 	icon_state = "redtag"
-	item_state = "redtag"
+	item_state = "tdred"
 	blood_overlay_type = "armor"
 	body_parts_covered = UPPER_TORSO
 	allowed = list (/obj/item/weapon/gun/energy/lasertag/red)
@@ -35,62 +37,53 @@
 	name = "pirate coat"
 	desc = "Yarr."
 	icon_state = "pirate"
-	item_state = "pirate"
+	item_state = "greatcoat"
 	body_parts_covered = UPPER_TORSO|ARMS
 
-
 /obj/item/clothing/suit/hgpirate
 	name = "pirate captain coat"
 	desc = "Yarr."
 	icon_state = "hgpirate"
-	item_state = "hgpirate"
+	item_state = "greatcoat"
 	flags_inv = HIDEJUMPSUIT
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
 
-
 /obj/item/clothing/suit/cyborg_suit
 	name = "cyborg suit"
 	desc = "Suit for a cyborg costume."
 	icon_state = "death"
-	item_state = "death"
 	flags = CONDUCT
 	fire_resist = T0C+5200
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
 	
-
 /obj/item/clothing/suit/greatcoat
 	name = "great coat"
 	desc = "A heavy great coat"
-	icon_state = "nazi"
-	item_state = "nazi"
-
+	icon_state = "gentlecoat"
+	item_state = "greatcoat"
 
 /obj/item/clothing/suit/johnny_coat
 	name = "johnny~~ coat"
 	desc = "Johnny~~"
-	icon_state = "johnny"
-	item_state = "johnny"
-
+	icon_state = "gentlecoat"
+	item_state = "johnny_coat"
 
 /obj/item/clothing/suit/justice
 	name = "justice suit"
 	desc = "This pretty much looks ridiculous."
-	icon_state = "justice"
-	item_state = "justice"
+	icon_state = "gentle_coat"
+	item_state = "greatcoat"
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET
 
-
 /obj/item/clothing/suit/judgerobe
 	name = "judge's robe"
 	desc = "This robe commands authority."
 	icon_state = "judge"
-	item_state = "judge"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	allowed = list(/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/spacecash)
 	flags_inv = HIDEJUMPSUIT
 
-
 /obj/item/clothing/suit/wcoat
 	name = "waistcoat"
 	desc = "For some classy, murderous fun."
@@ -99,19 +92,15 @@
 	blood_overlay_type = "armor"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 
-
 /obj/item/clothing/suit/apron/overalls
 	name = "coveralls"
 	desc = "A set of denim overalls."
 	icon_state = "overalls"
-	item_state = "overalls"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
 
-
 /obj/item/clothing/suit/syndicatefake
 	name = "red space suit replica"
 	icon_state = "syndicate"
-	item_state = "space_suit_syndicate"
 	desc = "A plastic replica of the syndicate space suit, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!"
 	w_class = 3
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy)
@@ -122,66 +111,56 @@
 	name = "Hastur's Robes"
 	desc = "Robes not meant to be worn by man"
 	icon_state = "hastur"
-	item_state = "hastur"
+	item_state = "rad"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
 
-
 /obj/item/clothing/suit/imperium_monk
 	name = "Imperium monk"
 	desc = "Have YOU killed a xenos today?"
 	icon_state = "imperium_monk"
-	item_state = "imperium_monk"
 	body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
 	flags_inv = HIDESHOES|HIDEJUMPSUIT
 
-
 /obj/item/clothing/suit/chickensuit
 	name = "Chicken Suit"
 	desc = "A suit made long ago by the ancient empire KFC."
 	icon_state = "chickensuit"
-	item_state = "chickensuit"
 	body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET
 	flags_inv = HIDESHOES|HIDEJUMPSUIT
 	siemens_coefficient = 2.0
 
-
 /obj/item/clothing/suit/monkeysuit
 	name = "Monkey Suit"
 	desc = "A suit that looks like a primate"
 	icon_state = "monkeysuit"
-	item_state = "monkeysuit"
+	item_state = "brown_jacket"
 	body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET|HANDS
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
 	siemens_coefficient = 2.0
 
-
 /obj/item/clothing/suit/holidaypriest
 	name = "Holiday Priest"
 	desc = "This is a nice holiday my son."
 	icon_state = "holidaypriest"
-	item_state = "holidaypriest"
+	item_state = "labcoat"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	flags_inv = HIDEJUMPSUIT
 
-
 /obj/item/clothing/suit/cardborg
 	name = "cardborg suit"
 	desc = "An ordinary cardboard box with holes cut in the sides."
 	icon_state = "cardborg"
-	item_state = "cardborg"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 	flags_inv = HIDEJUMPSUIT
 
 /*
  * Misc
  */
-
 /obj/item/clothing/suit/straight_jacket
 	name = "straight jacket"
 	desc = "A suit that completely restrains the wearer."
 	icon_state = "straight_jacket"
-	item_state = "straight_jacket"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
 
@@ -189,213 +168,138 @@
 	name = "worn shirt"
 	desc = "A worn out, curiously comfortable t-shirt with a picture of Ian. You wouldn't go so far as to say it feels like being hugged when you wear it but it's pretty close. Good for sleeping in."
 	icon_state = "ianshirt"
-	item_state = "ianshirt"
+	item_state = "labcoat" //placeholder -S2-
 	body_parts_covered = UPPER_TORSO|ARMS
 
-//pyjamas
-//originally intended to be pinstripes >.>
-
-/obj/item/clothing/under/bluepyjamas
-	name = "blue pyjamas"
-	desc = "Slightly old-fashioned sleepwear."
-	icon_state = "blue_pyjamas"
-	item_state = "blue_pyjamas"
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
-
-/obj/item/clothing/under/redpyjamas
-	name = "red pyjamas"
-	desc = "Slightly old-fashioned sleepwear."
-	icon_state = "red_pyjamas"
-	item_state = "red_pyjamas"
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
-
-//coats
-
+/*
+ * coats
+ */
 /obj/item/clothing/suit/leathercoat
 	name = "leather coat"
 	desc = "A long, thick black leather coat."
 	icon_state = "leathercoat_alt"
-	item_state = "leathercoat_alt"
+	item_state = "leather_jacket"
 
 /obj/item/clothing/suit/leathercoat/sec
 	name = "leather coat"
 	desc = "A long, thick black leather coat."
 	icon_state = "leathercoat_sec"
-	item_state = "leathercoat_sec"
+	item_state = "leather_jacket"
 
 /obj/item/clothing/suit/browncoat
 	name = "brown leather coat"
 	desc = "A long, brown leather coat."
 	icon_state = "browncoat"
-	item_state = "browncoat"
+	item_state = "brown_jacket"
 
 /obj/item/clothing/suit/neocoat
 	name = "black coat"
 	desc = "A flowing, black coat."
 	icon_state = "neocoat"
-	item_state = "neocoat"
-
-//stripper
-/obj/item/clothing/under/stripper
-	body_parts_covered = 0
-
-/obj/item/clothing/under/stripper/stripper_pink
-	name = "pink swimsuit"
-	desc = "A rather skimpy pink swimsuit."
-	icon_state = "stripper_p_under"
-	siemens_coefficient = 1
-
-/obj/item/clothing/under/stripper/stripper_green
-	name = "green swimsuit"
-	desc = "A rather skimpy green swimsuit."
-	icon_state = "stripper_g_under"
-	siemens_coefficient = 1
+	item_state = "leather_jacket"
 	
+/*
+ * stripper
+ */
 /obj/item/clothing/suit/stripper/stripper_pink
 	name = "pink skimpy dress"
 	desc = "A rather skimpy pink dress."
 	icon_state = "stripper_p_over"
+	item_state = "pink_labcoat"
 	siemens_coefficient = 1
 
 /obj/item/clothing/suit/stripper/stripper_green
 	name = "green skimpy dress"
 	desc = "A rather skimpy green dress."
 	icon_state = "stripper_g_over"
-	item_state = "stripper_g"
-	siemens_coefficient = 1
-
-/obj/item/clothing/under/stripper/mankini
-	name = "mankini"
-	desc = "No honest man would wear this abomination"
-	icon_state = "mankini"
+	item_state = "green_labcoat"
 	siemens_coefficient = 1
 
 /obj/item/clothing/suit/xenos
 	name = "xenos suit"
 	desc = "A suit made out of chitinous alien hide."
 	icon_state = "xenos"
-	item_state = "xenos_helm"
+	item_state = "black_suit"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
 	siemens_coefficient = 2.0
-//swimsuit
-/obj/item/clothing/under/swimsuit/
-	siemens_coefficient = 1
-	body_parts_covered = 0
-
-/obj/item/clothing/under/swimsuit/black
-	name = "black swimsuit"
-	desc = "An oldfashioned black swimsuit."
-	icon_state = "swim_black"
-	siemens_coefficient = 1
-
-/obj/item/clothing/under/swimsuit/blue
-	name = "blue swimsuit"
-	desc = "An oldfashioned blue swimsuit."
-	icon_state = "swim_blue"
-	siemens_coefficient = 1
-
-/obj/item/clothing/under/swimsuit/purple
-	name = "purple swimsuit"
-	desc = "An oldfashioned purple swimsuit."
-	icon_state = "swim_purp"
-	siemens_coefficient = 1
-
-/obj/item/clothing/under/swimsuit/green
-	name = "green swimsuit"
-	desc = "An oldfashioned green swimsuit."
-	icon_state = "swim_green"
-	siemens_coefficient = 1
-
-/obj/item/clothing/under/swimsuit/red
-	name = "red swimsuit"
-	desc = "An oldfashioned red swimsuit."
-	icon_state = "swim_red"
-	siemens_coefficient = 1
 
+/*
+ * Poncho
+ */
 /obj/item/clothing/suit/poncho
 	name = "poncho"
 	desc = "A simple, comfortable poncho."
 	icon_state = "classicponcho"
-	item_state = "classicponcho"
 
 /obj/item/clothing/suit/poncho/green
 	name = "green poncho"
 	desc = "A simple, comfortable cloak without sleeves. This one is green."
 	icon_state = "greenponcho"
-	item_state = "greenponcho"
 
 /obj/item/clothing/suit/poncho/red
 	name = "red poncho"
 	desc = "A simple, comfortable cloak without sleeves. This one is red."
 	icon_state = "redponcho"
-	item_state = "redponcho"
 
 /obj/item/clothing/suit/poncho/purple
 	name = "purple poncho"
 	desc = "A simple, comfortable cloak without sleeves. This one is purple."
 	icon_state = "purpleponcho"
-	item_state = "purpleponcho"
 
 /obj/item/clothing/suit/poncho/blue
 	name = "blue poncho"
 	desc = "A simple, comfortable cloak without sleeves. This one is blue."
 	icon_state = "blueponcho"
-	item_state = "blueponcho"
 
 /obj/item/clothing/suit/poncho/roles/security
 	name = "security poncho"
 	desc = "A simple, comfortable cloak without sleeves. This one is black and red, standard NanoTrasen Security colors."
 	icon_state = "secponcho"
-	item_state = "secponcho"
 
 /obj/item/clothing/suit/poncho/roles/medical
 	name = "medical poncho"
 	desc = "A simple, comfortable cloak without sleeves. This one is white with green and blue tint, standard Medical colors."
 	icon_state = "medponcho"
-	item_state = "medponcho"
 
 /obj/item/clothing/suit/poncho/roles/engineering
 	name = "engineering poncho"
 	desc = "A simple, comfortable cloak without sleeves. This one is yellow and orange, standard Engineering colors."
 	icon_state = "engiponcho"
-	item_state = "engiponcho"
 
 /obj/item/clothing/suit/poncho/roles/science
 	name = "science poncho"
 	desc = "A simple, comfortable cloak without sleeves. This one is white with purple trim, standard NanoTrasen Science colors."
 	icon_state = "sciponcho"
-	item_state = "sciponcho"
 
 /obj/item/clothing/suit/poncho/roles/cargo
 	name = "cargo poncho"
 	desc = "A simple, comfortable cloak without sleeves. This one is tan and grey, the colors of Cargo."
 	icon_state = "cargoponcho"
-	item_state = "cargoponcho"
 
 /obj/item/clothing/suit/jacket/puffer
 	name = "puffer jacket"
 	desc = "A thick jacket with a rubbery, water-resistant shell."
 	icon_state = "pufferjacket"
-	item_state = "pufferjacket"
+	item_state = "chainmail"
 
 /obj/item/clothing/suit/jacket/puffer/vest
 	name = "puffer vest"
 	desc = "A thick vest with a rubbery, water-resistant shell."
 	icon_state = "puffervest"
-	item_state = "puffervest"
+	item_state = "chainmail"
 
 /obj/item/clothing/suit/storage/miljacket
 	name = "military jacket"
 	desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable."
 	icon_state = "militaryjacket_nobadge"
-	item_state = "militaryjacket_nobadge"
+	item_state = "suit_olive"
 
 /obj/item/clothing/suit/storage/miljacket/alt
 	name = "military jacket"
 	desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable."
 	icon_state = "militaryjacket_badge"
-	item_state = "militaryjacket_badge"
+	item_state = "suit_olive"
 
 /obj/item/clothing/suit/storage/miljacket/green
 	name = "military jacket"
@@ -407,7 +311,7 @@
 	name = "bomber jacket"
 	desc = "A thick, well-worn WW2 leather bomber jacket."
 	icon_state = "bomber"
-	item_state = "bomber"
+	item_state = "brown_jacket"
 	icon_open = "bomber_open"
 	icon_closed = "bomber"
 	body_parts_covered = UPPER_TORSO|ARMS
@@ -419,7 +323,7 @@
 	name = "bomber jacket"
 	desc = "A thick, well-worn WW2 leather bomber jacket."
 	icon_state = "bomberjacket_new"
-	item_state = "bomberjacket_new"
+	item_state = "brown_jacket"
 	body_parts_covered = UPPER_TORSO|ARMS
 	cold_protection = UPPER_TORSO|ARMS
 	min_cold_protection_temperature = T0C - 20
@@ -429,16 +333,16 @@
 	name = "leather jacket"
 	desc = "A black leather coat."
 	icon_state = "leather_jacket"
-	item_state = "leather_jacket"
 	body_parts_covered = UPPER_TORSO|ARMS
 
 /obj/item/clothing/suit/storage/leather_jacket/alt
 	icon_state = "leather_jacket_alt"
-	item_state = "leather_jacket_alt"
+	item_state = "leather_jacket"
 
 /obj/item/clothing/suit/storage/leather_jacket/nanotrasen
 	desc = "A black leather coat. A corporate logo is proudly displayed on the back."
 	icon_state = "leather_jacket_nt"
+	item_state = "leather_jacket"
 
 //This one has buttons for some reason
 /obj/item/clothing/suit/storage/toggle/brown_jacket
@@ -453,6 +357,7 @@
 /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen
 	desc = "A brown leather coat. A corporate logo is proudly displayed on the back."
 	icon_state = "brown_jacket_nt"
+	item_state = "brown_jacket"
 	icon_open = "brown_jacket_nt_open"
 	icon_closed = "brown_jacket_nt"
 
@@ -460,7 +365,7 @@
 	name = "grey hoodie"
 	desc = "A warm, grey sweatshirt."
 	icon_state = "grey_hoodie"
-	item_state = "grey_hoodie"
+	item_state = "suit_grey"
 	icon_open = "grey_hoodie_open"
 	icon_closed = "grey_hoodie"
 	min_cold_protection_temperature = T0C - 20
@@ -470,7 +375,7 @@
 	name = "black hoodie"
 	desc = "A warm, black sweatshirt."
 	icon_state = "black_hoodie"
-	item_state = "black_hoodie"
+	item_state = "suit_black"
 	icon_open = "black_hoodie_open"
 	icon_closed = "black_hoodie"
 
@@ -478,7 +383,7 @@
 	name = "red hoodie"
 	desc = "A warm, red sweatshirt."
 	icon_state = "red_hoodie"
-	item_state = "red_hoodie"
+	item_state = "suit_red"
 	icon_open = "red_hoodie_open"
 	icon_closed = "red_hoodie"
 
@@ -486,7 +391,7 @@
 	name = "blue hoodie"
 	desc = "A warm, blue sweatshirt."
 	icon_state = "blue_hoodie"
-	item_state = "blue_hoodie"
+	item_state = "suit_blue"
 	icon_open = "blue_hoodie_open"
 	icon_closed = "blue_hoodie"
 
@@ -494,7 +399,7 @@
 	name = "green hoodie"
 	desc = "A warm, green sweatshirt."
 	icon_state = "green_hoodie"
-	item_state = "green_hoodie"
+	item_state = "suit_olive" //idc
 	icon_open = "green_hoodie_open"
 	icon_closed = "green_hoodie"
 
@@ -502,7 +407,7 @@
 	name = "orange hoodie"
 	desc = "A warm, orange sweatshirt."
 	icon_state = "orange_hoodie"
-	item_state = "orange_hoodie"
+	item_state = "suit_orange"
 	icon_open = "orange_hoodie_open"
 	icon_closed = "orange_hoodie"
 
@@ -510,7 +415,7 @@
 	name = "yellow hoodie"
 	desc = "A warm, yellow sweatshirt."
 	icon_state = "yellow_hoodie"
-	item_state = "yellow_hoodie"
+	item_state = "suit_yellow"
 	icon_open = "yellow_hoodie_open"
 	icon_closed = "yellow_hoodie"
 
@@ -518,7 +423,7 @@
 	name = "CTI hoodie"
 	desc = "A warm, black sweatshirt.  It bears the letters ‘CTI’ on the back, a lettering to the prestigious university in Tau Ceti, Ceti Technical Institute.  There is a blue supernova embroidered on the front, the emblem of CTI."
 	icon_state = "cti_hoodie"
-	item_state = "cti_hoodie"
+	item_state = "suit_black"
 	icon_open = "cti_hoodie_open"
 	icon_closed = "cti_hoodie"
 
@@ -526,7 +431,7 @@
 	name = "mojave university hoodie"
 	desc = "A warm, gray sweatshirt.  It bears the letters ‘MU’ on the front, a lettering to the well-known public college, Mojave University."
 	icon_state = "mu_hoodie"
-	item_state = "mu_hoodie"
+	item_state = "suit_grey"
 	icon_open = "mu_hoodie_open"
 	icon_closed = "mu_hoodie"
 
@@ -534,7 +439,7 @@
 	name = "NT hoodie"
 	desc = "A warm, blue sweatshirt.  It proudly bears the silver NanoTrasen insignia lettering on the back.  The edges are trimmed with silver."
 	icon_state = "nt_hoodie"
-	item_state = "nt_hoodie"
+	item_state = "suit_blue"
 	icon_open = "nt_hoodie_open"
 	icon_closed = "nt_hoodie"
 
@@ -542,12 +447,10 @@
 	name = "Space Mountain Wind hoodie"
 	desc = "A warm, black sweatshirt.  It has the logo for the popular softdrink Space Mountain Wind on both the front and the back."
 	icon_state = "smw_hoodie"
-	item_state = "smw_hoodie"
+	item_state = "suit_black"
 	icon_open = "smw_hoodie_open"
 	icon_closed = "smw_hoodie"
 
-// FUN!
-
 /obj/item/clothing/suit/whitedress
 	name = "white dress"
 	desc = "A fancy white dress."
@@ -560,7 +463,7 @@
 	name = "carp costume"
 	desc = "A costume made from 'synthetic' carp scales, it smells."
 	icon_state = "carp_casual"
-	item_state = "carp_casual"
+	item_state = "carp_casual" //Does not exist -S2-
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 	cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
 	min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE	//Space carp like space, so you should too
@@ -571,7 +474,7 @@
 /obj/item/clothing/head/carp_hood
 	name = "carp hood"
 	desc = "A hood attached to a carp costume."
-	icon_state = "carp_casual"
+	icon_state = "carp_casual" //Does not exist -S2-
 	body_parts_covered = HEAD
 	cold_protection = HEAD
 	min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
@@ -580,7 +483,7 @@
 	name = "corgi costume"
 	desc = "A costume that looks like someone made a human-like corgi, it won't guarantee belly rubs."
 	icon_state = "ian"
-	item_state = "ian"
+	item_state = "ian" //Does not exist -S2-
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 	//cold_protection = CHEST|GROIN|ARMS
 	//min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
@@ -592,18 +495,16 @@
 	name = "corgi hood"
 	desc = "A hood that looks just like a corgi's head, it won't guarantee dog biscuits."
 	icon_state = "ian"
-	item_state = "ian"
+	item_state = "ian" //Does not exist -S2-
 	body_parts_covered = HEAD
 	//cold_protection = HEAD
 	//min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
 
-// WINTER COATS
-
 /obj/item/clothing/suit/storage/hooded/wintercoat
 	name = "winter coat"
 	desc = "A heavy jacket made from 'synthetic' animal furs."
 	icon_state = "coatwinter"
-	item_state = "labcoat"
+	item_state = "coatwinter"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 	cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
 	min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
@@ -624,106 +525,116 @@
 /obj/item/clothing/suit/storage/hooded/wintercoat/captain
 	name = "captain's winter coat"
 	icon_state = "coatcaptain"
+	item_state = "coatcaptain"
 	armor = list(melee = 20, bullet = 15, laser = 20, energy = 10, bomb = 15, bio = 0, rad = 0)
 
 /obj/item/clothing/suit/storage/hooded/wintercoat/security
 	name = "security winter coat"
 	icon_state = "coatsecurity"
+	item_state = "coatsecurity"
 	armor = list(melee = 25, bullet = 20, laser = 20, energy = 15, bomb = 20, bio = 0, rad = 0)
 
 /obj/item/clothing/suit/storage/hooded/wintercoat/medical
 	name = "medical winter coat"
 	icon_state = "coatmedical"
+	item_state = "coatmedical"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
 
 /obj/item/clothing/suit/storage/hooded/wintercoat/science
 	name = "science winter coat"
 	icon_state = "coatscience"
+	item_state = "coatscience"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
 
 /obj/item/clothing/suit/storage/hooded/wintercoat/engineering
 	name = "engineering winter coat"
 	icon_state = "coatengineer"
+	item_state = "coatengineer"
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 20)
 
 /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos
 	name = "atmospherics winter coat"
 	icon_state = "coatatmos"
+	item_state = "coatatmos"
 
 /obj/item/clothing/suit/storage/hooded/wintercoat/hydro
 	name = "hydroponics winter coat"
 	icon_state = "coathydro"
+	item_state = "coathydro"
 
 /obj/item/clothing/suit/storage/hooded/wintercoat/cargo
 	name = "cargo winter coat"
 	icon_state = "coatcargo"
+	item_state = "coatcargo"
 
 /obj/item/clothing/suit/storage/hooded/wintercoat/miner
 	name = "mining winter coat"
 	icon_state = "coatminer"
+	item_state = "coatminer"
 	armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/suit/varsity
 	name = "black varsity jacket"
 	desc = "A favorite of jocks everywhere from Sol to Nyx."
 	icon_state = "varsity"
-	item_state = "leather_jacket"
+	item_state = "suit_black"
 
 /obj/item/clothing/suit/varsity/red
 	name = "red varsity jacket"
-	icon_state = "varsity_red"
+	icon_state = "suit_red"
 
 /obj/item/clothing/suit/varsity/purple
 	name = "purple varsity jacket"
-	icon_state = "varsity_purple"
+	icon_state = "suit_purple"
 
 /obj/item/clothing/suit/varsity/green
 	name = "green varsity jacket"
-	icon_state = "varsity_green"
+	icon_state = "suit_olive"
 
 /obj/item/clothing/suit/varsity/blue
 	name = "blue varsity jacket"
-	icon_state = "varsity_blue"
+	icon_state = "suit_blue"
 
 /obj/item/clothing/suit/varsity/brown
 	name = "brown varsity jacket"
-	icon_state = "varsity_brown"
-
-//Track Jackets
+	icon_state = "brown_jacket"
 
+/*
+ * Track Jackets
+ */
 /obj/item/clothing/suit/storage/toggle/track
 	name = "track jacket"
 	desc = "a track jacket, for the athletic."
 	icon_state = "trackjacket"
-	item_state = "trackjacket"
+	item_state = "black_labcoat"
 	icon_open = "trackjacket_open"
 	icon_closed = "trackjacket"
 
 /obj/item/clothing/suit/storage/toggle/track/blue
 	name = "blue track jacket"
 	icon_state = "trackjacketblue"
-	item_state = "trackjacketblue"
+	item_state = "blue_labcoat"
 	icon_open = "trackjacketblue_open"
 	icon_closed = "trackjacketblue"
 
 /obj/item/clothing/suit/storage/toggle/track/green
 	name = "green track jacket"
 	icon_state = "trackjacketgreen"
-	item_state = "trackjacketgreen"
+	item_state = "green_labcoat"
 	icon_open = "trackjacketgreen_open"
 	icon_closed = "trackjacketgreen"
 
 /obj/item/clothing/suit/storage/toggle/track/red
 	name = "red track jacket"
 	icon_state = "trackjacketred"
-	item_state = "trackjacketred"
+	item_state = "red_labcoat"
 	icon_open = "trackjacketred_open"
 	icon_closed = "trackjacketred"
 
 /obj/item/clothing/suit/storage/toggle/track/white
 	name = "white track jacket"
 	icon_state = "trackjacketwhite"
-	item_state = "trackjacketwhite"
+	item_state = "labcoat"
 	icon_open = "trackjacketwhite_open"
 	icon_closed = "trackjacketwhite"
 
@@ -733,7 +644,7 @@
 	name = "Flannel shirt"
 	desc = "A comfy, grey flannel shirt.  Unleash your inner hipster."
 	icon_state = "flannel"
-	item_state = "gy_suit"
+	item_state = "black_labcoat"
 	var/rolled = 0
 	var/tucked = 0
 	var/buttoned = 0
@@ -798,12 +709,12 @@
 /obj/item/clothing/suit/storage/flannel/red
 	desc = "A comfy, red flannel shirt.  Unleash your inner hipster."
 	icon_state = "flannel_red"
-	item_state = "r_suit"
+	item_state = "red_labcoat"
 
 /obj/item/clothing/suit/storage/flannel/aqua
 	desc = "A comfy, aqua flannel shirt.  Unleash your inner hipster."
 	icon_state = "flannel_aqua"
-	item_state = "b_suit"
+	item_state = "blue_labcoat"
 
 /obj/item/clothing/suit/storage/flannel/brown
 	desc = "A comfy, brown flannel shirt.  Unleash your inner hipster."
@@ -816,7 +727,7 @@
 	name = "green formal jacket"
 	desc = "A sleek proper formal jacket with gold buttons."
 	icon_state = "suitjacket_green_open"
-	item_state = "suitjacket_green_open"
+	item_state = "suit_olive"
 	icon_open = "suitjacket_green_open"
 	icon_closed = "suitjacket_green"
 	blood_overlay_type = "coat"

code/modules/clothing/suits/toggles.dm

@@ -28,7 +28,7 @@
 	..()
 
 /obj/item/clothing/suit/storage/hooded/proc/RemoveHood()
-	src.icon_state = "[initial(icon_state)]"
+	icon_state = "[initial(icon_state)]"
 	suittoggled = 0
 	if(ishuman(hood.loc))
 		var/mob/living/carbon/H = hood.loc
@@ -41,7 +41,7 @@
 
 /obj/item/clothing/suit/storage/hooded/proc/ToggleHood()
 	if(!suittoggled)
-		if(ishuman(src.loc))
+		if(ishuman(loc))
 			var/mob/living/carbon/human/H = src.loc
 			if(H.wear_suit != src)
 				H << "<span class='warning'>You must be wearing [src] to put up the hood!</span>"
@@ -52,7 +52,7 @@
 			else
 				H.equip_to_slot_if_possible(hood,slot_head,0,0,1)
 				suittoggled = 1
-				src.icon_state = "[initial(icon_state)]_t"
+				icon_state = "[initial(icon_state)]_t"
 				H.update_inv_wear_suit()
 	else
 		RemoveHood()

code/modules/clothing/suits/utility.dm

@@ -13,7 +13,6 @@
 	name = "firesuit"
 	desc = "A suit that protects against fire and heat."
 	icon_state = "fire"
-	item_state = "fire_suit"
 	w_class = 4//bulky item
 	gas_transfer_coefficient = 0.90
 	permeability_coefficient = 0.50
@@ -26,17 +25,14 @@
 	max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
 	cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
 
-
 /obj/item/clothing/suit/fire/firefighter
 	icon_state = "firesuit"
-	item_state = "firefighter"
 
-
-/obj/item/clothing/suit/fire/heavy
+/obj/item/clothing/suit/fire/heavy //Is this even used?? -S2-
 	name = "firesuit"
 	desc = "A suit that protects against extreme fire and heat."
 	//icon_state = "thermal"
-	item_state = "ro_suit"
+	item_state = "black_suit"
 	w_class = 4//bulky item
 	slowdown = 1.5
 
@@ -52,12 +48,10 @@
 	body_parts_covered = HEAD|FACE|EYES
 	siemens_coefficient = 0
 
-
 /obj/item/clothing/suit/bomb_suit
 	name = "bomb suit"
 	desc = "A suit designed for safety when handling explosives."
 	icon_state = "bombsuit"
-	item_state = "bombsuit"
 	w_class = 4//bulky item
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
@@ -68,7 +62,6 @@
 	max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE
 	siemens_coefficient = 0
 
-
 /obj/item/clothing/head/bomb_hood/security
 	icon_state = "bombsuitsec"
 	body_parts_covered = HEAD
@@ -89,12 +82,10 @@
 	body_parts_covered = HEAD|FACE|EYES
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100)
 
-
 /obj/item/clothing/suit/radiation
 	name = "Radiation suit"
 	desc = "A suit that protects against radiation. Label: Made with lead, do not eat insulation."
 	icon_state = "rad"
-	item_state = "rad_suit"
 	w_class = 4//bulky item
 	gas_transfer_coefficient = 0.90
 	permeability_coefficient = 0.50

code/modules/clothing/suits/wiz_robe.dm

@@ -2,10 +2,6 @@
 	name = "wizard hat"
 	desc = "Strange-looking hat-wear that most certainly belongs to a real magic user."
 	icon_state = "wizard"
-	item_state_slots = list(
-		slot_l_hand_str = "wizhat",
-		slot_r_hand_str = "wizhat",
-		)
 	//Not given any special protective value since the magic robes are full-body protection --NEO
 	siemens_coefficient = 0.8
 	body_parts_covered = 0
@@ -33,11 +29,6 @@
 	name = "Magus Helm"
 	desc = "A mysterious helmet that hums with an unearthly power"
 	icon_state = "magus"
-	item_state = "magus"
-	item_state_slots = list(
-		slot_l_hand_str = "helmet",
-		slot_r_hand_str = "helmet",
-		)
 	siemens_coefficient = 0.8
 	body_parts_covered = HEAD|FACE|EYES
 
@@ -45,27 +36,19 @@
 	name = "psychic amplifier"
 	desc = "A crown-of-thorns psychic amplifier. Kind of looks like a tiara having sex with an industrial robot."
 	icon_state = "amp"
-	item_state_slots = list(
-		slot_l_hand_str = "helmet",
-		slot_r_hand_str = "helmet",
-		)
 	siemens_coefficient = 0.8
 
 /obj/item/clothing/head/wizard/cap
 	name = "Gentlemans Cap"
 	desc = "A checkered gray flat cap woven together with the rarest of threads."
 	icon_state = "gentcap"
-	item_state_slots = list(
-		slot_l_hand_str = "det_hat",
-		slot_r_hand_str = "det_hat",
-		)
+	item_state = "detective"
 	siemens_coefficient = 0.8
 
 /obj/item/clothing/suit/wizrobe
 	name = "wizard robe"
 	desc = "A magnificant, gem-lined robe that seems to radiate power."
 	icon_state = "wizard"
-	item_state = "wizrobe"
 	gas_transfer_coefficient = 0.01 // IT'S MAGICAL OKAY JEEZ +1 TO NOT DIE
 	permeability_coefficient = 0.01
 	armor = list(melee = 30, bullet = 20, laser = 20,energy = 20, bomb = 20, bio = 20, rad = 20)
@@ -78,47 +61,41 @@
 	name = "red wizard robe"
 	desc = "A magnificant, red, gem-lined robe that seems to radiate power."
 	icon_state = "redwizard"
-	item_state = "redwizrobe"
-
 
 /obj/item/clothing/suit/wizrobe/marisa
 	name = "Witch Robe"
 	desc = "Magic is all about the spell power, ZE!"
 	icon_state = "marisa"
-	item_state = "marisarobe"
 
 /obj/item/clothing/suit/wizrobe/magusblue
 	name = "Magus Robe"
 	desc = "A set of armoured robes that seem to radiate a dark power"
 	icon_state = "magusblue"
-	item_state = "magusblue"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET
 
 /obj/item/clothing/suit/wizrobe/magusred
 	name = "Magus Robe"
 	desc = "A set of armoured robes that seem to radiate a dark power"
 	icon_state = "magusred"
-	item_state = "magusred"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET
 
 /obj/item/clothing/suit/wizrobe/psypurple
 	name = "purple robes"
 	desc = "Heavy, royal purple robes threaded with psychic amplifiers and weird, bulbous lenses. Do not machine wash."
 	icon_state = "psyamp"
-	item_state = "psyamp"
 
 /obj/item/clothing/suit/wizrobe/gentlecoat
 	name = "Gentlemans Coat"
 	desc = "A heavy threaded twead gray jacket. For a different sort of Gentleman."
 	icon_state = "gentlecoat"
-	item_state = "gentlecoat"
+	item_state = "greatcoat"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
 /obj/item/clothing/suit/wizrobe/fake
 	name = "wizard robe"
 	desc = "A rather dull, blue robe meant to mimick real wizard robes."
 	icon_state = "wizard-fake"
-	item_state = "wizrobe"
+	item_state = "wizard"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 1.0
 
@@ -133,8 +110,6 @@
 	name = "Witch Robe"
 	desc = "Magic is all about the spell power, ZE!"
 	icon_state = "marisa"
-	item_state = "marisarobe"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 1.0
-

code/modules/clothing/under/accessories/accessory.dm

@@ -51,7 +51,7 @@
 
 	if(user)
 		user << "<span class='notice'>You attach \the [src] to \the [has_suit].</span>"
-		src.add_fingerprint(user)
+		add_fingerprint(user)
 
 /obj/item/clothing/accessory/proc/on_removed(var/mob/user)
 	if(!has_suit)
@@ -60,9 +60,9 @@
 	has_suit = null
 	if(user)
 		usr.put_in_hands(src)
-		src.add_fingerprint(user)
+		add_fingerprint(user)
 	else
-		src.forceMove(get_turf(src))
+		forceMove(get_turf(src))
 
 //default attackby behaviour
 /obj/item/clothing/accessory/attackby(obj/item/I, mob/user)

code/modules/clothing/under/accessories/lockets.dm

@@ -2,7 +2,6 @@
 	name = "silver locket"
 	desc = "This oval shaped, argentium sterling silver locket hangs on an incredibly fine, refractive string, almost thin as hair and microweaved from links to a deceptive strength, of similar material. The edges are engraved very delicately with an elegant curving design, but overall the main is unmarked and smooth to the touch, leaving room for either remaining as a stolid piece or future alterations. There is an obvious internal place for a picture or lock of some sort, but even behind that is a very thin compartment unhinged with the pinch of a thumb and forefinger."
 	icon_state = "locket"
-	item_state = "locket"
 	slot_flags = 0
 	w_class = 2
 	slot_flags = SLOT_MASK | SLOT_TIE
@@ -25,7 +24,7 @@
 		if(held)
 			user << "\The [held] falls out!"
 			held.loc = get_turf(user)
-			src.held = null
+			held = null
 	else
 		icon_state = "[base_icon]"
 
@@ -41,6 +40,6 @@
 			usr << "You slip [O] into [src]."
 			user.drop_item()
 			O.loc = src
-			src.held = O
+			held = O
 		return
 	..()

code/modules/clothing/under/accessories/storage.dm

@@ -43,7 +43,7 @@
 	hold.hide_from(usr)
 	for(var/obj/item/I in hold.contents)
 		hold.remove_from_storage(I, T)
-	src.add_fingerprint(user)
+	add_fingerprint(user)
 
 /obj/item/clothing/accessory/storage/webbing
 	name = "webbing"

code/modules/clothing/under/color.dm

@@ -1,7 +1,6 @@
 /obj/item/clothing/under/color/black
 	name = "black jumpsuit"
 	icon_state = "black"
-	item_state = "bl_suit"
 	worn_state = "black"
 	rolled_sleeves = 0
 
@@ -9,34 +8,30 @@
 	name = "feminine black jumpsuit"
 	desc = "It's very smart and in a ladies-size!"
 	icon_state = "black"
-	item_state = "bl_suit"
 	worn_state = "blackf"
 
 /obj/item/clothing/under/color/blackjumpskirt
 	name = "black jumpskirt"
 	desc = "A slimming black jumpskirt."
 	icon_state = "blackjumpskirt"
-	item_state = "bl_suit"
+	item_state = "black"
 	worn_state = "blackjumpskirt"
 
 /obj/item/clothing/under/color/blue
 	name = "blue jumpsuit"
 	icon_state = "blue"
-	item_state = "b_suit"
 	worn_state = "blue"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/green
 	name = "green jumpsuit"
 	icon_state = "green"
-	item_state = "g_suit"
 	worn_state = "green"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/grey
 	name = "grey jumpsuit"
 	icon_state = "grey"
-	item_state = "gy_suit"
 	worn_state = "grey"
 	rolled_sleeves = 0
 
@@ -44,7 +39,6 @@
 	name = "orange jumpsuit"
 	desc = "It's standardised prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
 	icon_state = "orange"
-	item_state = "o_suit"
 	worn_state = "orange"
 	has_sensor = 2
 	sensor_mode = 3
@@ -53,28 +47,24 @@
 /obj/item/clothing/under/color/pink
 	name = "pink jumpsuit"
 	icon_state = "pink"
-	item_state = "p_suit"
 	worn_state = "pink"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/red
 	name = "red jumpsuit"
 	icon_state = "red"
-	item_state = "r_suit"
 	worn_state = "red"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/white
 	name = "white jumpsuit"
 	icon_state = "white"
-	item_state = "w_suit"
 	worn_state = "white"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/yellow
 	name = "yellow jumpsuit"
 	icon_state = "yellow"
-	item_state = "y_suit"
 	worn_state = "yellow"
 	rolled_sleeves = 0
 
@@ -82,14 +72,13 @@
 	name = "psychedelic jumpsuit"
 	desc = "Groovy!"
 	icon_state = "psyche"
-	item_state = "psyche"
 	worn_state = "psyche"
 
 /obj/item/clothing/under/color/lightblue
 	name = "lightblue jumpsuit"
 	desc = "A light blue jumpsuit."
 	icon_state = "lightblue"
-	item_state = "b_suit"
+	item_state = "blue"
 	worn_state = "lightblue"
 	rolled_sleeves = 0
 
@@ -97,7 +86,7 @@
 	name = "aqua jumpsuit"
 	desc = "An aqua jumpsuit."
 	icon_state = "aqua"
-	item_state = "b_suit"
+	item_state = "blue"
 	worn_state = "aqua"
 	rolled_sleeves = 0
 
@@ -105,7 +94,6 @@
 	name = "purple jumpsuit"
 	desc = "The latest in space fashion."
 	icon_state = "purple"
-	item_state = "p_suit"
 	worn_state = "purple"
 	rolled_sleeves = 0
 
@@ -113,7 +101,7 @@
 	name = "lightpurple jumpsuit"
 	desc = "A light purple jumpsuit."
 	icon_state = "lightpurple"
-	item_state = "p_suit"
+	item_state = "purple"
 	worn_state = "lightpurple"
 	rolled_sleeves = 0
 
@@ -121,7 +109,7 @@
 	name = "lightgreen jumpsuit"
 	desc = "A light green jumpsuit."
 	icon_state = "lightgreen"
-	item_state = "g_suit"
+	item_state = "green"
 	worn_state = "lightgreen"
 	rolled_sleeves = 0
 
@@ -129,7 +117,6 @@
 	name = "lightbrown jumpsuit"
 	desc = "A light brown jumpsuit."
 	icon_state = "lightbrown"
-	item_state = "lb_suit"
 	worn_state = "lightbrown"
 	rolled_sleeves = 0
 
@@ -137,7 +124,7 @@
 	name = "brown jumpsuit"
 	desc = "A brown jumpsuit."
 	icon_state = "brown"
-	item_state = "lb_suit"
+	item_state = "lightbrown"
 	worn_state = "brown"
 	rolled_sleeves = 0
 
@@ -145,7 +132,7 @@
 	name = "yellowgreen jumpsuit"
 	desc = "A... yellow green jumpsuit?"
 	icon_state = "yellowgreen"
-	item_state = "y_suit"
+	item_state = "yellow"
 	worn_state = "yellowgreen"
 	rolled_sleeves = 0
 
@@ -153,7 +140,7 @@
 	name = "darkblue jumpsuit"
 	desc = "A dark blue jumpsuit."
 	icon_state = "darkblue"
-	item_state = "b_suit"
+	item_state = "blue"
 	worn_state = "darkblue"
 	rolled_sleeves = 0
 
@@ -161,7 +148,7 @@
 	name = "lightred jumpsuit"
 	desc = "A light red jumpsuit."
 	icon_state = "lightred"
-	item_state = "r_suit"
+	item_state = "red"
 	worn_state = "lightred"
 	rolled_sleeves = 0
 
@@ -169,6 +156,6 @@
 	name = "darkred jumpsuit"
 	desc = "A dark red jumpsuit."
 	icon_state = "darkred"
-	item_state = "r_suit"
+	item_state = "red"
 	worn_state = "darkred"
 	rolled_sleeves = 0

code/modules/clothing/under/jobs/civilian.dm

@@ -4,7 +4,6 @@
 	desc = "It looks like it could use some more flair."
 	name = "bartender's uniform"
 	icon_state = "ba_suit"
-	item_state = "ba_suit"
 	worn_state = "ba_suit"
 	rolled_sleeves = 0
 
@@ -12,7 +11,6 @@
 	desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"."
 	name = "captain's jumpsuit"
 	icon_state = "captain"
-	item_state = "b_suit"
 	worn_state = "captain"
 	rolled_sleeves = 0
 
@@ -20,7 +18,7 @@
 	name = "quartermaster's jumpsuit"
 	desc = "It's a jumpsuit worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
 	icon_state = "qm"
-	item_state = "lb_suit"
+	item_state = "cargo"
 	worn_state = "qm"
 	rolled_sleeves = 0
 
@@ -41,7 +39,7 @@
 	name = "cargo technician's jumpsuit"
 	desc = "Shooooorts! They're comfy and easy to wear!"
 	icon_state = "cargotech"
-	item_state = "lb_suit"
+	item_state = "cargo"
 	worn_state = "cargo"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 	rolled_sleeves = 0
@@ -63,7 +61,7 @@
 	desc = "It's a black jumpsuit, often worn by religious folk."
 	name = "chaplain's jumpsuit"
 	icon_state = "chaplain"
-	item_state = "bl_suit"
+	item_state = "black"
 	worn_state = "chapblack"
 	rolled_sleeves = 0
 
@@ -71,7 +69,6 @@
 	desc = "It's an apron which is given only to the most <b>hardcore</b> chefs in space."
 	name = "chef's uniform"
 	icon_state = "chef"
-	item_state = "w_suit"
 	worn_state = "chef"
 	rolled_sleeves = 0
 
@@ -79,7 +76,6 @@
 	name = "clown suit"
 	desc = "<i>'HONK!'</i>"
 	icon_state = "clown"
-	item_state = "clown"
 	worn_state = "clown"
 	rolled_sleeves = -1
 
@@ -87,7 +83,6 @@
 	desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"."
 	name = "head of personnel's jumpsuit"
 	icon_state = "hop"
-	item_state = "b_suit"
 	worn_state = "hop"
 	rolled_sleeves = 0
 
@@ -95,7 +90,7 @@
 	desc = "A blue jacket and red tie, with matching red cuffs! Snazzy. Wearing this makes you feel more important than your job title does."
 	name = "head of personnel's suit"
 	icon_state = "hopwhimsy"
-	item_state = "b_suit"
+	item_state = "hop"
 	worn_state = "hopwhimsy"
 	rolled_sleeves = -1
 
@@ -103,7 +98,7 @@
 	desc = "It's a jumpsuit designed to protect against minor plant-related hazards."
 	name = "botanist's jumpsuit"
 	icon_state = "hydroponics"
-	item_state = "g_suit"
+	item_state = "green"
 	worn_state = "hydroponics"
 	permeability_coefficient = 0.50
 	rolled_sleeves = 0
@@ -121,8 +116,6 @@
 	desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
 	name = "janitor's jumpsuit"
 	icon_state = "janitor"
-	worn_state = "janitor"
-	item_state = "janitor"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	rolled_sleeves = 0
 
@@ -133,7 +126,6 @@
 /obj/item/clothing/under/lawyer/black
 	name = "black Lawyer suit"
 	icon_state = "lawyer_black"
-	item_state = "lawyer_black"
 	worn_state = "lawyer_black"
 
 /obj/item/clothing/under/lawyer/female
@@ -145,27 +137,25 @@
 /obj/item/clothing/under/lawyer/red
 	name = "red Lawyer suit"
 	icon_state = "lawyer_red"
-	item_state = "lawyer_red"
 	worn_state = "lawyer_red"
 
 /obj/item/clothing/under/lawyer/blue
 	name = "blue Lawyer suit"
 	icon_state = "lawyer_blue"
-	item_state = "lawyer_blue"
 	worn_state = "lawyer_blue"
 
 /obj/item/clothing/under/lawyer/bluesuit
 	name = "Blue Suit"
 	desc = "A classy suit."
 	icon_state = "bluesuit"
-	item_state = "ba_suit"
+	item_state = "lawyer_blue"
 	worn_state = "bluesuit"
 	starting_accessories = list(/obj/item/clothing/accessory/red)
 
 /obj/item/clothing/under/lawyer/purpsuit
 	name = "Purple Suit"
 	icon_state = "lawyer_purp"
-	item_state = "ba_suit"
+	item_state = "purple"
 	worn_state = "lawyer_purp"
 
 /obj/item/clothing/under/lawyer/oldman
@@ -186,13 +176,11 @@
 	name = "mime's outfit"
 	desc = "It's not very colourful."
 	icon_state = "mime"
-	item_state = "ba_suit"
 	worn_state = "mime"
 
 /obj/item/clothing/under/rank/miner
 	desc = "It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty."
 	name = "shaft miner's jumpsuit"
 	icon_state = "miner"
-	item_state = "lb_suit"
 	worn_state = "miner"
 	rolled_sleeves = 0

code/modules/clothing/under/jobs/engineering.dm

@@ -3,7 +3,6 @@
 	desc = "It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding."
 	name = "chief engineer's jumpsuit"
 	icon_state = "chiefengineer"
-	item_state = "g_suit"
 	worn_state = "chief"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
 	rolled_sleeves = 0
@@ -12,7 +11,6 @@
 	desc = "It's a jumpsuit worn by atmospheric technicians."
 	name = "atmospheric technician's jumpsuit"
 	icon_state = "atmos"
-	item_state = "atmos_suit"
 	worn_state = "atmos"
 	rolled_sleeves = 0
 
@@ -20,7 +18,6 @@
 	desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."
 	name = "engineer's jumpsuit"
 	icon_state = "engine"
-	item_state = "engi_suit"
 	worn_state = "engine"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
 	rolled_sleeves = 0
@@ -29,6 +26,5 @@
 	desc = "It's a slimming black jumpsuit with reinforced seams; great for industrial work."
 	name = "roboticist's jumpsuit"
 	icon_state = "robotics"
-	item_state = "bl_suit"
 	worn_state = "robotics"
 	rolled_sleeves = 0

code/modules/clothing/under/jobs/medsci.dm

@@ -5,7 +5,6 @@
 	desc = "It's a jumpsuit worn by those with the know-how to achieve the position of \"Research Director\". Its fabric provides minor protection from biological contaminants."
 	name = "research director's jumpsuit"
 	icon_state = "director"
-	item_state = "lb_suit"
 	worn_state = "director"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 
@@ -13,7 +12,7 @@
 	desc = "A dress suit and slacks stained with hard work and dedication to science. Perhaps other things as well, but mostly hard work and dedication."
 	name = "head researcher uniform"
 	icon_state = "rdalt"
-	item_state = "lb_suit"
+	item_state = "director"
 	worn_state = "rdalt"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 
@@ -21,7 +20,6 @@
 	name = "research director dress uniform"
 	desc = "Feminine fashion for the style concious RD. Its fabric provides minor protection from biological contaminants."
 	icon_state = "dress_rd"
-	item_state = "lb_suit"
 	worn_state = "dress_rd"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
@@ -30,7 +28,7 @@
 	desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist."
 	name = "scientist's jumpsuit"
 	icon_state = "science"
-	item_state = "w_suit"
+	item_state = "white"
 	worn_state = "sciencewhite"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
@@ -40,7 +38,7 @@
 	desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it."
 	name = "chemist's jumpsuit"
 	icon_state = "chemistry"
-	item_state = "w_suit"
+	item_state = "white"
 	worn_state = "chemistrywhite"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
@@ -53,7 +51,7 @@
 	desc = "It's a jumpsuit worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
 	name = "chief medical officer's jumpsuit"
 	icon_state = "cmo"
-	item_state = "w_suit"
+	item_state = "white"
 	worn_state = "cmo"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
@@ -63,7 +61,7 @@
 	desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
 	name = "geneticist's jumpsuit"
 	icon_state = "genetics"
-	item_state = "w_suit"
+	item_state = "white"
 	worn_state = "geneticswhite"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
@@ -73,7 +71,7 @@
 	desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
 	name = "virologist's jumpsuit"
 	icon_state = "virology"
-	item_state = "w_suit"
+	item_state = "white"
 	worn_state = "virologywhite"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
@@ -83,7 +81,6 @@
 	desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
 	name = "nurse's suit"
 	icon_state = "nursesuit"
-	item_state = "nursesuit"
 	worn_state = "nursesuit"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
@@ -115,7 +112,7 @@
 	desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
 	name = "medical doctor's jumpsuit"
 	icon_state = "medical"
-	item_state = "w_suit"
+	item_state = "white"
 	worn_state = "medical"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
@@ -125,7 +122,7 @@
 	name = "short sleeve medical jumpsuit"
 	desc = "It's made of a special fiber that provides minor protection against biohazards. This one has a cross on the chest denoting that the wearer is trained medical personnel."
 	icon_state = "medical_short"
-	item_state = "medical_short"
+	item_state = "white"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
 	rolled_sleeves = -1
 
@@ -133,7 +130,7 @@
 	name = "medical scrubs"
 	desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue."
 	icon_state = "scrubsblue"
-	item_state = "b_suit"
+	item_state = "blue"
 	worn_state = "scrubsblue"
 	rolled_sleeves = -1
 
@@ -141,7 +138,7 @@
 	name = "medical scrubs"
 	desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green."
 	icon_state = "scrubsgreen"
-	item_state = "g_suit"
+	item_state = "green"
 	worn_state = "scrubsgreen"
 	rolled_sleeves = -1
 
@@ -149,7 +146,7 @@
 	name = "medical scrubs"
 	desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple."
 	icon_state = "scrubspurple"
-	item_state = "p_suit"
+	item_state = "purple"
 	worn_state = "scrubspurple"
 	rolled_sleeves = -1
 
@@ -157,7 +154,7 @@
 	name = "medical scrubs"
 	desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in black."
 	icon_state = "scrubsblack"
-	item_state = "bl_suit"
+	item_state = "black"
 	worn_state = "scrubsblack"
 	rolled_sleeves = -1
 
@@ -165,7 +162,7 @@
 	name = "medical scrubs"
 	desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in navy blue."
 	icon_state = "scrubsnavyblue"
-	item_state = "b_suit"
+	item_state = "blue"
 	worn_state = "scrubsnavyblue"
 	rolled_sleeves = -1
 
@@ -173,18 +170,17 @@
 	desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist."
 	name = "psychiatrist's jumpsuit"
 	icon_state = "psych"
-	item_state = "w_suit"
+	item_state = "white"
 	worn_state = "psych"
 
 /obj/item/clothing/under/rank/psych/turtleneck
 	desc = "A turqouise turtleneck and a pair of dark blue slacks, belonging to a psychologist."
 	name = "psychologist's turtleneck"
 	icon_state = "psychturtle"
-	item_state = "b_suit"
+	item_state = "psyche"
 	worn_state = "psychturtle"
 	rolled_sleeves = 0
 
-
 /*
  * Medsci, unused (i think) stuff
  */
@@ -192,7 +188,7 @@
 	desc = "It's made of a special fiber which provides minor protection against biohazards."
 	name = "geneticist's jumpsuit"
 	icon_state = "genetics_new"
-	item_state = "w_suit"
+	item_state = "white"
 	worn_state = "genetics_new"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
@@ -202,7 +198,7 @@
 	desc = "It's made of a special fiber which provides minor protection against biohazards."
 	name = "chemist's jumpsuit"
 	icon_state = "chemist_new"
-	item_state = "w_suit"
+	item_state = "white"
 	worn_state = "chemist_new"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
@@ -212,7 +208,7 @@
 	desc = "Made of a special fiber that gives special protection against biohazards and small explosions."
 	name = "scientist's jumpsuit"
 	icon_state = "scientist_new"
-	item_state = "w_suit"
+	item_state = "white"
 	worn_state = "scientist_new"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
@@ -222,7 +218,7 @@
 	desc = "Made of a special fiber that gives increased protection against biohazards."
 	name = "virologist's jumpsuit"
 	icon_state = "virologist_new"
-	item_state = "w_suit"
+	item_state = "white"
 	worn_state = "virologist_new"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)

code/modules/clothing/under/jobs/security.dm

@@ -12,7 +12,7 @@
 	desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. It has the word \"Warden\" written on the shoulders."
 	name = "warden's jumpsuit"
 	icon_state = "warden"
-	item_state = "r_suit"
+	item_state = "red" //Red should be just fine -S2-
 	worn_state = "warden"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
@@ -28,7 +28,7 @@
 	name = "security officer's jumpsuit"
 	desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
 	icon_state = "security"
-	item_state = "r_suit"
+	item_state = "red"
 	worn_state = "secred"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
@@ -38,7 +38,7 @@
 	name = "dispatcher's uniform"
 	desc = "A dress shirt and khakis with a security patch sewn on."
 	icon_state = "dispatch"
-	//item_state = "dispatch"
+	item_state = "detective"
 	worn_state = "dispatch"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
@@ -48,7 +48,7 @@
 	name = "security officer's uniform"
 	desc = "It's made of a slightly sturdier material, to allow for robust protection."
 	icon_state = "redshirt2"
-	item_state = "r_suit"
+	item_state = "red"
 	worn_state = "redshirt2"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
@@ -56,13 +56,13 @@
 
 /obj/item/clothing/under/rank/security/corp
 	icon_state = "sec_corporate"
-	//item_state = "sec_corporate"
+	item_state = "black"
 	worn_state = "sec_corporate"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/rank/warden/corp
 	icon_state = "warden_corporate"
-	//item_state = "warden_corporate"
+	item_state = "black"
 	worn_state = "warden_corporate"
 	rolled_sleeves = 0
 
@@ -70,7 +70,7 @@
 	name = "tactical jumpsuit"
 	desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
 	icon_state = "swatunder"
-	//item_state = "swatunder"
+	item_state = "green"
 	worn_state = "swatunder"
 	armor = list(melee = 10, bullet = 5, laser = 5,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
@@ -83,7 +83,6 @@
 	name = "detective's suit"
 	desc = "A rumpled white dress shirt paired with well-worn grey slacks."
 	icon_state = "detective"
-	item_state = "det"
 	worn_state = "detective"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
@@ -117,7 +116,7 @@
 /obj/item/clothing/under/det/corporate
 	name = "detective's jumpsuit"
 	icon_state = "det_corporate"
-	item_state = "bl_suit"
+	item_state = "black"
 	worn_state = "det_corporate"
 	desc = "A more modern uniform for corporate investigators."
 
@@ -131,15 +130,10 @@
 	worn_state = "detective2_waistcoat"
 	desc = "A serious-looking tan dress shirt paired with freshly-pressed black slacks, complete with a red striped tie and waistcoat."
 
-
 /obj/item/clothing/head/det
 	name = "fedora"
 	desc = "A brown fedora - either the cornerstone of a detective's style or a poor attempt at looking cool, depending on the person wearing it."
 	icon_state = "detective"
-	item_state_slots = list(
-		slot_l_hand_str = "det_hat",
-		slot_r_hand_str = "det_hat",
-		)
 	allowed = list(/obj/item/weapon/reagent_containers/food/snacks/candy_corn, /obj/item/weapon/pen)
 	armor = list(melee = 50, bullet = 5, laser = 25,energy = 10, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
@@ -147,9 +141,9 @@
 
 /obj/item/clothing/head/det/grey
 	icon_state = "detective2"
+	item_state = "detective"
 	desc = "A grey fedora - either the cornerstone of a detective's style or a poor attempt at looking cool, depending on the person wearing it."
 
-
 /*
  * Head of Security
  */
@@ -157,7 +151,7 @@
 	desc = "It's a jumpsuit worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer."
 	name = "head of security's jumpsuit"
 	icon_state = "hos"
-	item_state = "r_suit"
+	item_state = "red"
 	worn_state = "hosred"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.8
@@ -165,7 +159,7 @@
 
 /obj/item/clothing/under/rank/head_of_security/corp
 	icon_state = "hos_corporate"
-	//item_state = "hos_corporate"
+	item_state = "black"
 	worn_state = "hos_corporate"
 	rolled_sleeves = 0
 
@@ -180,13 +174,13 @@
 	name = "Dermal Armour Patch"
 	desc = "You're not quite sure how you manage to take it on and off, but it implants nicely in your head."
 	icon_state = "dermal"
+	item_state = ""
 	siemens_coefficient = 0.6
 
 /obj/item/clothing/suit/armor/hos
 	name = "armored coat"
 	desc = "A greatcoat enhanced with a special alloy for some protection and style."
 	icon_state = "hos"
-	item_state = "hos"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
 	armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
 	flags_inv = HIDEJUMPSUIT
@@ -197,7 +191,6 @@
 	desc = "You never asked for anything that stylish."
 	name = "head of security's jumpsuit"
 	icon_state = "jensen"
-	item_state = "jensen"
 	worn_state = "jensen"
 	siemens_coefficient = 0.6
 	rolled_sleeves = -1
@@ -206,14 +199,12 @@
 	name = "armored trenchcoat"
 	desc = "A trenchcoat augmented with a special alloy for some protection and style."
 	icon_state = "hostrench"
-	item_state = "hostrench"
 	flags_inv = 0
 	siemens_coefficient = 0.6
 
 /*
  * Navy uniforms
  */
-
 /obj/item/clothing/under/rank/security/navyblue
 	name = "security officer's uniform"
 	desc = "The latest in fashionable security outfits."

code/modules/clothing/under/miscellaneous.dm

@@ -3,27 +3,26 @@
 	desc = "Sleepwear."
 	icon_state = "red_pyjamas"
 	worn_state = "red_pyjamas"
-	item_state = "w_suit"
+	item_state = "white"
 
 /obj/item/clothing/under/pj/blue
 	name = "blue pj's"
 	desc = "Sleepwear."
 	icon_state = "blue_pyjamas"
 	worn_state = "blue_pyjamas"
-	item_state = "w_suit"
+	item_state = "white"
 
 /obj/item/clothing/under/captain_fly
 	name = "rogue's uniform"
 	desc = "For the man who doesn't care because he's still free."
 	icon_state = "captain_fly"
-	item_state = "r_suit"
+	item_state = "red"
 	worn_state = "captain_fly"
 
 /obj/item/clothing/under/scratch
 	name = "white suit"
 	desc = "A white suit, suitable for an excellent host"
 	icon_state = "scratch"
-	item_state = "scratch"
 	worn_state = "scratch"
 
 /obj/item/clothing/under/sl_suit
@@ -31,14 +30,12 @@
 	name = "amish suit"
 	icon_state = "sl_suit"
 	worn_state = "sl_suit"
-	item_state = "sl_suit"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/waiter
 	name = "waiter's outfit"
 	desc = "It's a very smart uniform with a special pocket for tip."
 	icon_state = "waiter"
-	item_state = "waiter"
 	worn_state = "waiter"
 	rolled_sleeves = 0
 
@@ -46,7 +43,7 @@
 	name = "mailman's jumpsuit"
 	desc = "<i>'Special delivery!'</i>"
 	icon_state = "mailman"
-	item_state = "b_suit"
+	item_state = "blue"
 	worn_state = "mailman"
 	rolled_sleeves = 0
 
@@ -63,7 +60,7 @@
 	name = "vice officer's jumpsuit"
 	desc = "It's the standard issue pretty-boy outfit, as seen on Holo-Vision."
 	icon_state = "vice"
-	item_state = "gy_suit"
+	item_state = "grey"
 	worn_state = "vice"
 
 //This set of uniforms looks fairly fancy and is generally used for high-ranking NT personnel from what I've seen, so lets give them appropriate ranks.
@@ -95,14 +92,14 @@
 	name = "ERT tactical uniform"
 	desc = "A short-sleeved black uniform, paired with grey digital-camo cargo pants. It looks very tactical."
 	icon_state = "ert_uniform"
-	item_state = "bl_suit"
+	item_state = "black"
 	worn_state = "ert_uniform"
 
 /obj/item/clothing/under/gov
 	desc = "A neat proper uniform of someone on offical business. The plain, professional attire of an Internal Affairs Agent. The collar is <i>immaculately</i> starched."
 	name = "Green formal uniform"
 	icon_state = "greensuit"
-	item_state = "greensuit"
+	item_state = "centcom"
 	worn_state = "greensuit"
 	rolled_sleeves = 0
 	starting_accessories = list(/obj/item/clothing/accessory/darkgreen)
@@ -111,7 +108,6 @@
 	name = "\improper NASA jumpsuit"
 	desc = "It has a NASA logo on it and is made of space-proofed materials."
 	icon_state = "black"
-	item_state = "bl_suit"
 	worn_state = "black"
 	w_class = 4//bulky item
 	gas_transfer_coefficient = 0.01
@@ -124,7 +120,7 @@
 /obj/item/clothing/under/acj
 	name = "administrative cybernetic jumpsuit"
 	icon_state = "syndicate"
-	item_state = "bl_suit"
+	item_state = "black"
 	worn_state = "syndicate"
 	desc = "it's a cybernetically enhanced jumpsuit used for administrative duties."
 	gas_transfer_coefficient = 0.01
@@ -140,33 +136,24 @@
 	desc = "A jumpsuit with owl wings. Photorealistic owl feathers! Twooooo!"
 	icon_state = "owl"
 	worn_state = "owl"
-	item_state = "owl"
 
 /obj/item/clothing/under/johnny
 	name = "johnny~~ jumpsuit"
 	desc = "Johnny~~"
 	icon_state = "johnny"
 	worn_state = "johnny"
-	item_state = "johnny"
 
 /obj/item/clothing/under/color/rainbow
 	name = "rainbow jumpsuit"
 	desc = "A multi-colored jumpsuit."
 	icon_state = "rainbow"
-	item_state = "rainbow"
 	worn_state = "rainbow"
 
-/obj/item/clothing/under/cloud
-	name = "cloud"
-	desc = "cloud"
-	icon_state = "cloud"
-	worn_state = "cloud"
-
 /obj/item/clothing/under/psysuit
 	name = "dark undersuit"
 	desc = "A thick, layered grey undersuit lined with power cables. Feels a little like wearing an electrical storm."
 	icon_state = "psysuit"
-	item_state = "bl_suit"
+	item_state = "black"
 	worn_state = "psysuit"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 
@@ -174,7 +161,7 @@
 	name = "gentlemans suit"
 	desc = "A silk black shirt with a white tie and a matching gray vest and slacks. Feels proper."
 	icon_state = "gentlesuit"
-	item_state = "gy_suit"
+	item_state = "grey"
 	worn_state = "gentlesuit"
 	rolled_sleeves = 0
 
@@ -182,28 +169,28 @@
 	name = "captain's suit"
 	desc = "A green suit and yellow necktie. Exemplifies authority."
 	icon_state = "green_suit"
-	item_state = "dg_suit"
+	item_state = "centcom"
 	worn_state = "green_suit"
 
 /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit
 	name = "head of personnel's suit"
 	desc = "A teal suit and yellow necktie. An authoritative yet tacky ensemble."
 	icon_state = "teal_suit"
-	item_state = "g_suit"
+	item_state = "green"
 	worn_state = "teal_suit"
 
 /obj/item/clothing/under/suit_jacket
 	name = "black suit"
 	desc = "A black suit and red tie. Very formal."
 	icon_state = "black_suit"
-	item_state = "bl_suit"
+	item_state = "lawyer_black"
 	worn_state = "black_suit"
 
 /obj/item/clothing/under/suit_jacket/really_black
 	name = "executive suit"
 	desc = "A formal black suit and red tie, intended for the station's finest."
 	icon_state = "really_black_suit"
-	item_state = "jensensuit"
+	item_state = "lawyer_black"
 	worn_state = "black_suit"
 
 /obj/item/clothing/under/suit_jacket/female
@@ -217,14 +204,14 @@
 	name = "red suit"
 	desc = "A red suit and blue tie. Somewhat formal."
 	icon_state = "red_suit"
-	item_state = "r_suit"
+	item_state = "lawyer_red"
 	worn_state = "red_suit"
 
 /obj/item/clothing/under/schoolgirl
 	name = "schoolgirl uniform"
 	desc = "It's just like one of my Japanese animes!"
 	icon_state = "schoolgirl"
-	item_state = "b_suit"
+	item_state = "blue"
 	worn_state = "schoolgirl"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 
@@ -232,7 +219,7 @@
 	name = "laborer's overalls"
 	desc = "A set of durable overalls for getting the job done."
 	icon_state = "overalls"
-	item_state = "lb_suit"
+	item_state = "cargo"
 	worn_state = "overalls"
 
 /obj/item/clothing/under/pirate
@@ -247,21 +234,20 @@
 	name = "soviet uniform"
 	desc = "For the Motherland!"
 	icon_state = "soviet"
-	item_state = "gy_suit"
+	item_state = "grey"
 	worn_state = "soviet"
 
 /obj/item/clothing/under/redcoat
 	name = "redcoat uniform"
 	desc = "Looks old."
 	icon_state = "redcoat"
-	item_state = "r_suit"
+	item_state = "red"
 	worn_state = "redcoat"
 
 /obj/item/clothing/under/kilt
 	name = "kilt"
 	desc = "Includes shoes and plaid"
 	icon_state = "kilt"
-	item_state = "kilt"
 	worn_state = "kilt"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|FEET
 
@@ -269,7 +255,7 @@
 	name = "sexy mime outfit"
 	desc = "The only time when you DON'T enjoy looking at someone's rack."
 	icon_state = "sexymime"
-	item_state = "w_suit"
+	item_state = "mime"
 	worn_state = "sexymime"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 	rolled_sleeves = -1 //Please never
@@ -278,11 +264,13 @@
 	name = "gladiator uniform"
 	desc = "Are you not entertained? Is that not why you are here?"
 	icon_state = "gladiator"
-	item_state = "o_suit"
+	item_state = "yellow"
 	worn_state = "gladiator"
 	body_parts_covered = LOWER_TORSO
 
-//dress
+/*
+ * dress
+ */
 /obj/item/clothing/under/dress
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 
@@ -290,99 +278,86 @@
 	name = "black tango dress"
 	desc = "Filled with Latin fire."
 	icon_state = "black_tango"
-	item_state = "black_tango"
 	worn_state = "black_tango"
 
 /obj/item/clothing/under/dress/blacktango/alt
 	name = "black tango dress"
 	desc = "Filled with Latin fire."
 	icon_state = "black_tango_alt"
-	item_state = "black_tango_alt"
+	item_state = "black_tango"
 	worn_state = "black_tango_alt"
 
 /obj/item/clothing/under/dress/stripeddress
 	name = "striped dress"
 	desc = "Fashion in space."
 	icon_state = "striped_dress" 
-	item_state = "striped_dress"
 	worn_state = "striped_dress"
 
 /obj/item/clothing/under/dress/sailordress
 	name = "sailor dress"
 	desc = "Formal wear for a leading lady."
 	icon_state = "sailor_dress"
-	item_state = "sailor_dress"
 	worn_state = "sailor_dress"
 
 /obj/item/clothing/under/dress/redeveninggown
 	name = "red evening gown"
 	desc = "Fancy dress for space bar singers."
 	icon_state = "red_evening_gown"
-	item_state = "red_evening_gown"
 	worn_state = "red_evening_gown"
 
 /obj/item/clothing/under/dress/maid
 	name = "maid costume"
 	desc = "Maid in China."
 	icon_state = "maid"
-	item_state = "maid"
 	worn_state = "maid"
 
 /obj/item/clothing/under/dress/janimaid
 	name = "maid uniform"
 	desc = "A simple maid uniform for housekeeping."
 	icon_state = "janimaid"
-	item_state = "janimaid"
 	worn_state = "janimaid"
 
 /obj/item/clothing/under/dress/dress_fire
 	name = "flame dress"
 	desc = "A small black dress with blue flames print on it."
 	icon_state = "dress_fire"
-	item_state = "bl_suit"
 	worn_state = "dress_fire"
 
 /obj/item/clothing/under/dress/dress_green
 	name = "green dress"
 	desc = "A simple, tight fitting green dress."
 	icon_state = "dress_green"
-	item_state = "g_suit"
 	worn_state = "dress_green"
 
 /obj/item/clothing/under/dress/dress_orange
 	name = "orange dress"
 	desc = "A fancy orange gown for those who like to show leg."
 	icon_state = "dress_orange"
-	item_state = "y_suit"
 	worn_state = "dress_orange"
 
 /obj/item/clothing/under/dress/dress_pink
 	name = "pink dress"
 	desc = "A simple, tight fitting pink dress."
 	icon_state = "dress_pink"
-	item_state = "p_suit"
 	worn_state = "dress_pink"
 
 /obj/item/clothing/under/dress/dress_yellow
 	name = "yellow dress"
 	desc = "A flirty, little yellow dress."
 	icon_state = "dress_yellow"
-	item_state = "y_suit"
 	worn_state = "dress_yellow"
 
 /obj/item/clothing/under/dress/dress_saloon
 	name = "saloon girl dress"
 	desc = "A old western inspired gown for the girl who likes to drink."
 	icon_state = "dress_saloon"
-	item_state = "p_suit"
+	item_state = "dress_white"
 	worn_state = "dress_saloon"
 
-
 /obj/item/clothing/under/dress/dress_cap
 	name = "captain's dress uniform"
 	desc = "Feminine fashion for the style concious captain."
 	icon_state = "dress_cap"
-	item_state = "b_suit"
 	worn_state = "dress_cap"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
@@ -390,7 +365,6 @@
 	name = "head of personnel dress uniform"
 	desc = "Feminine fashion for the style concious HoP."
 	icon_state = "dress_hop"
-	item_state = "b_suit"
 	worn_state = "dress_hop"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
@@ -398,11 +372,12 @@
 	name = "human resources director uniform"
 	desc = "Superior class for the nosy H.R. Director."
 	icon_state = "huresource"
-	item_state = "y_suit"
 	worn_state = "huresource"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
-//wedding stuff
+/*
+ * wedding stuff
+ */
 /obj/item/clothing/under/wedding/
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
 
@@ -410,7 +385,6 @@
 	name = "orange wedding dress"
 	desc = "A big and puffy orange dress."
 	icon_state = "bride_orange"
-	item_state = "y_suit"
 	worn_state = "bride_orange"
 	flags_inv = HIDESHOES
 
@@ -418,7 +392,6 @@
 	name = "purple wedding dress"
 	desc = "A big and puffy purple dress."
 	icon_state = "bride_purple"
-	item_state = "p_suit"
 	worn_state = "bride_purple"
 	flags_inv = HIDESHOES
 
@@ -426,7 +399,6 @@
 	name = "blue wedding dress"
 	desc = "A big and puffy blue dress."
 	icon_state = "bride_blue"
-	item_state = "b_suit"
 	worn_state = "bride_blue"
 	flags_inv = HIDESHOES
 
@@ -434,7 +406,6 @@
 	name = "red wedding dress"
 	desc = "A big and puffy red dress."
 	icon_state = "bride_red"
-	item_state = "r_suit"
 	worn_state = "bride_red"
 	flags_inv = HIDESHOES
 
@@ -442,7 +413,6 @@
 	name = "silky wedding dress"
 	desc = "A white wedding gown made from the finest silk."
 	icon_state = "bride_white"
-	item_state = "nursesuit"
 	worn_state = "bride_white"
 	flags_inv = HIDESHOES
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
@@ -451,7 +421,6 @@
 	name = "sundress"
 	desc = "Makes you want to frolic in a field of daisies."
 	icon_state = "sundress"
-	item_state = "bl_suit"
 	worn_state = "sundress"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 
@@ -459,7 +428,6 @@
 	name = "white sundress"
 	desc = "A white sundress decorated with purple lilies."
 	icon_state = "sundress_white"
-	item_state = "sundress_white"
 	worn_state = "sundress_white"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 
@@ -467,35 +435,35 @@
 	name = "captain's formal uniform"
 	desc = "A captain's formal-wear, for special occasions."
 	icon_state = "captain_formal"
-	item_state = "b_suit"
+	item_state = "lawyer_blue"
 	worn_state = "captain_formal"
 
 /obj/item/clothing/under/hosformalmale
 	name = "head of security's formal uniform"
 	desc = "A male head of security's formal-wear, for special occasions."
 	icon_state = "hos_formal_male"
-	item_state = "r_suit"
+	item_state = "lawyer_red"
 	worn_state = "hos_formal_male"
 
 /obj/item/clothing/under/hosformalfem
 	name = "head of security's formal uniform"
 	desc = "A female head of security's formal-wear, for special occasions."
 	icon_state = "hos_formal_fem"
-	item_state = "r_suit"
+	item_state = "lawyer_red"
 	worn_state = "hos_formal_fem"
 
 /obj/item/clothing/under/assistantformal
 	name = "assistant's formal uniform"
 	desc = "An assistant's formal-wear. Why an assistant needs formal-wear is still unknown."
 	icon_state = "assistant_formal"
-	item_state = "gy_suit"
+	item_state = "lawyer_black"
 	worn_state = "assistant_formal"
 
 /obj/item/clothing/under/suit_jacket/charcoal
 	name = "charcoal suit"
 	desc = "A charcoal suit and red tie. Very professional."
 	icon_state = "charcoal_suit"
-	item_state = "bl_suit"
+	item_state = "lawyer_black"
 	worn_state = "charcoal_suit"
 	starting_accessories = list(/obj/item/clothing/accessory/navy, /obj/item/clothing/accessory/charcoal_jacket)
 
@@ -503,7 +471,7 @@
 	name = "navy suit"
 	desc = "A navy suit and red tie, intended for the station's finest."
 	icon_state = "navy_suit"
-	item_state = "bl_suit"
+	item_state = "lawyer_blue"
 	worn_state = "navy_suit"
 	starting_accessories = list(/obj/item/clothing/accessory/red, /obj/item/clothing/accessory/navy_jacket)
 
@@ -511,7 +479,7 @@
 	name = "burgundy suit"
 	desc = "A burgundy suit and black tie. Somewhat formal."
 	icon_state = "burgundy_suit"
-	item_state = "r_suit"
+	item_state = "lawyer_red"
 	worn_state = "burgundy_suit"
 	starting_accessories = list(/obj/item/clothing/accessory/black, /obj/item/clothing/accessory/burgundy_jacket)
 
@@ -519,7 +487,7 @@
 	name = "checkered suit"
 	desc = "That's a very nice suit you have there. Shame if something were to happen to it, eh?"
 	icon_state = "checkered_suit"
-	item_state = "gy_suit"
+	item_state = "lawyer_black"
 	worn_state = "checkered_suit"
 	starting_accessories = list(/obj/item/clothing/accessory/black, /obj/item/clothing/accessory/checkered_jacket)
 
@@ -527,7 +495,7 @@
 	name = "tan suit"
 	desc = "A tan suit. Smart, but casual."
 	icon_state = "tan_suit"
-	item_state = "lb_suit"
+	item_state = "tan_suit"
 	worn_state = "tan_suit"
 	starting_accessories = list(/obj/item/clothing/accessory/yellow, /obj/item/clothing/accessory/tan_jacket)
 
@@ -535,7 +503,7 @@
 	name = "workman outfit"
 	desc = "The very image of a working man. Not that you're probably doing work."
 	icon_state = "mechanic"
-	item_state = "lb_suit"
+	item_state = "cargo"
 	worn_state = "mechanic"
 	rolled_sleeves = 0
 
@@ -543,7 +511,6 @@
 	name = "white cheongsam"
 	desc = "It is a white cheongsam dress."
 	icon_state = "mai_yang"
-	item_state = "mai_yang"
 	worn_state = "mai_yang"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
 
@@ -551,63 +518,60 @@
 	name = "red cheongsam"
 	desc = "It is a red cheongsam dress."
 	icon_state = "cheongsam-red"
-	item_state = "cheongsam-red"
 	worn_state = "cheongsam-red"
 
 /obj/item/clothing/under/cheongsam/blue
 	name = "blue cheongsam"
 	desc = "It is a blue cheongsam dress."
 	icon_state = "cheongsam-blue"
-	item_state = "cheongsam-blue"
 	worn_state = "cheongsam-blue"
 
 /obj/item/clothing/under/cheongsam/black
 	name = "black cheongsam"
 	desc = "It is a black cheongsam dress."
 	icon_state = "cheongsam-black"
-	item_state = "cheongsam-black"
 	worn_state = "cheongsam-black"
 
 /obj/item/clothing/under/blazer
 	name = "blue blazer"
 	desc = "A bold but yet conservative outfit, red corduroys, navy blazer and a tie."
 	icon_state = "blue_blazer"
-	item_state = "blue_blazer"
+	item_state = "lawyer_blue"
 	worn_state = "blue_blazer"
 
 /obj/item/clothing/under/croptop
 	name = "crop top"
 	desc = "A shirt that has had the top cropped. This one is NT sponsored."
 	icon_state = "croptop"
-	item_state = "gy_suit"
+	item_state = "grey"
 	worn_state = "croptop"
 
 /obj/item/clothing/under/croptop/red
 	name = "red crop top"
 	desc = "A red shirt that has had the top cropped."
 	icon_state = "croptop_red"
-	item_state = "r_suit"
+	item_state = "red"
 	worn_state = "croptop_red"
 
 /obj/item/clothing/under/croptop/grey
 	name = "grey crop top"
 	desc = "A grey shirt that has had the top cropped."
 	icon_state = "croptop_grey"
-	item_state = "gy_suit"
+	item_state = "grey"
 	worn_state = "croptop_grey"
 
 /obj/item/clothing/under/cuttop
 	name = "grey cut top"
 	desc = "A grey shirt that has had the top cut low."
 	icon_state = "cuttop"
-	item_state = "gy_suit"
+	item_state = "grey"
 	worn_state = "cuttop"
 
 /obj/item/clothing/under/cuttop/red
 	name = "red cut top"
 	desc = "A red shirt that has had the top cut low."
 	icon_state = "cuttop_red"
-	item_state = "r_suit"
+	item_state = "red"
 	worn_state = "cuttop_red"
 
 /obj/item/clothing/under/harness
@@ -621,7 +585,6 @@
 	name = "white wedding dress"
 	desc = "A fancy white dress with a blue underdress."
 	icon_state = "whitedress1"
-	item_state = "whitedress1"
 	worn_state = "whitedress1"
 	flags_inv = HIDESHOES
 
@@ -629,7 +592,6 @@
 	name = "long dress"
 	desc = "A long dress."
 	icon_state = "whitedress2"
-	item_state = "whitedress2"
 	worn_state = "whitedress2"
 	flags_inv = HIDESHOES
 
@@ -637,14 +599,12 @@
 	name = "short dress"
 	desc = "A short, plain dress."
 	icon_state = "whitedress3"
-	item_state = "whitedress3"
 	worn_state = "whitedress3"
 
 /obj/item/clothing/under/dress/white4
 	name = "long flared dress"
 	desc = "A long white dress that flares out at the bottom."
 	icon_state = "whitedress4"
-	item_state = "whitedress4"
 	worn_state = "whitedress4"
 	flags_inv = HIDESHOES
 
@@ -652,5 +612,79 @@
 	name = "fancy dark red dress"
 	desc = "A short, red dress with a black belt. Fancy."
 	icon_state = "darkreddress"
-	item_state = "darkreddress"
 	worn_state = "darkreddress"
+	
+/*
+ * swimsuit
+ */
+/obj/item/clothing/under/swimsuit/
+	siemens_coefficient = 1
+	body_parts_covered = 0
+
+/obj/item/clothing/under/swimsuit/black
+	name = "black swimsuit"
+	desc = "An oldfashioned black swimsuit."
+	icon_state = "swim_black"
+	siemens_coefficient = 1
+
+/obj/item/clothing/under/swimsuit/blue
+	name = "blue swimsuit"
+	desc = "An oldfashioned blue swimsuit."
+	icon_state = "swim_blue"
+	siemens_coefficient = 1
+
+/obj/item/clothing/under/swimsuit/purple
+	name = "purple swimsuit"
+	desc = "An oldfashioned purple swimsuit."
+	icon_state = "swim_purp"
+	siemens_coefficient = 1
+
+/obj/item/clothing/under/swimsuit/green
+	name = "green swimsuit"
+	desc = "An oldfashioned green swimsuit."
+	icon_state = "swim_green"
+	siemens_coefficient = 1
+
+/obj/item/clothing/under/swimsuit/red
+	name = "red swimsuit"
+	desc = "An oldfashioned red swimsuit."
+	icon_state = "swim_red"
+	siemens_coefficient = 1
+	
+/*
+ * pyjamas
+ */
+/obj/item/clothing/under/bluepyjamas
+	name = "blue pyjamas"
+	desc = "Slightly old-fashioned sleepwear."
+	icon_state = "blue_pyjamas"
+	item_state = "blue"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
+
+/obj/item/clothing/under/redpyjamas
+	name = "red pyjamas"
+	desc = "Slightly old-fashioned sleepwear."
+	icon_state = "red_pyjamas"
+	item_state = "red"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
+	
+/obj/item/clothing/under/stripper
+	body_parts_covered = 0
+
+/obj/item/clothing/under/stripper/stripper_pink
+	name = "pink swimsuit"
+	desc = "A rather skimpy pink swimsuit."
+	icon_state = "stripper_p_under"
+	siemens_coefficient = 1
+
+/obj/item/clothing/under/stripper/stripper_green
+	name = "green swimsuit"
+	desc = "A rather skimpy green swimsuit."
+	icon_state = "stripper_g_under"
+	siemens_coefficient = 1
+	
+/obj/item/clothing/under/stripper/mankini
+	name = "mankini"
+	desc = "No honest man would wear this abomination"
+	icon_state = "mankini"
+	siemens_coefficient = 1

code/modules/clothing/under/pants.dm

@@ -1,3 +1,4 @@
+//these need item states -S2-
 /obj/item/clothing/under/pants
 	name = "jeans"
 	desc = "A nondescript pair of tough blue jeans."
@@ -81,8 +82,9 @@
 	desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station."
 	icon_state = "camopants"
 
-//Baggy Pants//
-
+/*
+ * Baggy Pants
+ */
 /obj/item/clothing/under/pants/baggy
 	name = "baggy jeans"
 	desc = "A nondescript pair of tough baggy blue jeans."

code/modules/clothing/under/shorts.dm

@@ -1,3 +1,4 @@
+//these need item states -S2-
 /obj/item/clothing/under/shorts
 	name = "athletic shorts"
 	desc = "95% Polyester, 5% Spandex!"
@@ -7,99 +8,80 @@
 /obj/item/clothing/under/shorts/red
 	name = "red athletic shorts"
 	icon_state = "redshorts"
-	worn_state = "redshorts"
 
 /obj/item/clothing/under/shorts/green
 	name = "green athletic shorts"
 	icon_state = "greenshorts"
-	worn_state = "greenshorts"
 
 /obj/item/clothing/under/shorts/blue
 	name = "blue athletic shorts"
 	icon_state = "blueshorts"
-	worn_state = "blueshorts"
 
 /obj/item/clothing/under/shorts/black
 	name = "black athletic shorts"
 	icon_state = "blackshorts"
-	worn_state = "blackshorts"
 
 /obj/item/clothing/under/shorts/grey
 	name = "grey athletic shorts"
 	icon_state = "greyshorts"
-	worn_state = "greyshorts"
 
 /obj/item/clothing/under/shorts/jeans
 	name = "jeans shorts"
 	desc = "Some jeans! Just in short form!"
 	icon_state = "jeans_shorts"
-	worn_state = "jeans_shorts"
 
 /obj/item/clothing/under/shorts/jeans/female
 	name = "jeans short shorts"
 	icon_state = "jeans_shorts_f"
-	worn_state = "jeans_shorts_f"
 
 /obj/item/clothing/under/shorts/jeans/classic
 	name = "classic jeans shorts"
 	icon_state = "jeansclassic_shorts"
-	worn_state = "jeansclassic_shorts"
 
 /obj/item/clothing/under/shorts/jeans/classic/female
 	name = "classic jeans short shorts"
 	icon_state = "jeansclassic_shorts_f"
-	worn_state = "jeansclassic_shorts_f"
 
 /obj/item/clothing/under/shorts/jeans/mustang
 	name = "mustang jeans shorts"
 	icon_state = "jeansmustang_shorts"
-	worn_state = "jeansmustang_shorts"
 
 /obj/item/clothing/under/shorts/jeans/mustang/female
 	name = "mustang jeans short shorts"
 	icon_state = "jeansmustang_shorts_f"
-	worn_state = "jeansmustang_shorts_f"
 
 /obj/item/clothing/under/shorts/jeans/youngfolks
 	name = "young folks jeans shorts"
 	icon_state = "jeansyoungfolks_shorts"
-	worn_state = "jeansyoungfolks_shorts"
 
 /obj/item/clothing/under/shorts/jeans/youngfolks/female
 	name = "young folks jeans short shorts"
 	icon_state = "jeansyoungfolks_shorts_f"
-	worn_state = "jeansyoungfolks_shorts_f"
 
 /obj/item/clothing/under/shorts/jeans/black
 	name = "black jeans shorts"
 	icon_state = "blackpants_shorts"
-	worn_state = "blackpants_shorts"
 
 /obj/item/clothing/under/shorts/jeans/black/female
 	name = "black jeans short shorts"
 	icon_state = "black_shorts_f"
-	worn_state = "black_shorts_f"
 
 /obj/item/clothing/under/shorts/jeans/grey
 	name = "grey jeans shorts"
 	icon_state = "greypants_shorts"
-	worn_state = "greypants_shorts"
 
 /obj/item/clothing/under/shorts/jeans/grey/female
 	name = "grey jeans short shorts"
 	icon_state = "grey_shorts_f"
-	worn_state = "grey_shorts_f"
 
 /obj/item/clothing/under/shorts/khaki
 	name = "khaki shorts"
 	desc = "For that island getaway. It's five o'clock somewhere, right?"
 	icon_state = "tanpants_shorts"
-	worn_state = "tanpants_shorts"
 
 /obj/item/clothing/under/shorts/khaki/female
 	name = "khaki short shorts"
 	icon_state = "khaki_shorts_f"
-	worn_state = "khaki_shorts_f"
 
 //Argh, skirts be below this line -> ------------------------------
 
@@ -107,8 +89,6 @@
 	name = "black skirt"
 	desc = "A black skirt, very fancy!"
 	icon_state = "blackskirt"
-	item_state = "bl_suit"
-	worn_state = "blackskirt"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 	rolled_sleeves = -1
 
@@ -116,128 +96,104 @@
 	name = "khaki skirt"
 	desc = "A skirt that is a khaki color."
 	icon_state = "skirt_khaki"
-	worn_state = "skirt_khaki"
 
 /obj/item/clothing/under/skirt/black
 	name = "short black skirt"
 	desc = "A skirt that is a shiny black."
 	icon_state = "skirt_short_black"
-	worn_state = "skirt_short_black"
 
 /obj/item/clothing/under/skirt/blue
 	name = "short blue skirt"
 	desc = "A skirt that is a shiny blue."
 	icon_state = "skirt_short_blue"
-	worn_state = "skirt_short_blue"
 
 /obj/item/clothing/under/skirt/red
 	name = "short red skirt"
 	desc = "A skirt that is a shiny red."
 	icon_state = "skirt_short_red"
-	worn_state = "skirt_short_red"
 
 /obj/item/clothing/under/skirt/swept
 	name = "swept skirt"
 	desc = "A skirt that is swept to one side."
 	icon_state = "skirt_swept"
-	worn_state = "skirt_swept"
 
 /obj/item/clothing/under/skirt/plaid_blue
 	name = "blue plaid skirt"
 	desc = "A preppy blue skirt with a white blouse."
 	icon_state = "plaid_blue"
-	worn_state = "plaid_blue"
 
 /obj/item/clothing/under/skirt/plaid_red
 	name = "red plaid skirt"
 	desc = "A preppy red skirt with a white blouse."
 	icon_state = "plaid_red"
-	item_state = "kilt"
-	worn_state = "plaid_red"
 
 /obj/item/clothing/under/skirt/plaid_purple
 	name = "blue purple skirt"
 	desc = "A preppy purple skirt with a white blouse."
 	icon_state = "plaid_purple"
-	item_state = "kilt"
-	worn_state = "plaid_purple"
 
 /obj/item/clothing/under/rank/cargo/skirt
 	name = "quartermaster's jumpskirt"
 	desc = "It's a jumpskirt worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
 	icon_state = "qmf"
-	worn_state = "qmf"
 
 /obj/item/clothing/under/rank/cargotech/skirt
 	name = "cargo technician's jumpskirt"
 	desc = "Skirrrrrts! They're comfy and easy to wear!"
 	icon_state = "cargof"
-	worn_state = "cargof"
 
 /obj/item/clothing/under/rank/engineer/skirt
 	desc = "It's an orange high visibility jumpskirt worn by engineers. It has minor radiation shielding."
 	name = "engineer's jumpskirt"
 	icon_state = "enginef"
-	worn_state = "enginef"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
 
 /obj/item/clothing/under/rank/engineer/chief_engineer/skirt
 	desc = "It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding."
 	name = "chief engineer's jumpskirt"
 	icon_state = "chieff"
-	worn_state = "chieff"
 
 /obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt
 	desc = "It's a jumpskirt worn by atmospheric technicians."
 	name = "atmospheric technician's jumpskirt"
 	icon_state = "atmosf"
-	worn_state = "atmosf"
 
 /obj/item/clothing/under/rank/roboticist/skirt
 	desc = "It's a slimming black jumpskirt with reinforced seams; great for industrial work."
 	name = "roboticist's jumpskirt"
 	icon_state = "roboticsf"
-	worn_state = "roboticsf"
 
 /obj/item/clothing/under/rank/scientist/skirt
 	name = "scientist's jumpskirt"
 	icon_state = "sciencewhitef"
-	worn_state = "sciencewhitef"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
 
 /obj/item/clothing/under/rank/medical/skirt
 	name = "medical doctor's jumpskirt"
 	icon_state = "medicalf"
-	worn_state = "medicalf"
 
 /obj/item/clothing/under/rank/medical/chemist/skirt
 	name = "chemist's jumpskirt"
 	icon_state = "chemistrywhitef"
-	worn_state = "chemistrywhitef"
 
 /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt
 	desc = "It's a jumpskirt worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
 	name = "chief medical officer's jumpskirt"
 	icon_state = "cmof"
-	worn_state = "cmof"
 
 /obj/item/clothing/under/rank/medical/geneticist/skirt
 	name = "geneticist's jumpskirt"
 	icon_state = "geneticswhitef"
-	worn_state = "geneticswhitef"
 
 /obj/item/clothing/under/rank/medical/virologist/skirt
 	name = "virologist's jumpskirt"
 	icon_state = "virologywhitef"
-	worn_state = "virologywhitef"
 
 /obj/item/clothing/under/rank/security/skirt
 	name = "security officer's jumpskirt"
 	desc = "Standard feminine fashion for Security Officers.  It's made of sturdier material than the standard jumpskirts."
 	icon_state = "secredf"
-	item_state = "r_suit"
-	worn_state = "secredf"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
 
@@ -245,12 +201,8 @@
 	desc = "Standard feminine fashion for a Warden. It is made of sturdier material than standard jumpskirts. It has the word \"Warden\" written on the shoulders."
 	name = "warden's jumpskirt"
 	icon_state = "wardenf"
-	item_state = "r_suit"
-	worn_state = "wardenf"
 
 /obj/item/clothing/under/rank/security/head_of_security/skirt
 	desc = "It's a fashionable jumpskirt worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer."
 	name = "head of security's jumpskirt"
 	icon_state = "hosredf"
-	item_state = "r_suit"
-	worn_state = "hosredf"

code/modules/clothing/under/syndicate.dm

@@ -1,8 +1,9 @@
+//these need item states -S2-
 /obj/item/clothing/under/syndicate //Merc Tactleneck
 	name = "tactical turtleneck"
 	desc = "It's some non-descript, slightly suspicious looking, civilian clothing."
 	icon_state = "syndicate"
-	item_state = "bl_suit"
+	item_state = "black"
 	worn_state = "syndicate"
 	has_sensor = 0
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
@@ -12,7 +13,7 @@
 	name = "combat turtleneck"
 	desc = "It's some non-descript, slightly suspicious looking, civilian clothing."
 	icon_state = "combat"
-	item_state = "bl_suit"
+	item_state = "black"
 	worn_state = "combat"
 	has_sensor = 1
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
@@ -22,7 +23,7 @@
 	name = "\improper Tacticool turtleneck"
 	desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-."
 	icon_state = "tactifool"
-	item_state = "bl_suit"
+	item_state = "black"
 	worn_state = "tactifool"
 	siemens_coefficient = 1
 	rolled_sleeves = 0