more item_state fixes: worn_state purge

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

@@ -186,6 +186,7 @@
 	name = "leather satchel"
 	desc = "It's a very fancy satchel made with fine leather."
 	icon_state = "satchel"
+	item_state_slots = list(slot_r_hand_str = "briefcase", slot_l_hand_str = "briefcase")
 
 /obj/item/weapon/storage/backpack/satchel/withwallet
 	New()
@@ -196,7 +197,6 @@
 	name = "satchel"
 	desc = "A trendy looking satchel."
 	icon_state = "satchel-norm"
-	item_state_slots = list(slot_r_hand_str = "briefcase", slot_l_hand_str = "briefcase")
 
 /obj/item/weapon/storage/backpack/satchel/eng
 	name = "industrial satchel"

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

@@ -32,6 +32,7 @@
 
 			user.visible_message("<span class='danger'>\The [user] has taped up \the [H]'s eyes!</span>")
 			H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/blindfold/tape(H), slot_glasses)
+			H.update_inv_glasses()
 
 		else if(user.zone_sel.selecting == O_MOUTH || user.zone_sel.selecting == BP_HEAD)
 			if(!H.organs_by_name[BP_HEAD])
@@ -58,6 +59,7 @@
 			user.visible_message("<span class='danger'>\The [user] has taped up \the [H]'s mouth!</span>")
 
 			H.equip_to_slot_or_del(new /obj/item/clothing/mask/muzzle/tape(H), slot_wear_mask)
+			H.update_inv_wear_mask()
 
 		else if(user.zone_sel.selecting == "r_hand" || user.zone_sel.selecting == "l_hand")
 			var/obj/item/weapon/handcuffs/cable/tape/T = new(user)

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -20,7 +20,7 @@
 		new /obj/item/clothing/accessory/storage/brown_vest(src)
 		new /obj/item/blueprints(src)
 		new /obj/item/clothing/under/rank/chief_engineer(src)
-		new /obj/item/clothing/under/rank/engineer/chief_engineer/skirt(src)
+		new /obj/item/clothing/under/rank/chief_engineer/skirt(src)
 		new /obj/item/clothing/head/hardhat/white(src)
 		new /obj/item/clothing/head/welding(src)
 		new /obj/item/clothing/gloves/yellow(src)

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -192,7 +192,7 @@
 				new /obj/item/clothing/under/rank/medical/navyblue(src)
 				new /obj/item/clothing/head/surgery/navyblue(src)
 		new /obj/item/clothing/under/rank/chief_medical_officer(src)
-		new /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt(src)
+		new /obj/item/clothing/under/rank/chief_medical_officer/skirt(src)
 		new /obj/item/clothing/suit/storage/toggle/labcoat/cmo(src)
 		new /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt(src)
 		new /obj/item/weapon/cartridge/cmo(src)

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -246,9 +246,9 @@
 	new /obj/item/clothing/under/rank/atmospheric_technician(src)
 	new /obj/item/clothing/under/rank/atmospheric_technician(src)
 	new /obj/item/clothing/under/rank/atmospheric_technician(src)
-	new /obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt(src)
+	new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src)
-	new /obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt(src)
+	new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src)
-	new /obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt(src)
+	new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src)
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/clothing/shoes/black(src)
@@ -396,8 +396,8 @@
 	..()
 	new /obj/item/clothing/under/rank/chemist(src)
 	new /obj/item/clothing/under/rank/chemist(src)
-	new /obj/item/clothing/under/rank/medical/chemist/skirt(src)
+	new /obj/item/clothing/under/rank/chemist/skirt(src)
-	new /obj/item/clothing/under/rank/medical/chemist/skirt(src)
+	new /obj/item/clothing/under/rank/chemist/skirt(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/suit/storage/toggle/labcoat/chemist(src)
@@ -418,8 +418,8 @@
 	..()
 	new /obj/item/clothing/under/rank/geneticist(src)
 	new /obj/item/clothing/under/rank/geneticist(src)
-	new /obj/item/clothing/under/rank/medical/geneticist/skirt(src)
+	new /obj/item/clothing/under/rank/geneticist/skirt(src)
-	new /obj/item/clothing/under/rank/medical/geneticist/skirt(src)
+	new /obj/item/clothing/under/rank/geneticist/skirt(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/suit/storage/toggle/labcoat/genetics(src)
@@ -440,8 +440,8 @@
 	..()
 	new /obj/item/clothing/under/rank/virologist(src)
 	new /obj/item/clothing/under/rank/virologist(src)
-	new /obj/item/clothing/under/rank/medical/virologist/skirt(src)
+	new /obj/item/clothing/under/rank/virologist/skirt(src)
-	new /obj/item/clothing/under/rank/medical/virologist/skirt(src)
+	new /obj/item/clothing/under/rank/virologist/skirt(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/suit/storage/toggle/labcoat/virologist(src)

code/modules/client/preference_setup/loadout/loadout_uniform.dm

@@ -90,12 +90,12 @@
 
 /datum/gear/uniform/job_skirt/ce
 	display_name = "skirt, ce"
-	path = /obj/item/clothing/under/rank/engineer/chief_engineer/skirt
+	path = /obj/item/clothing/under/rank/chief_engineer/skirt
 	allowed_roles = list("Chief Engineer")
 
 /datum/gear/uniform/job_skirt/atmos
 	display_name = "skirt, atmos"
-	path = /obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt
+	path = /obj/item/clothing/under/rank/atmospheric_technician/skirt
 	allowed_roles = list("Chief Engineer","Atmospheric Technician")
 
 /datum/gear/uniform/job_skirt/eng
@@ -110,17 +110,17 @@
 
 /datum/gear/uniform/job_skirt/cmo
 	display_name = "skirt, cmo"
-	path = /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt
+	path = /obj/item/clothing/under/rank/chief_medical_officer/skirt
 	allowed_roles = list("Chief Medical Officer")
 
 /datum/gear/uniform/job_skirt/chem
 	display_name = "skirt, chemist"
-	path = /obj/item/clothing/under/rank/medical/chemist/skirt
+	path = /obj/item/clothing/under/rank/chemist/skirt
 	allowed_roles = list("Chief Medical Officer","Chemist")
 
 /datum/gear/uniform/job_skirt/viro
 	display_name = "skirt, virologist"
-	path = /obj/item/clothing/under/rank/medical/virologist/skirt
+	path = /obj/item/clothing/under/rank/virologist/skirt
 	allowed_roles = list("Chief Medical Officer","Medical Doctor")
 
 /datum/gear/uniform/job_skirt/med
@@ -145,7 +145,7 @@
 
 /datum/gear/uniform/job_skirt/warden
 	display_name = "skirt, warden"
-	path = /obj/item/clothing/under/rank/security/warden/skirt
+	path = /obj/item/clothing/under/rank/warden/skirt
 	allowed_roles = list("Head of Security", "Warden")
 
 /datum/gear/uniform/job_skirt/security
@@ -155,7 +155,7 @@
 
 /datum/gear/uniform/job_skirt/head_of_security
 	display_name = "skirt, hos"
-	path = /obj/item/clothing/under/rank/security/head_of_security/skirt
+	path = /obj/item/clothing/under/rank/head_of_security/skirt
 	allowed_roles = list("Head of Security")
 
 /datum/gear/uniform/jeans_qm

code/modules/clothing/head/misc_special.dm

@@ -51,9 +51,11 @@
 			icon_state = "[base_state]up"
 			usr << "You push the [src] up out of your face."
 		update_clothing_icon()	//so our mob-overlays
+		if (ismob(src.loc)) //should allow masks to update when it is opened/closed
+			var/mob/M = src.loc
+			M.update_inv_wear_mask()
 		usr.update_action_buttons()
 
-
 /*
  * Cakehat
  */

code/modules/clothing/shoes/jobs.dm

@@ -19,6 +19,7 @@
 /obj/item/clothing/shoes/jackboots/toeless
 	name = "toe-less jackboots"
 	desc = "Modified pair of jackboots, particularly friendly to those species whose toes hold claws."
+	icon_state = "digiboots"
 	item_state_slots = list(slot_r_hand_str = "jackboots", slot_l_hand_str = "jackboots")
 	species_restricted = null
 

code/modules/clothing/under/color.dm

@@ -1,7 +1,6 @@
 /obj/item/clothing/under/color/black
 	name = "black jumpsuit"
 	icon_state = "black"
-	worn_state = "black"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/blackf
@@ -15,31 +14,26 @@
 	desc = "A slimming black jumpskirt."
 	icon_state = "blackjumpskirt"
 	item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
-	worn_state = "blackjumpskirt"
 
 /obj/item/clothing/under/color/blue
 	name = "blue jumpsuit"
 	icon_state = "blue"
-	worn_state = "blue"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/green
 	name = "green jumpsuit"
 	icon_state = "green"
-	worn_state = "green"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/grey
 	name = "grey jumpsuit"
 	icon_state = "grey"
-	worn_state = "grey"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/orange
 	name = "orange jumpsuit"
 	desc = "It's standardised prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
 	icon_state = "orange"
-	worn_state = "orange"
 	has_sensor = 2
 	sensor_mode = 3
 	rolled_sleeves = 0
@@ -47,39 +41,33 @@
 /obj/item/clothing/under/color/pink
 	name = "pink jumpsuit"
 	icon_state = "pink"
-	worn_state = "pink"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/red
 	name = "red jumpsuit"
 	icon_state = "red"
-	worn_state = "red"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/white
 	name = "white jumpsuit"
 	icon_state = "white"
-	worn_state = "white"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/yellow
 	name = "yellow jumpsuit"
 	icon_state = "yellow"
-	worn_state = "yellow"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/psyche
 	name = "psychedelic jumpsuit"
 	desc = "Groovy!"
 	icon_state = "psyche"
-	worn_state = "psyche"
 
 /obj/item/clothing/under/color/lightblue
 	name = "lightblue jumpsuit"
 	desc = "A light blue jumpsuit."
 	icon_state = "lightblue"
 	item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
-	worn_state = "lightblue"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/aqua
@@ -87,14 +75,12 @@
 	desc = "An aqua jumpsuit."
 	icon_state = "aqua"
 	item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
-	worn_state = "aqua"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/color
 	name = "purple jumpsuit"
 	desc = "The latest in space fashion."
 	icon_state = "purple"
-	worn_state = "purple"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/lightpurple
@@ -102,7 +88,6 @@
 	desc = "A light purple jumpsuit."
 	icon_state = "lightpurple"
 	item_state_slots = list(slot_r_hand_str = "purple", slot_l_hand_str = "purple")
-	worn_state = "lightpurple"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/lightgreen
@@ -110,14 +95,12 @@
 	desc = "A light green jumpsuit."
 	icon_state = "lightgreen"
 	item_state_slots = list(slot_r_hand_str = "green", slot_l_hand_str = "green")
-	worn_state = "lightgreen"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/lightbrown
 	name = "lightbrown jumpsuit"
 	desc = "A light brown jumpsuit."
 	icon_state = "lightbrown"
-	worn_state = "lightbrown"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/brown
@@ -125,7 +108,6 @@
 	desc = "A brown jumpsuit."
 	icon_state = "brown"
 	item_state_slots = list(slot_r_hand_str = "lightbrown", slot_l_hand_str = "lightbrown")
-	worn_state = "brown"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/yellowgreen
@@ -133,7 +115,6 @@
 	desc = "A... yellow green jumpsuit?"
 	icon_state = "yellowgreen"
 	item_state_slots = list(slot_r_hand_str = "yellow", slot_l_hand_str = "yellow")
-	worn_state = "yellowgreen"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/darkblue
@@ -141,7 +122,6 @@
 	desc = "A dark blue jumpsuit."
 	icon_state = "darkblue"
 	item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
-	worn_state = "darkblue"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/lightred
@@ -149,7 +129,6 @@
 	desc = "A light red jumpsuit."
 	icon_state = "lightred"
 	item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red")
-	worn_state = "lightred"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/color/darkred
@@ -157,5 +136,4 @@
 	desc = "A dark red jumpsuit."
 	icon_state = "darkred"
 	item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red")
-	worn_state = "darkred"
 	rolled_sleeves = 0

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

@@ -4,14 +4,12 @@
 	desc = "It looks like it could use some more flair."
 	name = "bartender's uniform"
 	icon_state = "ba_suit"
-	worn_state = "ba_suit"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
 	desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"."
 	name = "captain's jumpsuit"
 	icon_state = "captain"
-	worn_state = "captain"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/rank/cargo
@@ -19,28 +17,23 @@
 	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_slots = list(slot_r_hand_str = "cargo", slot_l_hand_str = "cargo")
-	worn_state = "qm"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/rank/cargo/jeans
 	name = "quartermaster's jumpjeans"
 	desc = "Jeeeaaans! They're comfy!"
 	icon_state = "qmj"
-	worn_state = "qmj"
 
 /obj/item/clothing/under/rank/cargo/jeans/female
 	name = "quartermaster's jumpjeans"
 	desc = "Jeeeaaans! They're comfy!"
 	icon_state = "qmjf"
-	worn_state = "qmjf"
 	rolled_sleeves = -1
 
 /obj/item/clothing/under/rank/cargotech
 	name = "cargo technician's jumpsuit"
 	desc = "Shooooorts! They're comfy and easy to wear!"
-	icon_state = "cargotech"
+	icon_state = "cargo"
-	item_state_slots = list(slot_r_hand_str = "cargo", slot_l_hand_str = "cargo")
-	worn_state = "cargo"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 	rolled_sleeves = 0
 
@@ -48,42 +41,37 @@
 	name = "cargo technician's jumpjeans"
 	desc = "Jeeeaaans! They're comfy!"
 	icon_state = "cargoj"
-	worn_state = "cargoj"
+	item_state_slots = list(slot_r_hand_str = "cargo", slot_l_hand_str = "cargo")
 	rolled_sleeves = -1
 
 /obj/item/clothing/under/rank/cargotech/jeans/female
 	name = "cargo technician's jumpjeans"
 	desc = "Jeeeaaans! They're comfy!"
 	icon_state = "cargojf"
-	worn_state = "cargojf"
 
 /obj/item/clothing/under/rank/chaplain
 	desc = "It's a black jumpsuit, often worn by religious folk."
 	name = "chaplain's jumpsuit"
 	icon_state = "chaplain"
 	item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
-	worn_state = "chapblack"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/rank/chef
 	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"
-	worn_state = "chef"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/rank/clown
 	name = "clown suit"
 	desc = "<i>'HONK!'</i>"
 	icon_state = "clown"
-	worn_state = "clown"
 	rolled_sleeves = -1
 
 /obj/item/clothing/under/rank/head_of_personnel
 	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"
-	worn_state = "hop"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/rank/head_of_personnel_whimsy
@@ -91,7 +79,6 @@
 	name = "head of personnel's suit"
 	icon_state = "hopwhimsy"
 	item_state_slots = list(slot_r_hand_str = "hop", slot_l_hand_str = "hop")
-	worn_state = "hopwhimsy"
 	rolled_sleeves = -1
 
 /obj/item/clothing/under/rank/hydroponics
@@ -99,7 +86,6 @@
 	name = "botanist's jumpsuit"
 	icon_state = "hydroponics"
 	item_state_slots = list(slot_r_hand_str = "green", slot_l_hand_str = "green")
-	worn_state = "hydroponics"
 	permeability_coefficient = 0.50
 	rolled_sleeves = 0
 
@@ -108,7 +94,6 @@
 	name = "Internal Affairs uniform"
 	icon_state = "internalaffairs"
 	item_state_slots = list(slot_r_hand_str = "ba_suit", slot_l_hand_str = "ba_suit")
-	worn_state = "internalaffairs"
 	rolled_sleeves = 0
 	starting_accessories = list(/obj/item/clothing/accessory/black)
 
@@ -126,61 +111,51 @@
 /obj/item/clothing/under/lawyer/black
 	name = "black Lawyer suit"
 	icon_state = "lawyer_black"
-	worn_state = "lawyer_black"
 
 /obj/item/clothing/under/lawyer/female
 	name = "black Lawyer suit"
 	icon_state = "black_suit_fem"
 	item_state_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "lawyer_black")
-	worn_state = "black_suit_fem"
 
 /obj/item/clothing/under/lawyer/red
 	name = "red Lawyer suit"
 	icon_state = "lawyer_red"
-	worn_state = "lawyer_red"
 
 /obj/item/clothing/under/lawyer/blue
 	name = "blue Lawyer suit"
 	icon_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_slots = list(slot_r_hand_str = "lawyer_blue", slot_l_hand_str = "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_slots = list(slot_r_hand_str = "purple", slot_l_hand_str = "purple")
-	worn_state = "lawyer_purp"
 
 /obj/item/clothing/under/lawyer/oldman
 	name = "Old Man's Suit"
 	desc = "A classic suit for the older gentleman with built in back support."
 	icon_state = "oldman"
 	item_state_slots = list(slot_r_hand_str = "johnny", slot_l_hand_str = "johnny")
-	worn_state = "oldman"
 
 /obj/item/clothing/under/librarian
 	name = "sensible suit"
 	desc = "It's very... sensible."
 	icon_state = "red_suit"
 	item_state_slots = list(slot_r_hand_str = "lawyer_red", slot_l_hand_str = "lawyer_red")
-	worn_state = "red_suit"
 
 /obj/item/clothing/under/mime
 	name = "mime's outfit"
 	desc = "It's not very colourful."
 	icon_state = "mime"
-	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"
-	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"
-	worn_state = "chief"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
 	rolled_sleeves = 0
 
@@ -11,14 +10,12 @@
 	desc = "It's a jumpsuit worn by atmospheric technicians."
 	name = "atmospheric technician's jumpsuit"
 	icon_state = "atmos"
-	worn_state = "atmos"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/rank/engineer
 	desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."
 	name = "engineer's jumpsuit"
 	icon_state = "engine"
-	worn_state = "engine"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
 	rolled_sleeves = 0
 
@@ -26,5 +23,4 @@
 	desc = "It's a slimming black jumpsuit with reinforced seams; great for industrial work."
 	name = "roboticist's jumpsuit"
 	icon_state = "robotics"
-	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"
-	worn_state = "director"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 
 /obj/item/clothing/under/rank/research_director/rdalt
@@ -13,14 +12,12 @@
 	name = "head researcher uniform"
 	icon_state = "rdalt"
 	item_state_slots = list(slot_r_hand_str = "director", slot_l_hand_str = "director")
-	worn_state = "rdalt"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 
 /obj/item/clothing/under/rank/research_director/dress_rd
 	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"
-	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
 
@@ -29,7 +26,6 @@
 	name = "scientist's jumpsuit"
 	icon_state = "science"
 	item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
-	worn_state = "sciencewhite"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
 	rolled_sleeves = 0
@@ -39,7 +35,6 @@
 	name = "chemist's jumpsuit"
 	icon_state = "chemistry"
 	item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
-	worn_state = "chemistrywhite"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	rolled_sleeves = 0
@@ -52,7 +47,6 @@
 	name = "chief medical officer's jumpsuit"
 	icon_state = "cmo"
 	item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
-	worn_state = "cmo"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	rolled_sleeves = 0
@@ -62,7 +56,6 @@
 	name = "geneticist's jumpsuit"
 	icon_state = "genetics"
 	item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
-	worn_state = "geneticswhite"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	rolled_sleeves = 0
@@ -72,7 +65,6 @@
 	name = "virologist's jumpsuit"
 	icon_state = "virology"
 	item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
-	worn_state = "virologywhite"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	rolled_sleeves = 0
@@ -81,7 +73,6 @@
 	desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
 	name = "nurse's suit"
 	icon_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)
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
@@ -92,7 +83,6 @@
 	name = "nurse's dress"
 	icon_state = "nurse"
 	item_state_slots = list(slot_r_hand_str = "nursesuit", slot_l_hand_str = "nursesuit")
-	worn_state = "nurse"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
@@ -103,7 +93,6 @@
 	name = "orderly's uniform"
 	icon_state = "orderly"
 	item_state_slots = list(slot_r_hand_str = "nursesuit", slot_l_hand_str = "nursesuit")
-	worn_state = "orderly"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	rolled_sleeves = 0
@@ -113,7 +102,6 @@
 	name = "medical doctor's jumpsuit"
 	icon_state = "medical"
 	item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
-	worn_state = "medical"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 	rolled_sleeves = 0
@@ -131,7 +119,6 @@
 	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_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
-	worn_state = "scrubsblue"
 	rolled_sleeves = -1
 
 /obj/item/clothing/under/rank/medical/green
@@ -139,7 +126,6 @@
 	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_slots = list(slot_r_hand_str = "green", slot_l_hand_str = "green")
-	worn_state = "scrubsgreen"
 	rolled_sleeves = -1
 
 /obj/item/clothing/under/rank/medical/purple
@@ -147,7 +133,6 @@
 	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_slots = list(slot_r_hand_str = "purple", slot_l_hand_str = "purple")
-	worn_state = "scrubspurple"
 	rolled_sleeves = -1
 
 /obj/item/clothing/under/rank/medical/black
@@ -155,7 +140,6 @@
 	desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in black."
 	icon_state = "scrubsblack"
 	item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
-	worn_state = "scrubsblack"
 	rolled_sleeves = -1
 
 /obj/item/clothing/under/rank/medical/navyblue
@@ -163,7 +147,6 @@
 	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_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
-	worn_state = "scrubsnavyblue"
 	rolled_sleeves = -1
 
 /obj/item/clothing/under/rank/psych
@@ -171,14 +154,12 @@
 	name = "psychiatrist's jumpsuit"
 	icon_state = "psych"
 	item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "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_slots = list(slot_r_hand_str = "psyche", slot_l_hand_str = "psyche")
-	worn_state = "psychturtle"
 	rolled_sleeves = 0
 
 /*
@@ -189,7 +170,6 @@
 	name = "geneticist's jumpsuit"
 	icon_state = "genetics_new"
 	item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "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)
 	rolled_sleeves = 0
@@ -199,7 +179,6 @@
 	name = "chemist's jumpsuit"
 	icon_state = "chemist_new"
 	item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "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)
 	rolled_sleeves = 0
@@ -209,7 +188,6 @@
 	name = "scientist's jumpsuit"
 	icon_state = "scientist_new"
 	item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "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)
 	rolled_sleeves = 0
@@ -219,7 +197,6 @@
 	name = "virologist's jumpsuit"
 	icon_state = "virologist_new"
 	item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "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)
 	rolled_sleeves = 0

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

@@ -13,7 +13,6 @@
 	name = "warden's jumpsuit"
 	icon_state = "warden"
 	item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red")
-	worn_state = "warden"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
 	rolled_sleeves = 0
@@ -29,7 +28,6 @@
 	desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
 	icon_state = "security"
 	item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red")
-	worn_state = "secred"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
 	rolled_sleeves = 0
@@ -39,7 +37,6 @@
 	desc = "A dress shirt and khakis with a security patch sewn on."
 	icon_state = "dispatch"
 	item_state_slots = list(slot_r_hand_str = "detective", slot_l_hand_str = "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
 	siemens_coefficient = 0.9
@@ -49,7 +46,6 @@
 	desc = "It's made of a slightly sturdier material, to allow for robust protection."
 	icon_state = "redshirt2"
 	item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red")
-	worn_state = "redshirt2"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
 	rolled_sleeves = 0
@@ -57,13 +53,11 @@
 /obj/item/clothing/under/rank/security/corp
 	icon_state = "sec_corporate"
 	item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
-	worn_state = "sec_corporate"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/rank/warden/corp
 	icon_state = "warden_corporate"
 	item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
-	worn_state = "warden_corporate"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/tactical
@@ -71,7 +65,6 @@
 	desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
 	icon_state = "swatunder"
 	item_state_slots = list(slot_r_hand_str = "green", slot_l_hand_str = "green")
-	worn_state = "swatunder"
 	armor = list(melee = 10, bullet = 5, laser = 5,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
 	rolled_sleeves = -1
@@ -83,7 +76,6 @@
 	name = "detective's suit"
 	desc = "A rumpled white dress shirt paired with well-worn grey slacks."
 	icon_state = "detective"
-	worn_state = "detective"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
 	rolled_sleeves = 0
@@ -102,13 +94,11 @@
 */
 /obj/item/clothing/under/det/grey
 	icon_state = "detective2"
-	worn_state = "detective2"
 	desc = "A serious-looking tan dress shirt paired with freshly-pressed black slacks."
 	starting_accessories = list(/obj/item/clothing/accessory/red_long)
 
 /obj/item/clothing/under/det/black
 	icon_state = "detective3"
-	worn_state = "detective3"
 	item_state_slots = list(slot_r_hand_str = "sl_suit", slot_l_hand_str = "sl_suit")
 	desc = "An immaculate white dress shirt, paired with a pair of dark grey dress pants, a red tie, and a charcoal vest."
 	starting_accessories = list(/obj/item/clothing/accessory/red_long, /obj/item/clothing/accessory/vest)
@@ -117,17 +107,14 @@
 	name = "detective's jumpsuit"
 	icon_state = "det_corporate"
 	item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
-	worn_state = "det_corporate"
 	desc = "A more modern uniform for corporate investigators."
 
 /obj/item/clothing/under/det/waistcoat
 	icon_state = "detective_waistcoat"
-	worn_state = "detective_waistcoat"
 	desc = "A rumpled white dress shirt paired with well-worn grey slacks, complete with a blue striped tie, faux-gold tie clip, and waistcoat."
 
 /obj/item/clothing/under/det/grey/waistcoat
 	icon_state = "detective2_waistcoat"
-	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
@@ -152,7 +139,6 @@
 	name = "head of security's jumpsuit"
 	icon_state = "hos"
 	item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red")
-	worn_state = "hosred"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.8
 	rolled_sleeves = 0
@@ -160,7 +146,6 @@
 /obj/item/clothing/under/rank/head_of_security/corp
 	icon_state = "hos_corporate"
 	item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
-	worn_state = "hos_corporate"
 	rolled_sleeves = 0
 
 /obj/item/clothing/head/helmet/HoS
@@ -191,7 +176,6 @@
 	desc = "You never asked for anything that stylish."
 	name = "head of security's jumpsuit"
 	icon_state = "jensen"
-	worn_state = "jensen"
 	siemens_coefficient = 0.6
 	rolled_sleeves = -1
 
@@ -210,7 +194,6 @@
 	desc = "The latest in fashionable security outfits."
 	icon_state = "officerblueclothes"
 	item_state_slots = list(slot_r_hand_str = "ba_suit", slot_l_hand_str = "ba_suit")
-	worn_state = "officerblueclothes"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/rank/head_of_security/navyblue
@@ -218,7 +201,6 @@
 	name = "head of security's uniform"
 	icon_state = "hosblueclothes"
 	item_state_slots = list(slot_r_hand_str = "ba_suit", slot_l_hand_str = "ba_suit")
-	worn_state = "hosblueclothes"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/rank/warden/navyblue
@@ -226,5 +208,4 @@
 	name = "warden's uniform"
 	icon_state = "wardenblueclothes"
 	item_state_slots = list(slot_r_hand_str = "ba_suit", slot_l_hand_str = "ba_suit")
-	worn_state = "wardenblueclothes"
 	rolled_sleeves = 0

code/modules/clothing/under/miscellaneous.dm

@@ -2,14 +2,12 @@
 	name = "red pj's"
 	desc = "Sleepwear."
 	icon_state = "red_pyjamas"
-	worn_state = "red_pyjamas"
 	item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
 
 /obj/item/clothing/under/pj/blue
 	name = "blue pj's"
 	desc = "Sleepwear."
 	icon_state = "blue_pyjamas"
-	worn_state = "blue_pyjamas"
 	item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
 
 /obj/item/clothing/under/captain_fly
@@ -17,26 +15,22 @@
 	desc = "For the man who doesn't care because he's still free."
 	icon_state = "captain_fly"
 	item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "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"
-	worn_state = "scratch"
 
 /obj/item/clothing/under/sl_suit
 	desc = "It's a very amish looking suit."
 	name = "amish suit"
 	icon_state = "sl_suit"
-	worn_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"
-	worn_state = "waiter"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/rank/mailman
@@ -44,7 +38,6 @@
 	desc = "<i>'Special delivery!'</i>"
 	icon_state = "mailman"
 	item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
-	worn_state = "mailman"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/sexyclown
@@ -52,7 +45,6 @@
 	desc = "It makes you look HONKable!"
 	icon_state = "sexyclown"
 	item_state_slots = list(slot_r_hand_str = "clown", slot_l_hand_str = "clown")
-	worn_state = "sexyclown"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 	rolled_sleeves = -1 //Please never
 
@@ -61,7 +53,6 @@
 	desc = "It's the standard issue pretty-boy outfit, as seen on Holo-Vision."
 	icon_state = "vice"
 	item_state_slots = list(slot_r_hand_str = "grey", slot_l_hand_str = "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.
 /obj/item/clothing/under/rank/centcom
@@ -69,7 +60,6 @@
 	name = "\improper Officer's Dress Uniform"
 	icon_state = "officer"
 	item_state_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "lawyer_black")
-	worn_state = "officer"
 	displays_id = 0
 
 /obj/item/clothing/under/rank/centcom_officer
@@ -77,7 +67,6 @@
 	name = "\improper Officer's Dress Uniform"
 	icon_state = "officer"
 	item_state_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "lawyer_black")
-	worn_state = "officer"
 	displays_id = 0
 
 /obj/item/clothing/under/rank/centcom_captain
@@ -85,7 +74,6 @@
 	name = "\improper Officer's Dress Uniform"
 	icon_state = "centcom"
 	item_state_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "lawyer_black")
-	worn_state = "centcom"
 	displays_id = 0
 
 /obj/item/clothing/under/ert
@@ -93,14 +81,12 @@
 	desc = "A short-sleeved black uniform, paired with grey digital-camo cargo pants. It looks very tactical."
 	icon_state = "ert_uniform"
 	item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "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_slots = list(slot_r_hand_str = "centcom", slot_l_hand_str = "centcom")
-	worn_state = "greensuit"
 	rolled_sleeves = 0
 	starting_accessories = list(/obj/item/clothing/accessory/darkgreen)
 
@@ -108,7 +94,6 @@
 	name = "\improper NASA jumpsuit"
 	desc = "It has a NASA logo on it and is made of space-proofed materials."
 	icon_state = "black"
-	worn_state = "black"
 	w_class = 4//bulky item
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.02
@@ -121,7 +106,6 @@
 	name = "administrative cybernetic jumpsuit"
 	icon_state = "syndicate"
 	item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
-	worn_state = "syndicate"
 	desc = "it's a cybernetically enhanced jumpsuit used for administrative duties."
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
@@ -135,26 +119,22 @@
 	name = "owl uniform"
 	desc = "A jumpsuit with owl wings. Photorealistic owl feathers! Twooooo!"
 	icon_state = "owl"
-	worn_state = "owl"
 
 /obj/item/clothing/under/johnny
 	name = "johnny~~ jumpsuit"
 	desc = "Johnny~~"
 	icon_state = "johnny"
-	worn_state = "johnny"
 
 /obj/item/clothing/under/color/rainbow
 	name = "rainbow jumpsuit"
 	desc = "A multi-colored jumpsuit."
 	icon_state = "rainbow"
-	worn_state = "rainbow"
 
 /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_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
-	worn_state = "psysuit"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 
 /obj/item/clothing/under/gentlesuit
@@ -162,7 +142,6 @@
 	desc = "A silk black shirt with a white tie and a matching gray vest and slacks. Feels proper."
 	icon_state = "gentlesuit"
 	item_state_slots = list(slot_r_hand_str = "grey", slot_l_hand_str = "grey")
-	worn_state = "gentlesuit"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/gimmick/rank/captain/suit
@@ -170,49 +149,42 @@
 	desc = "A green suit and yellow necktie. Exemplifies authority."
 	icon_state = "green_suit"
 	item_state_slots = list(slot_r_hand_str = "centcom", slot_l_hand_str = "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_slots = list(slot_r_hand_str = "green", slot_l_hand_str = "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_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "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_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "lawyer_black")
-	worn_state = "black_suit"
 
 /obj/item/clothing/under/suit_jacket/female
 	name = "executive suit"
 	desc = "A formal trouser suit for women, intended for the station's finest."
 	icon_state = "black_suit_fem"
 	item_state_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "lawyer_black")
-	worn_state = "black_suit_fem"
 
 /obj/item/clothing/under/suit_jacket/red
 	name = "red suit"
 	desc = "A red suit and blue tie. Somewhat formal."
 	icon_state = "red_suit"
 	item_state_slots = list(slot_r_hand_str = "lawyer_red", slot_l_hand_str = "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_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
-	worn_state = "schoolgirl"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 
 /obj/item/clothing/under/overalls
@@ -220,14 +192,12 @@
 	desc = "A set of durable overalls for getting the job done."
 	icon_state = "overalls"
 	item_state_slots = list(slot_r_hand_str = "cargo", slot_l_hand_str = "cargo")
-	worn_state = "overalls"
 
 /obj/item/clothing/under/pirate
 	name = "pirate outfit"
 	desc = "Yarr."
 	icon_state = "pirate"
 	item_state_slots = list(slot_r_hand_str = "sl_suit", slot_l_hand_str = "sl_suit")
-	worn_state = "pirate"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
 
 /obj/item/clothing/under/soviet
@@ -235,20 +205,17 @@
 	desc = "For the Motherland!"
 	icon_state = "soviet"
 	item_state_slots = list(slot_r_hand_str = "grey", slot_l_hand_str = "grey")
-	worn_state = "soviet"
 
 /obj/item/clothing/under/redcoat
 	name = "redcoat uniform"
 	desc = "Looks old."
 	icon_state = "redcoat"
 	item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red")
-	worn_state = "redcoat"
 
 /obj/item/clothing/under/kilt
 	name = "kilt"
 	desc = "Includes shoes and plaid"
 	icon_state = "kilt"
-	worn_state = "kilt"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|FEET
 
 /obj/item/clothing/under/sexymime
@@ -256,7 +223,6 @@
 	desc = "The only time when you DON'T enjoy looking at someone's rack."
 	icon_state = "sexymime"
 	item_state_slots = list(slot_r_hand_str = "mime", slot_l_hand_str = "mime")
-	worn_state = "sexymime"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 	rolled_sleeves = -1 //Please never
 
@@ -265,7 +231,6 @@
 	desc = "Are you not entertained? Is that not why you are here?"
 	icon_state = "gladiator"
 	item_state_slots = list(slot_r_hand_str = "yellow", slot_l_hand_str = "yellow")
-	worn_state = "gladiator"
 	body_parts_covered = LOWER_TORSO
 
 /*
@@ -278,101 +243,85 @@
 	name = "black tango dress"
 	desc = "Filled with Latin fire."
 	icon_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_slots = list(slot_r_hand_str = "black_tango", slot_l_hand_str = "black_tango")
-	worn_state = "black_tango_alt"
 
 /obj/item/clothing/under/dress/stripeddress
 	name = "striped dress"
 	desc = "Fashion in space."
 	icon_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"
-	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"
-	worn_state = "red_evening_gown"
 
 /obj/item/clothing/under/dress/maid
 	name = "maid costume"
 	desc = "Maid in China."
 	icon_state = "maid"
-	worn_state = "maid"
 
 /obj/item/clothing/under/dress/janimaid
 	name = "maid uniform"
 	desc = "A simple maid uniform for housekeeping."
 	icon_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"
-	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"
-	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"
-	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"
-	worn_state = "dress_pink"
 
 /obj/item/clothing/under/dress/dress_yellow
 	name = "yellow dress"
 	desc = "A flirty, little yellow dress."
 	icon_state = "dress_yellow"
-	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_slots = list(slot_r_hand_str = "dress_white", slot_l_hand_str = "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"
-	worn_state = "dress_cap"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
 /obj/item/clothing/under/dress/dress_hop
 	name = "head of personnel dress uniform"
 	desc = "Feminine fashion for the style concious HoP."
 	icon_state = "dress_hop"
-	worn_state = "dress_hop"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
 /obj/item/clothing/under/dress/dress_hr
 	name = "human resources director uniform"
 	desc = "Superior class for the nosy H.R. Director."
 	icon_state = "huresource"
-	worn_state = "huresource"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
 /*
@@ -385,35 +334,30 @@
 	name = "orange wedding dress"
 	desc = "A big and puffy orange dress."
 	icon_state = "bride_orange"
-	worn_state = "bride_orange"
 	flags_inv = HIDESHOES
 
 /obj/item/clothing/under/wedding/bride_purple
 	name = "purple wedding dress"
 	desc = "A big and puffy purple dress."
 	icon_state = "bride_purple"
-	worn_state = "bride_purple"
 	flags_inv = HIDESHOES
 
 /obj/item/clothing/under/wedding/bride_blue
 	name = "blue wedding dress"
 	desc = "A big and puffy blue dress."
 	icon_state = "bride_blue"
-	worn_state = "bride_blue"
 	flags_inv = HIDESHOES
 
 /obj/item/clothing/under/wedding/bride_red
 	name = "red wedding dress"
 	desc = "A big and puffy red dress."
 	icon_state = "bride_red"
-	worn_state = "bride_red"
 	flags_inv = HIDESHOES
 
 /obj/item/clothing/under/wedding/bride_white
 	name = "silky wedding dress"
 	desc = "A white wedding gown made from the finest silk."
 	icon_state = "bride_white"
-	worn_state = "bride_white"
 	flags_inv = HIDESHOES
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 
@@ -421,14 +365,12 @@
 	name = "sundress"
 	desc = "Makes you want to frolic in a field of daisies."
 	icon_state = "sundress"
-	worn_state = "sundress"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 
 /obj/item/clothing/under/sundress_white
 	name = "white sundress"
 	desc = "A white sundress decorated with purple lilies."
 	icon_state = "sundress_white"
-	worn_state = "sundress_white"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 
 /obj/item/clothing/under/captainformal
@@ -436,35 +378,30 @@
 	desc = "A captain's formal-wear, for special occasions."
 	icon_state = "captain_formal"
 	item_state_slots = list(slot_r_hand_str = "lawyer_blue", slot_l_hand_str = "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_slots = list(slot_r_hand_str = "lawyer_red", slot_l_hand_str = "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_slots = list(slot_r_hand_str = "lawyer_red", slot_l_hand_str = "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_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "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_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "lawyer_black")
-	worn_state = "charcoal_suit"
 	starting_accessories = list(/obj/item/clothing/accessory/navy, /obj/item/clothing/accessory/charcoal_jacket)
 
 /obj/item/clothing/under/suit_jacket/navy
@@ -472,7 +409,6 @@
 	desc = "A navy suit and red tie, intended for the station's finest."
 	icon_state = "navy_suit"
 	item_state_slots = list(slot_r_hand_str = "lawyer_blue", slot_l_hand_str = "lawyer_blue")
-	worn_state = "navy_suit"
 	starting_accessories = list(/obj/item/clothing/accessory/red, /obj/item/clothing/accessory/navy_jacket)
 
 /obj/item/clothing/under/suit_jacket/burgundy
@@ -480,7 +416,6 @@
 	desc = "A burgundy suit and black tie. Somewhat formal."
 	icon_state = "burgundy_suit"
 	item_state_slots = list(slot_r_hand_str = "lawyer_red", slot_l_hand_str = "lawyer_red")
-	worn_state = "burgundy_suit"
 	starting_accessories = list(/obj/item/clothing/accessory/black, /obj/item/clothing/accessory/burgundy_jacket)
 
 /obj/item/clothing/under/suit_jacket/checkered
@@ -488,7 +423,6 @@
 	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_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "lawyer_black")
-	worn_state = "checkered_suit"
 	starting_accessories = list(/obj/item/clothing/accessory/black, /obj/item/clothing/accessory/checkered_jacket)
 
 /obj/item/clothing/under/suit_jacket/tan
@@ -496,7 +430,6 @@
 	desc = "A tan suit. Smart, but casual."
 	icon_state = "tan_suit"
 	item_state_slots = list(slot_r_hand_str = "tan_suit", slot_l_hand_str = "tan_suit")
-	worn_state = "tan_suit"
 	starting_accessories = list(/obj/item/clothing/accessory/yellow, /obj/item/clothing/accessory/tan_jacket)
 
 /obj/item/clothing/under/serviceoveralls
@@ -504,115 +437,98 @@
 	desc = "The very image of a working man. Not that you're probably doing work."
 	icon_state = "mechanic"
 	item_state_slots = list(slot_r_hand_str = "cargo", slot_l_hand_str = "cargo")
-	worn_state = "mechanic"
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/cheongsam
 	name = "white cheongsam"
 	desc = "It is a white cheongsam dress."
 	icon_state = "mai_yang"
-	worn_state = "mai_yang"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
 
 /obj/item/clothing/under/cheongsam/red
 	name = "red cheongsam"
 	desc = "It is a red cheongsam dress."
 	icon_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"
-	worn_state = "cheongsam-blue"
 
 /obj/item/clothing/under/cheongsam/black
 	name = "black cheongsam"
 	desc = "It is a black cheongsam dress."
 	icon_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_slots = list(slot_r_hand_str = "lawyer_blue", slot_l_hand_str = "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_slots = list(slot_r_hand_str = "grey", slot_l_hand_str = "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_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "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_slots = list(slot_r_hand_str = "grey", slot_l_hand_str = "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_slots = list(slot_r_hand_str = "grey", slot_l_hand_str = "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_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red")
-	worn_state = "cuttop_red"
 
 /obj/item/clothing/under/harness
 	name = "gear harness"
 	desc = "How... minimalist."
 	icon_state = "gear_harness"
-	worn_state = "gear_harness"
 	body_parts_covered = 0
 
 /obj/item/clothing/under/dress/white
 	name = "white wedding dress"
 	desc = "A fancy white dress with a blue underdress."
 	icon_state = "whitedress1"
-	worn_state = "whitedress1"
 	flags_inv = HIDESHOES
 
 /obj/item/clothing/under/dress/white2
 	name = "long dress"
 	desc = "A long dress."
 	icon_state = "whitedress2"
-	worn_state = "whitedress2"
 	flags_inv = HIDESHOES
 
 /obj/item/clothing/under/dress/white3
 	name = "short dress"
 	desc = "A short, plain dress."
 	icon_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"
-	worn_state = "whitedress4"
 	flags_inv = HIDESHOES
 
 /obj/item/clothing/under/dress/darkred
 	name = "fancy dark red dress"
 	desc = "A short, red dress with a black belt. Fancy."
 	icon_state = "darkreddress"
-	worn_state = "darkreddress"
 	
 /*
  * swimsuit

code/modules/clothing/under/shorts.dm

@@ -121,51 +121,60 @@
 	name = "blue plaid skirt"
 	desc = "A preppy blue skirt with a white blouse."
 	icon_state = "plaid_blue"
+	item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "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_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "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_slots = list(slot_r_hand_str = "purple", slot_l_hand_str = "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"
+	item_state_slots = list(slot_r_hand_str = "qm", slot_l_hand_str = "qm")
 	
 /obj/item/clothing/under/rank/cargotech/skirt
 	name = "cargo technician's jumpskirt"
 	desc = "Skirrrrrts! They're comfy and easy to wear!"
 	icon_state = "cargof"
+	item_state_slots = list(slot_r_hand_str = "cargo", slot_l_hand_str = "cargo")
 	
 /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"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
+	item_state_slots = list(slot_r_hand_str = "engine", slot_l_hand_str = "engine")
 	
-/obj/item/clothing/under/rank/engineer/chief_engineer/skirt
+/obj/item/clothing/under/rank/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"
+	item_state_slots = list(slot_r_hand_str = "chiefengineer", slot_l_hand_str = "chiefengineer")
 	
-/obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt
+/obj/item/clothing/under/rank/atmospheric_technician/skirt
 	desc = "It's a jumpskirt worn by atmospheric technicians."
 	name = "atmospheric technician's jumpskirt"
 	icon_state = "atmosf"
+	item_state_slots = list(slot_r_hand_str = "atmos", slot_l_hand_str = "atmos")
 	
 /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"
+	item_state_slots = list(slot_r_hand_str = "robotics", slot_l_hand_str = "robotics")
 	
 /obj/item/clothing/under/rank/scientist/skirt
 	name = "scientist's jumpskirt"
-	icon_state = "sciencewhitef"
+	icon_state = "sciencef"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
 
@@ -173,36 +182,36 @@
 	name = "medical doctor's jumpskirt"
 	icon_state = "medicalf"
 
-/obj/item/clothing/under/rank/medical/chemist/skirt
+/obj/item/clothing/under/rank/chemist/skirt
 	name = "chemist's jumpskirt"
-	icon_state = "chemistrywhitef"
+	icon_state = "chemistryf"
 
-/obj/item/clothing/under/rank/medical/chief_medical_officer/skirt
+/obj/item/clothing/under/rank/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"
 
-/obj/item/clothing/under/rank/medical/geneticist/skirt
+/obj/item/clothing/under/rank/geneticist/skirt
 	name = "geneticist's jumpskirt"
-	icon_state = "geneticswhitef"
+	icon_state = "geneticsf"
 
-/obj/item/clothing/under/rank/medical/virologist/skirt
+/obj/item/clothing/under/rank/virologist/skirt
 	name = "virologist's jumpskirt"
-	icon_state = "virologywhitef"
+	icon_state = "virologyf"
 
 /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"
+	icon_state = "securityf"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
 
-/obj/item/clothing/under/rank/security/warden/skirt
+/obj/item/clothing/under/rank/warden/skirt
 	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"
 
-/obj/item/clothing/under/rank/security/head_of_security/skirt
+/obj/item/clothing/under/rank/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"
+	icon_state = "hosf"

code/modules/clothing/under/syndicate.dm

@@ -4,7 +4,6 @@
 	desc = "It's some non-descript, slightly suspicious looking, civilian clothing."
 	icon_state = "syndicate"
 	item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
-	worn_state = "syndicate"
 	has_sensor = 0
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
@@ -14,7 +13,6 @@
 	desc = "It's some non-descript, slightly suspicious looking, civilian clothing."
 	icon_state = "combat"
 	item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
-	worn_state = "combat"
 	has_sensor = 1
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
@@ -24,6 +22,5 @@
 	desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-."
 	icon_state = "tactifool"
 	item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
-	worn_state = "tactifool"
 	siemens_coefficient = 1
 	rolled_sleeves = 0

code/modules/clothing/under/xenos/seromi.dm

@@ -3,31 +3,25 @@
 	desc = "It looks fitted to nonhuman proportions."
 	icon = 'icons/obj/clothing/species/seromi/uniform.dmi'
 	icon_state = "seromi_grey"
-	worn_state = "seromi_grey"
 	species_restricted = list("Teshari")
 	body_parts_covered = 0 // It's a thin piece of cloth with a neck hole.
 
 /obj/item/clothing/under/seromi/white
 	name = "small white smock"
 	icon_state = "seromi_white"
-	worn_state = "seromi_white"
 
 /obj/item/clothing/under/seromi/red
 	name = "small Security smock"
 	icon_state = "seromi_red"
-	worn_state = "seromi_red"
 
 /obj/item/clothing/under/seromi/yellow
 	name = "small Engineering smock"
 	icon_state = "seromi_yellow"
-	worn_state = "seromi_yellow"
 
 /obj/item/clothing/under/seromi/medical
 	name = "small Medical uniform"
 	icon_state = "seromi_medical"
-	worn_state = "Teshari_medical"
 	
 /obj/item/clothing/under/seromi/rainbow
 	name = "small rainbow smock"
 	icon_state = "seromi_rainbow"
-	worn_state = "seromi_rainbow"

code/modules/projectiles/gun.dm

@@ -378,7 +378,6 @@
 		return
 	..()
 
-
 //Suicide handling.
 /obj/item/weapon/gun/var/mouthshoot = 0 //To stop people from suiciding twice... >.>
 /obj/item/weapon/gun/proc/handle_suicide(mob/living/user)

code/modules/projectiles/guns/energy/laser.dm

@@ -106,7 +106,7 @@ obj/item/weapon/gun/energy/retro
 	desc = "The HI DMR 9E is an older design of Hesphaistos Industries. A designated marksman rifle capable of shooting powerful \
 	ionized beams, this is a weapon to kill from a distance."
 	icon_state = "sniper"
-	item_state = "laser" // placeholder
+	item_state_slots = list(slot_r_hand_str = "laser", slot_l_hand_str = "laser") //placeholder
 	fire_sound = 'sound/weapons/gauss_shoot.ogg'
 	origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 5, TECH_POWER = 4)
 	projectile_type = /obj/item/projectile/beam/sniper

code/modules/projectiles/guns/projectile/sniper.dm

@@ -5,6 +5,7 @@
 	desc = "A portable anti-armour rifle fitted with a scope, the HI PTR-7 Rifle was originally designed to used against armoured exosuits. It is capable of punching through windows and non-reinforced walls with ease. Fires armor piercing 14.5mm shells."
 	icon_state = "heavysniper"
 	item_state = "l6closed-empty" // placeholder
+	item_state_slots = list(slot_r_hand_str = "heavysniper", slot_l_hand_str = "heavysniper")
 	w_class = 5 // So it can't fit in a backpack.
 	force = 10
 	slot_flags = SLOT_BACK