Merge pull request #2149 from SinTwo/item_state

Item State Cleanup

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"