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/modules/instruments/objs/items/_instrument.dm

@@ -1,12 +1,12 @@
 //copy pasta of the space piano, don't hurt me -Pete
 /obj/item/instrument
 	name = "generic instrument"
-	force = 10
-	max_integrity = 100
-	resistance_flags = FLAMMABLE
 	icon = 'icons/obj/musician.dmi'
 	lefthand_file = 'icons/mob/inhands/equipment/instruments_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/instruments_righthand.dmi'
+	force = 10
+	max_integrity = 100
+	resistance_flags = FLAMMABLE
 	/// Our song datum.
 	var/datum/song/handheld/song
 	/// Our allowed list of instrument ids. This is nulled on initialize.

code/modules/instruments/objs/items/headphones.dm

@@ -2,7 +2,7 @@
 	name = "headphones"
 	desc = "Unce unce unce unce."
 	icon_state = "headphones0"
-	item_state = "headphones0"
+	inhand_icon_state = "headphones"
 	actions_types = list(/datum/action/item_action/change_headphones_song, /datum/action/item_action/toggle_music_notes)
 	var/datum/song/headphones/song
 	var/on = FALSE
@@ -47,11 +47,11 @@
 	return song.ui_act(action, params)
 
 /obj/item/clothing/ears/headphones/update_icon_state()
+	icon_state = "headphones[on]"
 	var/mob/living/carbon/human/user = loc
 	if(istype(user))
 		user.update_action_buttons_icon()
 		user.update_inv_ears()
-	icon_state = item_state = "headphones[on]"
 
 /obj/item/clothing/ears/headphones/item_action_slot_check(slot)
 	if(slot & ITEM_SLOT_BOTH_EARS)

code/modules/instruments/objs/items/instrument_items.dm

@@ -2,7 +2,6 @@
 	name = "space violin"
 	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_state = "violin"
-	item_state = "violin"
 	hitsound = "swing_hit"
 	allowed_instrument_ids = "violin"
 
@@ -10,14 +9,12 @@
 	name = "golden violin"
 	desc = "A golden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
 	icon_state = "golden_violin"
-	item_state = "golden_violin"
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 
 /obj/item/instrument/piano_synth
 	name = "synthesizer"
 	desc = "An advanced electronic synthesizer that can be used as various instruments."
 	icon_state = "synth"
-	item_state = "synth"
 	allowed_instrument_ids = "piano"
 
 /obj/item/instrument/piano_synth/Initialize(mapload)
@@ -28,7 +25,6 @@
 	name = "banjo"
 	desc = "A 'Mura' brand banjo. It's pretty much just a drum with a neck and strings."
 	icon_state = "banjo"
-	item_state = "banjo"
 	attack_verb = list("scruggs-styled", "hum-diggitied", "shin-digged", "clawhammered")
 	hitsound = 'sound/weapons/banjoslap.ogg'
 	allowed_instrument_ids = "banjo"
@@ -37,7 +33,6 @@
 	name = "guitar"
 	desc = "It's made of wood and has a kit of varied strings."
 	icon_state = "guitar"
-	item_state = "guitar"
 	attack_verb = list("played metal on", "serenaded", "crashed", "smashed")
 	hitsound = 'sound/weapons/guitarslam.ogg'
 	allowed_instrument_ids = list("guitar", "csteelgt", "cnylongt", "ccleangt", "cmutedgt", "sleggt", "piclgt")
@@ -52,7 +47,6 @@
 	name = "electric guitar"
 	desc = "Makes all your shredding needs possible."
 	icon_state = "eguitar"
-	item_state = "eguitar"
 	force = 12
 	attack_verb = list("played metal on", "shredded", "crashed", "smashed")
 	hitsound = 'sound/weapons/stringsmash.ogg'
@@ -62,28 +56,24 @@
 	name = "glockenspiel"
 	desc = "Smooth metal bars perfect for any marching band."
 	icon_state = "glockenspiel"
-	item_state = "glockenspiel"
 	allowed_instrument_ids = list("glockenspiel", "crvibr")
 
 /obj/item/instrument/accordion
 	name = "accordion"
 	desc = "Pun-Pun not included."
 	icon_state = "accordion"
-	item_state = "accordion"
 	allowed_instrument_ids = list("accordion", "crack", "crtango")
 
 /obj/item/instrument/trumpet
 	name = "trumpet"
 	desc = "To announce the arrival of the king!"
 	icon_state = "trumpet"
-	item_state = "trumpet"
 	allowed_instrument_ids = list("crtrumpet")
 
 /obj/item/instrument/trumpet/spectral
 	name = "spectral trumpet"
 	desc = "Things are about to get spooky!"
 	icon_state = "spectral_trumpet"
-	item_state = "spectral_trumpet"
 	force = 0
 	attack_verb = list("played", "jazzed", "trumpeted", "mourned", "dooted", "spooked")
 
@@ -99,7 +89,6 @@
 	name = "saxophone"
 	desc = "This soothing sound will be sure to leave your audience in tears."
 	icon_state = "saxophone"
-	item_state = "saxophone"
 	allowed_instrument_ids = "saxophone"
 
 /obj/item/instrument/saxophone/spectral
@@ -120,7 +109,7 @@
 	name = "trombone"
 	desc = "How can any pool table ever hope to compete?"
 	icon_state = "trombone"
-	item_state = "trombone"
+	inhand_icon_state = "trombone"
 	allowed_instrument_ids = list("trombone", "crtrombone")
 
 /obj/item/instrument/trombone/spectral
@@ -152,14 +141,12 @@
 	desc = "Just like in school, playing ability and all."
 	force = 5
 	icon_state = "recorder"
-	item_state = "recorder"
 	allowed_instrument_ids = "recorder"
 
 /obj/item/instrument/harmonica
 	name = "harmonica"
 	desc = "For when you get a bad case of the space blues."
 	icon_state = "harmonica"
-	item_state = "harmonica"
 	force = 5
 	w_class = WEIGHT_CLASS_SMALL
 	allowed_instrument_ids = "harmonica"
@@ -168,14 +155,12 @@
 	name = "xylophone"
 	desc = "A percussion instrument with a bright tone."
 	icon_state = "xylophone"
-	item_state = "xylophone"
 	allowed_instrument_ids = list("xylophone", "crvibr")
 
 /obj/item/instrument/bikehorn
 	name = "gilded bike horn"
 	desc = "An exquisitely decorated bike horn, capable of honking in a variety of notes."
 	icon_state = "bike_horn"
-	item_state = "bike_horn"
 	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
 	attack_verb = list("beautifully honks")