pre-merge commit

code/modules/clothing/clothing.dm

@@ -108,7 +108,7 @@
 		icon = initial(icon)
 
 ///////////////////////////////////////////////////////////////////////
-// Ears: headsets, earmuffs and tiny objects
+// Ears: headsets, earmuffs and tiny objects --BECAUSE THERE ISNT A FOLDER FOR THESE OR ANYTHING. -S2-
 /obj/item/clothing/ears
 	name = "ears"
 	w_class = 1.0

code/modules/clothing/suits/bio.dm

@@ -27,7 +27,7 @@
 /obj/item/clothing/head/bio_hood/general
 	icon_state = "bio_general"
 	item_state = "bio"
-	body_parts_covered = HsEAD|FACE|EYES
+	body_parts_covered = HEAD|FACE|EYES
 
 /obj/item/clothing/suit/bio_suit/general
 	icon_state = "bio_general"

code/modules/clothing/suits/utility.dm

@@ -52,7 +52,6 @@
 	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

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
@@ -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
 
@@ -121,7 +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 +127,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 +138,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 = "p_suit"
 	worn_state = "lawyer_purp"
 
 /obj/item/clothing/under/lawyer/oldman