Updates a couple of /obj/item variables (#29829)

* compiles checkpoint

* fix some

* updatepaths

* fix

* rrr

* linters

* fiexs

* icon fixes

* plasmemes

* fix

* fix

* fix bit more

* fix

* well

* cleanup

* fix glasses layer

* conflict

* fuck gun code

* fixes

* fix

* fixes to energy guns

* review

* conflict

* support that 1 unathi pixel

* fix

code/game/objects/structures/bedsheet_bin.dm

@@ -60,28 +60,24 @@ LINEN BINS
 
 /obj/item/bedsheet/blue
 	icon_state = "sheetblue"
-	item_state = "bedsheetblue"
 	item_color = "blue"
 	dream_messages = list("blue")
 	nightmare_messages = list("vox blood")
 
 /obj/item/bedsheet/green
 	icon_state = "sheetgreen"
-	item_state = "bedsheetgreen"
 	item_color = "green"
 	dream_messages = list("green")
 	nightmare_messages = list("unathi flesh")
 
 /obj/item/bedsheet/orange
 	icon_state = "sheetorange"
-	item_state = "bedsheetorange"
 	item_color = "orange"
 	dream_messages = list("orange")
 	nightmare_messages = list("exploding fruit")
 
 /obj/item/bedsheet/purple
 	icon_state = "sheetpurple"
-	item_state = "bedsheetpurple"
 	item_color = "purple"
 	dream_messages = list("purple")
 	nightmare_messages = list("Grey blood")
@@ -90,7 +86,6 @@ LINEN BINS
 	name = "patriotic bedsheet"
 	desc = "You've never felt more free than when sleeping on this."
 	icon_state = "sheetUSA"
-	item_state = "bedsheetUSA"
 	item_color = "sheetUSA"
 	dream_messages = list("America", "freedom", "fireworks", "bald eagles")
 	nightmare_messages = list("communism")
@@ -99,28 +94,24 @@ LINEN BINS
 	name = "rainbow bedsheet"
 	desc = "A multi_colored blanket. It's actually several different sheets cut up and sewn together."
 	icon_state = "sheetrainbow"
-	item_state = "bedsheetrainbow"
 	item_color = "rainbow"
 	dream_messages = list("red", "orange", "yellow", "green", "blue", "purple", "a rainbow")
 	nightmare_messages = list("green", "a cluwne", "fLoOr ClUwNe")
 
 /obj/item/bedsheet/red
 	icon_state = "sheetred"
-	item_state = "bedsheetred"
 	item_color = "red"
 	dream_messages = list("red")
 	nightmare_messages = list("gibs")
 
 /obj/item/bedsheet/yellow
 	icon_state = "sheetyellow"
-	item_state = "bedsheetyellow"
 	item_color = "yellow"
 	dream_messages = list("yellow")
 	nightmare_messages = list("locker full of banana peels")
 
 /obj/item/bedsheet/black
 	icon_state = "sheetblack"
-	item_state = "bedsheetblack"
 	item_color = "black"
 	dream_messages = list("black")
 	nightmare_messages = list("the void of space")
@@ -129,7 +120,6 @@ LINEN BINS
 	name = "mime's blanket"
 	desc = "A very soothing striped blanket. All the noise just seems to fade out when you're under the covers in this."
 	icon_state = "sheetmime"
-	item_state = "bedsheetmime"
 	item_color = "mime"
 	dream_messages = list("silence", "gestures", "a pale face", "a gaping mouth", "the mime")
 	nightmare_messages = list("honk", "laughter", "a prank", "a joke", "a smiling face", "the clown")
@@ -138,7 +128,6 @@ LINEN BINS
 	name = "clown's blanket"
 	desc = "A rainbow blanket with a clown mask woven in. It smells faintly of bananas."
 	icon_state = "sheetclown"
-	item_state = "bedsheetclown"
 	item_color = "clown"
 	dream_messages = list("honk", "laughter", "a prank", "a joke", "a smiling face", "the clown")
 	nightmare_messages = list("silence", "gestures", "a pale face", "a gaping mouth", "the mime")
@@ -147,7 +136,6 @@ LINEN BINS
 	name = "captain's bedsheet."
 	desc = "It has a Nanotrasen symbol on it, and was woven with a revolutionary new kind of thread guaranteed to have 0.01% permeability for most non-chemical substances, popular among most modern captains."
 	icon_state = "sheetcaptain"
-	item_state = "bedsheetcaptain"
 	item_color = "captain"
 	dream_messages = list("authority", "a golden ID", "sunglasses", "a green disc", "an antique gun", "the captain")
 	nightmare_messages = list("comdom", "clown with all access", "the syndicate")
@@ -156,7 +144,6 @@ LINEN BINS
 	name = "research director's bedsheet"
 	desc = "It appears to have a beaker emblem, and is made out of fire-resistant material, although it probably won't protect you in the event of fires you're familiar with every day."
 	icon_state = "sheetrd"
-	item_state = "bedsheetrd"
 	item_color = "director"
 	dream_messages = list("authority", "a silvery ID", "a bomb", "a mech", "a facehugger", "maniacal laughter", "the research director")
 	nightmare_messages = list("toxins full of plasma", "UPGRADE THE SLEEPERS", "rogue ai")
@@ -170,7 +157,6 @@ LINEN BINS
 	name = "medical blanket"
 	desc = "It's a sterilized* blanket commonly used in the Medbay. *Sterilization is voided if a virologist is present onboard the station."
 	icon_state = "sheetmedical"
-	item_state = "bedsheetmedical"
 	item_color = "medical"
 	dream_messages = list("healing", "life", "surgery", "a doctor")
 	nightmare_messages = list("death", "no cryox", "cryo is off")
@@ -179,7 +165,6 @@ LINEN BINS
 	name = "chief medical officer's bedsheet"
 	desc = "It's a sterilized blanket that has a cross emblem. There's some cat fur on it, likely from Runtime."
 	icon_state = "sheetcmo"
-	item_state = "bedsheetcmo"
 	item_color = "cmo"
 	dream_messages = list("authority", "a silvery ID", "healing", "life", "surgery", "a cat", "the chief medical officer")
 	nightmare_messages = list("chemists making meth", "cryo it off", "where is the defib", "no biomass")
@@ -188,7 +173,6 @@ LINEN BINS
 	name = "head of security's bedsheet"
 	desc = "It is decorated with a shield emblem. While crime doesn't sleep, you do, but you are still THE LAW!"
 	icon_state = "sheethos"
-	item_state = "bedsheethos"
 	item_color = "hosred"
 	dream_messages = list("authority", "a silvery ID", "handcuffs", "a baton", "a flashbang", "sunglasses", "the head of security")
 	nightmare_messages = list("the clown", "a toolbox", "sHiTcUrItY", "why did you put them in for 50 minutes")
@@ -197,7 +181,6 @@ LINEN BINS
 	name = "head of personnel's bedsheet"
 	desc = "It is decorated with a key emblem. For those rare moments when you can rest and cuddle with Ian without someone screaming for you over the radio."
 	icon_state = "sheethop"
-	item_state = "bedsheethop"
 	item_color = "hop"
 	dream_messages = list("authority", "a silvery ID", "obligation", "a computer", "an ID", "a corgi", "the head of personnel")
 	nightmare_messages = list("improper paperwork", "all access clown", "50 open clown slots", "dead ian")
@@ -206,7 +189,6 @@ LINEN BINS
 	name = "chief engineer's bedsheet"
 	desc = "It is decorated with a wrench emblem. It's highly reflective and stain resistant, so you don't need to worry about ruining it with oil."
 	icon_state = "sheetce"
-	item_state = "bedsheetce"
 	item_color = "chief"
 	dream_messages = list("authority", "a silvery ID", "the engine", "power tools", "an APC", "a parrot", "the chief engineer")
 	nightmare_messages = list("forced airlock", "syndicate bomb", "explosion in research chem", "iT's LoOsE")
@@ -215,14 +197,12 @@ LINEN BINS
 	name = "quartermaster's bedsheet"
 	desc = "It is decorated with a crate emblem in silver lining. It's rather tough, and just the thing to lie on after a hard day of pushing paper."
 	icon_state = "sheetqm"
-	item_state = "bedsheetqm"
 	item_color = "qm"
 	dream_messages = list("a grey ID", "a shuttle", "a crate", "a sloth", "the quartermaster")
 	nightmare_messages = list("a bald person", "no points", "wheres the ore", "space carp")
 
 /obj/item/bedsheet/brown
 	icon_state = "sheetbrown"
-	item_state = "bedsheetbrown"
 	item_color = "cargo"
 	dream_messages = list("brown")
 	nightmare_messages = list("dead monkey")
@@ -231,7 +211,6 @@ LINEN BINS
 	name = "centcom bedsheet"
 	desc = "Woven with advanced nanothread for warmth as well as being very decorated, essential for all officials."
 	icon_state = "sheetcentcom"
-	item_state = "bedsheetcentcom"
 	item_color = "centcom"
 	dream_messages = list("a unique ID", "authority", "artillery", "an ending")
 	nightmare_messages = list("a butt fax")
@@ -240,7 +219,6 @@ LINEN BINS
 	name = "syndicate bedsheet"
 	desc = "It has a syndicate emblem and it has an aura of evil."
 	icon_state = "sheetsyndie"
-	item_state = "bedsheetsyndie"
 	item_color = "syndie"
 	dream_messages = list("a green disc", "a red crystal", "a glowing blade", "a wire-covered ID")
 	nightmare_messages = list("stunbaton", "taser", "lasers", "a toolbox")
@@ -249,7 +227,6 @@ LINEN BINS
 	name = "cultist's bedsheet"
 	desc = "You might dream of Nar'Sie if you sleep with this. It seems rather tattered and glows of an eldritch presence."
 	icon_state = "sheetcult"
-	item_state = "bedsheetcult"
 	item_color = "cult"
 	dream_messages = list("a tome", "a floating red crystal", "a glowing sword", "a bloody symbol", "a massive humanoid figure")
 	nightmare_messages = list("a tome", "a floating red crystal", "a glowing sword", "a bloody symbol", "a massive humanoid figure")
@@ -258,7 +235,6 @@ LINEN BINS
 	name = "Ratvarian bedsheet"
 	desc = "You might dream of Ratvar if you sleep with this. The fabric has threads of brass sewn into it which eminate a pleasent warmth."
 	icon_state = "sheetclockwork"
-	item_state = "bedsheetclockwork"
 	item_color = "brass"
 	dream_messages = list("tick, tock, tick, tock, tick, tock, tick, tock", "a great shining city of brass", "men in radiant suits of brass", "a perfect blueprint of the world", "a glowing cogwheel", "a massive humanoid figure")
 	nightmare_messages = list("<span_class = userdanger>\"the Nar'Sian dogs shall be CRUSHED!\"</span>", "the unenlightened, ready to hear His word", "a half-buried brass titan", "two massive humanoid figures attacking each other")
@@ -267,7 +243,6 @@ LINEN BINS
 	name = "wizard's bedsheet"
 	desc = "A special fabric enchanted with magic so you can have an enchanted night. It even glows!"
 	icon_state = "sheetwiz"
-	item_state = "bedsheetwiz"
 	item_color = "wiz"
 	dream_messages = list("a book", "an explosion", "lightning", "a staff", "a skeleton", "a robe", "magic")
 	nightmare_messages = list("a toolbox", "solars")

code/game/objects/structures/inflatable.dm

@@ -238,7 +238,7 @@
 	name = "inflatable barrier box"
 	desc = "Contains inflatable walls and doors."
 	icon_state = "inf_box"
-	item_state = "syringe_kit"
+	inhand_icon_state = "syringe_kit"
 	w_class = WEIGHT_CLASS_NORMAL
 	can_hold = list(/obj/item/inflatable)
 

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -508,7 +508,7 @@
 	desc = "Bar brawl essential."
 	icon = 'icons/obj/chairs.dmi'
 	icon_state = "chair_toppled"
-	item_state = "chair"
+	inhand_icon_state = "chair"
 	lefthand_file = 'icons/mob/inhands/chairs_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/chairs_righthand.dmi'
 	w_class = WEIGHT_CLASS_HUGE
@@ -548,7 +548,7 @@
 /obj/item/chair/stool
 	name = "stool"
 	icon_state = "stool_toppled"
-	item_state = "stool"
+	inhand_icon_state = "stool"
 	force = 8
 	throwforce = 8
 	origin_type = /obj/structure/chair/stool
@@ -559,21 +559,21 @@
 /obj/item/chair/stool/bar
 	name = "bar stool"
 	icon_state = "bar_toppled"
-	item_state = "stool_bar"
+	inhand_icon_state = "stool_bar"
 	origin_type = /obj/structure/chair/stool/bar
 
 /obj/item/chair/stool/bamboo
 	name = "bamboo stool"
 	desc = "Not the most comfortable, but vegan!"
 	icon_state = "bamboo_stool_toppled"
-	item_state = "stool_bamboo"
+	inhand_icon_state = "stool_bamboo"
 	origin_type = /obj/structure/chair/stool/bamboo
 
 /obj/item/chair/stool/wood
 	name = "wood stool"
 	desc = "The barfighter's choice of stool."
 	icon_state = "wooden_stool_toppled"
-	item_state = "stool_wood"
+	inhand_icon_state = "stool_wood"
 	origin_type = /obj/structure/chair/stool/wood
 
 /obj/item/chair/AltClick(mob/user)
@@ -646,7 +646,7 @@
 /obj/item/chair/wood
 	name = "wooden chair"
 	icon_state = "wooden_chair_toppled"
-	item_state = "woodenchair"
+	inhand_icon_state = "woodenchair"
 	resistance_flags = FLAMMABLE
 	max_integrity = 70
 	hitsound = 'sound/weapons/genhit1.ogg'

code/game/objects/structures/watercloset.dm

@@ -501,7 +501,7 @@ MAPPING_DIRECTIONAL_HELPERS_CUSTOM(/obj/machinery/shower, 16, -5, 0, 0)
 	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"
+	inhand_icon_state = "rubberducky"
 	honk_sounds = list('sound/items/squeaktoy.ogg')
 	attack_verb = list("quacked", "squeaked")
 
@@ -685,7 +685,7 @@ MAPPING_DIRECTIONAL_HELPERS_CUSTOM(/obj/structure/sink/kitchen/old, 18, -4, 0, 0
 	desc = "A self-adhering shower fixture. Simply stick to a wall, no plumber needed!"
 	icon = 'icons/obj/watercloset.dmi'
 	icon_state = "shower"
-	item_state = "buildpipe"
+	inhand_icon_state = "buildpipe"
 
 /obj/item/mounted/shower/try_build(turf/on_wall, mob/user, proximity_flag)
 	//overriding this because we don't care about other items on the wall, but still need to do adjacent checks