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
2026-08-31 07:57:47 +01:00 · 2025-09-14 15:23:56 +00:00
parent 500c6b16fe
commit 8821ab9a66
418 changed files with 1750 additions and 3810 deletions
@@ -417,7 +417,6 @@
 /obj/item/handheld_chem_dispenser
 	name = "handheld chem dispenser"
 	icon = 'icons/obj/chemical.dmi'
-	item_state = "handheld_chem"
 	icon_state = "handheld_chem"
 	flags = NOBLUDGEON
 	var/obj/item/stock_parts/cell/high/cell = null
@@ -597,7 +596,6 @@

 /obj/item/handheld_chem_dispenser/booze
 	name = "handheld bar tap"
-	item_state = "handheld_booze"
 	icon_state = "handheld_booze"
 	is_drink = TRUE
 	dispensable_reagents = list("ice", "cream", "cider", "beer", "kahlua", "whiskey", "wine", "vodka", "gin", "rum", "tequila",
@@ -605,7 +603,6 @@

 /obj/item/handheld_chem_dispenser/soda
 	name = "handheld soda fountain"
-	item_state = "handheld_soda"
 	icon_state = "handheld_soda"
 	is_drink = TRUE
 	dispensable_reagents = list("water", "ice", "milk", "soymilk", "coffee", "tea", "hot_coco", "cola", "spacemountainwind", "dr_gibb", "space_up",
@@ -154,7 +154,6 @@ GLOBAL_LIST_EMPTY(detected_advanced_diseases)

 /obj/machinery/pandemic/proc/create_culture(name, bottle_type = "culture", cooldown = 50)
 	var/obj/item/reagent_containers/glass/bottle/B = new/obj/item/reagent_containers/glass/bottle(loc)
-	B.icon_state = "bottle"
 	B.scatter_atom()
 	replicator_cooldown(cooldown)
 	B.name = "[name] [bottle_type] bottle"
@@ -2,7 +2,6 @@
 	name = "Container"
 	desc = "..."
 	icon = 'icons/obj/chemical.dmi'
-	icon_state = null
 	w_class = WEIGHT_CLASS_TINY
 	var/amount_per_transfer_from_this = 5
 	var/visible_transfer_rate = TRUE
@@ -3,7 +3,6 @@
 	desc = "A small electronic device designed to topically apply healing chemicals."
 	icon = 'icons/goonstation/objects/objects.dmi'
 	icon_state = "mender"
-	item_state = "mender"
 	volume = 200
 	possible_transfer_amounts = null
 	visible_transfer_rate = FALSE
@@ -3,7 +3,6 @@
 /obj/item/reagent_containers/borghypo
 	name = "Cyborg Hypospray"
 	desc = "An advanced chemical synthesizer and injection system, designed for heavy-duty medical equipment."
-	item_state = "hypo"
 	icon = 'icons/obj/hypo.dmi'
 	icon_state = "borghypo"
 	possible_transfer_amounts = list(1, 2, 3, 4, 5, 10, 15, 20, 25, 30)
@@ -5,7 +5,7 @@
 	name = "bottle"
 	desc = "A small bottle."
 	icon_state = "bottle"
-	item_state = "atoxinbottle"
+	inhand_icon_state = "bottle"
 	possible_transfer_amounts = list(5, 10, 15, 25, 30, 40, 50)

 /obj/item/reagent_containers/glass/bottle/on_reagent_change()
@@ -6,7 +6,7 @@
 	name = "dropper"
 	desc = "A dropper. Transfers up to 5 units."
 	icon_state = "dropper"
-	item_state = "dropper"
+	inhand_icon_state = "dropper"
 	belt_icon = "dropper"
 	amount_per_transfer_from_this = 1
 	possible_transfer_amounts = list(1, 2, 3, 4, 5)
@@ -130,7 +130,7 @@
 	name = "beaker"
 	desc = "A simple glass beaker, nothing special."
 	icon_state = "beaker"
-	item_state = "beaker"
+	inhand_icon_state = "beaker"
 	belt_icon = "beaker"
 	materials = list(MAT_GLASS = 1000)
 	var/obj/item/assembly_holder/assembly = null
@@ -295,7 +295,6 @@
 	desc = "Useful for moving liquids, or having a helmet in the zombie apocalypse."
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "bucket"
-	item_state = "bucket"
 	materials = list(MAT_METAL=200)
 	w_class = WEIGHT_CLASS_NORMAL
 	amount_per_transfer_from_this = 20
@@ -316,7 +315,6 @@
 /obj/item/reagent_containers/glass/bucket/wooden
 	name = "wooden bucket"
 	icon_state = "woodbucket"
-	item_state = "woodbucket"
 	materials = null
 	armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 50)
 	resistance_flags = FLAMMABLE
@@ -347,9 +345,9 @@
 	desc = "A bottle of water filled at an old Earth bottling facility."
 	icon = 'icons/obj/drinks.dmi'
 	icon_state = "smallbottle"
-	item_state = "bottle"
+	inhand_icon_state = "bottle"
 	list_reagents = list("water" = 49.5, "fluorine" = 0.5) //see desc, don't think about it too hard
-	materials = list(MAT_GLASS = 0)
+	materials = list()

 /obj/item/reagent_containers/glass/beaker/waterbottle/empty
 	list_reagents = list()
@@ -5,8 +5,8 @@
 	name = "hypospray"
 	desc = "The DeForest Medical Corporation hypospray is a sterile, air-needle autoinjector for rapid administration of drugs to patients."
 	icon = 'icons/obj/hypo.dmi'
-	item_state = "hypo"
 	icon_state = "hypo"
+	inhand_icon_state = "hypo"
 	belt_icon = "hypospray"
 	possible_transfer_amounts = list(1,2,3,4,5,10,15,20,25,30)
 	resistance_flags = ACID_PROOF
@@ -180,7 +180,7 @@
 	name = "empty autoinjector"
 	desc = "A rapid and safe way to inject chemicals into humanoids. This one is empty."
 	icon_state = "autoinjector"
-	item_state = "autoinjector"
+	inhand_icon_state = "autoinjector"
 	belt_icon = "autoinjector"
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = null
@@ -189,7 +189,6 @@
 	ignore_hypospray_immunity = TRUE
 	penetrate_everything = TRUE // Autoinjectors bypass everything.
 	container_type = DRAWABLE
-	flags = null

 /obj/item/reagent_containers/hypospray/autoinjector/mob_act(mob/target, mob/living/user)
 	if(!reagents.total_volume)
@@ -6,8 +6,7 @@
 /obj/item/reagent_containers/pill
 	name = "pill"
 	desc = "A pill."
-	icon_state = null
-	item_state = "pill"
+	inhand_icon_state = "pill"
 	possible_transfer_amounts = null
 	visible_transfer_rate = FALSE
 	volume = 100
@@ -3,7 +3,6 @@
 	desc = "A spray bottle, with an unscrewable top."
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "cleaner"
-	item_state = "cleaner"
 	belt_icon = "space_cleaner"
 	flags = NOBLUDGEON
 	container_type = OPENCONTAINER
@@ -135,7 +134,6 @@
 	name = "advanced space cleaner"
 	desc = "BLAM!-brand non-foaming space cleaner!"
 	icon_state = "adv_cleaner"
-	item_state = "adv_cleaner"
 	volume = 500
 	spray_maxrange = 3
 	spray_currentrange = 3
@@ -190,7 +188,6 @@
 	desc = "Manufactured by UhangInc, used to blind and down an opponent quickly."
 	icon = 'icons/obj/items.dmi'
 	icon_state = "pepperspray"
-	item_state = "pepperspray"
 	belt_icon = null
 	volume = 40
 	spray_maxrange = 4
@@ -204,7 +201,6 @@
 	desc = "A seemingly innocent sunflower...with a twist."
 	icon = 'icons/obj/hydroponics/harvest.dmi'
 	icon_state = "sunflower"
-	item_state = "sunflower"
 	belt_icon = null
 	adjustable = FALSE
 	amount_per_transfer_from_this = 1
@@ -217,7 +213,6 @@
 	desc = "A utility used to spray large amounts of reagents in a given area."
 	icon = 'icons/obj/guns/projectile.dmi'
 	icon_state = "chemsprayer"
-	item_state = "chemsprayer"
 	w_class = WEIGHT_CLASS_NORMAL
 	spray_maxrange = 7
 	spray_currentrange = 7
@@ -270,7 +265,6 @@
 	desc = "Kills those pesky weeds!"
 	icon = 'icons/obj/hydroponics/equipment.dmi'
 	icon_state = "plantbgone"
-	item_state = "plantbgone"
 	belt_icon = null
 	volume = 100
 	list_reagents = list("glyphosate" = 100)
@@ -282,7 +276,6 @@
 	lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
 	icon_state = "syndie_spraycan"
-	item_state = "syndie_spraycan"
 	container_type = AMOUNT_VISIBLE
 	list_reagents = list("sticky_tar" = 100)

@@ -2,8 +2,8 @@
 	name = "syringe"
 	desc = "A syringe."
 	icon = 'icons/goonstation/objects/syringe.dmi'
-	item_state = "syringe_0"
 	icon_state = "0"
+	inhand_icon_state = "syringe_0"
 	belt_icon = "syringe"
 	possible_transfer_amounts = null
 	volume = 15
@@ -204,7 +204,7 @@
 	else
 		rounded_vol = 0
 	icon_state = "[rounded_vol]"
-	item_state = "syringe_[rounded_vol]"
+	inhand_icon_state = "syringe_[rounded_vol]"

 /obj/item/reagent_containers/syringe/update_overlays()
 	. = ..()