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-26 13:37:58 +01:00 · 2025-09-14 15:23:56 +00:00
parent 500c6b16fe
commit 8821ab9a66
418 changed files with 1750 additions and 3810 deletions
@@ -3,7 +3,6 @@
 	name = "explorer suit"
 	desc = "An armoured suit for exploring harsh environments."
 	icon_state = "explorer"
-	item_state = "explorer"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
 	cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
@@ -14,7 +13,6 @@
 	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
 	resistance_flags = FIRE_PROOF
 	hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi" , "Tajaran")
-
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
 		"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
@@ -27,7 +25,6 @@
 	name = "explorer hood"
 	desc = "An armoured hood for exploring harsh environments."
 	icon_state = "explorer"
-	item_state = "explorer"
 	flags = BLOCKHAIR | NODROP
 	flags_cover = HEADCOVERSEYES
 	min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
@@ -36,7 +33,6 @@
 	heat_protection = HEAD
 	armor = list(MELEE = 20, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 50, RAD = 50, FIRE = 50, ACID = 50)
 	resistance_flags = FIRE_PROOF
-
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/clothing/species/vox/head.dmi',
 		"Drask" = 'icons/mob/clothing/species/drask/head.dmi',
@@ -48,7 +44,6 @@
 	name = "H.E.C.K. suit"
 	desc = "Hostile Environment Cross-Kinetic Suit: A suit designed to withstand the wide variety of hazards from Lavaland. It wasn't enough for its last owner."
 	icon_state = "hostile_env"
-	item_state = "hostile_env"
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	resistance_flags = FIRE_PROOF | LAVA_PROOF
 	flags_2 = RAD_PROTECT_CONTENTS_2
@@ -56,7 +51,6 @@
 	armor = list(MELEE = 120, BULLET = 35, LASER = 25, ENERGY = 25, BOMB = 150, RAD = INFINITY, FIRE = INFINITY, ACID = INFINITY)
 	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/melee/spellblade)
 	hide_tail_by_species = list("Vox", "Vulpkanin", "Unathi", "Tajaran")
-
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
 		"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
@@ -86,7 +80,6 @@
 	name = "H.E.C.K. helmet"
 	desc = "Hostile Environment Cross-Kinetic Helmet: A helmet designed to withstand the wide variety of hazards from Lavaland. It wasn't enough for its last owner."
 	icon_state = "hostile_env"
-	item_state = "hostile_env"
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	armor = list(MELEE = 120, BULLET = 35, LASER = 25, ENERGY = 25, BOMB = 150, RAD = INFINITY, FIRE = INFINITY, ACID = INFINITY)
 	resistance_flags = FIRE_PROOF | LAVA_PROOF
@@ -104,7 +97,7 @@
 	name = "prisoner gulag suit"
 	desc = "An unarmored heat resistant mining suit, heavy and uncomfortable as a punishment in itself."
 	icon_state = "hardsuit_gulag"
-	item_state = "hardsuit_gulag"
+	inhand_icon_state = null
 	gas_transfer_coefficient = 0.90
 	permeability_coefficient = 0.50
 	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
@@ -114,13 +107,13 @@
 	strip_delay = 60
 	put_on_delay = 60
 	resistance_flags = FIRE_PROOF
-	hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi" , "Tajaran")
+	hide_tail_by_species = list("Vox", "Vulpkanin", "Unathi", "Tajaran")

 /obj/item/clothing/head/helmet/space/prisoner_gulag
 	name = "gulag helmet"
 	desc = "A metallic helmet designed to operate with the mining suit, while dense it offers little protection aside heat."
 	icon_state = "hardsuit_gulag"
-	item_state = "hardsuit_gulag"
+	inhand_icon_state = null
 	flags = BLOCKHAIR
 	flags_cover = HEADCOVERSEYES
 	min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
@@ -26,7 +26,6 @@
 	<font size =\"1\"><i>By participating in this experiment you waive all rights for compensation of death on the job.</font></i>
 "}

-
 /obj/item/disk/fauna_research
 	name = "empty HRD-MDE project disk"
 	desc = "A disk used by the HRD-MDE project. Seems empty?"
@@ -4,11 +4,11 @@
 	desc = "An early design of the proto-kinetic accelerator, it is little more than a combination of various mining tools cobbled together, forming a high-tech club. \
 	While it is an effective mining tool, it did little to aid any but the most skilled and/or suicidal miners against local fauna."
 	icon = 'icons/obj/mining.dmi'
+	icon_state = "crusher"
 	base_icon_state = "crusher"
+	inhand_icon_state = "crusher0"
 	lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
-	icon_state = "crusher"
-	item_state = "crusher0"
 	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = ITEM_SLOT_BACK
 	throwforce = 5
@@ -186,7 +186,7 @@
 		visible_message("<span class='danger'>[src]'s light fades and turns off.</span>")

 /obj/item/kinetic_crusher/update_icon_state()
-	item_state = "crusher[HAS_TRAIT(src, TRAIT_WIELDED)]"
+	inhand_icon_state = "crusher[HAS_TRAIT(src, TRAIT_WIELDED)]"

 /obj/item/kinetic_crusher/update_overlays()
 	. = ..()
@@ -4,7 +4,7 @@
 	desc = "An injector with a cocktail of nanomachines and chemicals, this device can seemingly raise animals from the dead, making them become friendly to the user. Unfortunately, the process is useless on higher forms of life and incredibly costly, so these were hidden in storage until an executive thought they'd be great motivation for some of their employees."
 	icon = 'icons/obj/hypo.dmi'
 	icon_state = "lazarus_hypo"
-	item_state = "hypo"
+	inhand_icon_state = "hypo"
 	origin_tech = "biotech=4;magnets=6"
 	w_class = WEIGHT_CLASS_SMALL
 	throw_speed = 3
@@ -1,10 +1,10 @@
 /**********************Mining Scanner**********************/
 /obj/item/mining_scanner
-	desc = "A scanner that checks surrounding rock for useful minerals; it can also be used to stop gibtonite detonations. Wear material scanners for optimal results."
 	name = "manual mining scanner"
+	desc = "A scanner that checks surrounding rock for useful minerals; it can also be used to stop gibtonite detonations. Wear material scanners for optimal results."
 	icon = 'icons/obj/device.dmi'
 	icon_state = "mining1"
-	item_state = "analyzer"
+	inhand_icon_state = "analyzer"
 	w_class = WEIGHT_CLASS_SMALL
 	flags = CONDUCT
 	slot_flags = ITEM_SLOT_BELT
@@ -20,7 +20,6 @@
 		current_cooldown = world.time + cooldown
 		mineral_scan_pulse(get_turf(user))

-
 //Debug item to identify all ore spread quickly
 /obj/item/mining_scanner/admin

@@ -31,10 +30,10 @@
 	qdel(src)

 /obj/item/t_scanner/adv_mining_scanner
-	desc = "A scanner that automatically checks surrounding rock for useful minerals; it can also be used to stop gibtonite detonations. Wear meson scanners for optimal results. This one has an extended range."
 	name = "advanced automatic mining scanner"
+	desc = "A scanner that automatically checks surrounding rock for useful minerals; it can also be used to stop gibtonite detonations. Wear meson scanners for optimal results. This one has an extended range."
 	icon_state = "mining0"
-	item_state = "analyzer"
+	inhand_icon_state = "analyzer"
 	flags = CONDUCT
 	var/cooldown = 35
 	var/current_cooldown = 0
@@ -3,7 +3,7 @@
 	desc = "Used to make big holes in rocks. Only works on rocks!"
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "mining-charge-2"
-	item_state = "charge_indust"
+	inhand_icon_state = "charge_indust"
 	det_time = 5
 	origin_tech = "materials=1"
 	notify_admins = FALSE // no need to make adminlogs on lavaland, while they are "safe" to use
@@ -129,7 +129,7 @@
 	name = "mining charge"
 	desc = "A mining charge. This one seems less powerful than industrial. Only works on rocks!"
 	icon_state = "mining-charge-1"
-	item_state = "charge_lesser"
+	inhand_icon_state = "charge_lesser"
 	smoke_amount = 1
 	boom_sizes = list(1, 2, 3)

@@ -137,7 +137,7 @@
 	name = "experimental mining charge"
 	desc = "A mining charge. This one seems much more powerful than normal!"
 	icon_state = "mining-charge-3"
-	item_state = "charge_mega"
+	inhand_icon_state = "charge_mega"
 	smoke_amount = 5
 	boom_sizes = list(4, 6, 8)

@@ -8,7 +8,6 @@
 	slot_flags = ITEM_SLOT_BELT
 	force = 15
 	throwforce = 10
-	item_state = "pickaxe"
 	w_class = WEIGHT_CLASS_BULKY
 	materials = list(MAT_METAL = 2000) //one sheet, but where can you make them?
 	origin_tech = "materials=2;engineering=3"
@@ -42,6 +41,7 @@
 	name = "compact pickaxe"
 	desc = "A smaller, compact version of the standard pickaxe."
 	icon_state = "minipick"
+	inhand_icon_state = "pickaxe"
 	force = 10
 	throwforce = 7
 	w_class = WEIGHT_CLASS_NORMAL
@@ -51,7 +51,6 @@
 	name = "bone pickaxe"
 	desc = "Do it yourself pickaxe."
 	icon_state = "bone_pickaxe"
-	item_state = "bone_pickaxe"
 	origin_tech = "materials=1;engineering=2"
 	toolspeed = 0.7
 	force = 16
@@ -61,7 +60,6 @@
 	name = "silver-plated pickaxe"
 	desc = "A silver-plated pickaxe that mines slightly faster than standard-issue."
 	icon_state = "spickaxe"
-	item_state = "spickaxe"
 	origin_tech = "materials=3;engineering=4"
 	toolspeed = 0.5 //mines faster than a normal pickaxe, bought from mining vendor
 	force = 17
@@ -71,7 +69,6 @@
 	name = "golden pickaxe"
 	desc = "A gold-plated pickaxe that mines faster than standard-issue."
 	icon_state = "gpickaxe"
-	item_state = "gpickaxe"
 	origin_tech = "materials=4;engineering=4"
 	toolspeed = 0.4
 	force = 18
@@ -81,7 +78,6 @@
 	name = "diamond-tipped pickaxe"
 	desc = "A pickaxe with a diamond pick head. Extremely robust at cracking rock walls and digging up dirt."
 	icon_state = "dpickaxe"
-	item_state = "dpickaxe"
 	origin_tech = "materials=5;engineering=4"
 	toolspeed = 0.3
 	force = 19
@@ -91,7 +87,7 @@
 	name = "mining drill"
 	desc = "An electric mining drill for the especially scrawny."
 	icon_state = "handdrill"
-	item_state = "jackhammer"
+	inhand_icon_state = "jackhammer"
 	digsound = list('sound/weapons/drill.ogg')
 	toolspeed = 0.6 //available from roundstart, faster than a pickaxe.
 	hitsound = 'sound/weapons/drill.ogg'
@@ -136,7 +132,6 @@
 	slot_flags = ITEM_SLOT_BELT
 	force = 8
 	throwforce = 4
-	item_state = "shovel"
 	materials = list(MAT_METAL = 200)
 	origin_tech = "materials=2;engineering=2"
 	attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
@@ -152,7 +147,6 @@
 	name = "spade"
 	desc = "A small tool for digging and moving dirt."
 	icon_state = "spade"
-	item_state = "spade"
 	belt_icon = "spade"
 	force = 5
 	throwforce = 7
@@ -3,7 +3,6 @@
 	name = "resonator"
 	icon = 'icons/obj/mining_tool.dmi'
 	icon_state = "resonator"
-	item_state = "resonator"
 	origin_tech = "magnets=3;engineering=3"
 	desc = "A handheld device that creates small fields of energy that resonate until they detonate, crushing rock. It can also be activated without a target to create a field at the user's location, to act as a delayed time trap. It's more effective in a vaccuum."
 	force = 15
@@ -32,7 +31,6 @@
 	name = "upgraded resonator"
 	desc = "An upgraded version of the resonator that can produce more fields at once, as well as having no damage penalty for bursting a resonance field early. It also allows you to set 'Resonance matrixes', that detonate after someone (or something) walks over it."
 	icon_state = "resonator_u"
-	item_state = "resonator_u"
 	origin_tech = "materials=4;powerstorage=3;engineering=3;magnets=3"
 	fieldlimit = 6
 	quick_burst_mod = 1
@@ -405,7 +405,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/economy/vending/wallmed/survival_pod,
 	icon = initial(I.icon)
 	desc = initial(I.desc)
 	icon_state = initial(I.icon_state)
-	item_state = initial(I.item_state)
+	inhand_icon_state = initial(I.inhand_icon_state)
 	lefthand_file = initial(I.lefthand_file)
 	righthand_file = initial(I.righthand_file)
 	slot_flags = initial(I.slot_flags)
@@ -3,10 +3,9 @@

 /**********************Facehugger toy**********************/
 /obj/item/clothing/mask/facehugger/toy
-	item_state = "facehugger_inactive"
 	desc = "A toy often used to play pranks on other miners by putting it in their beds. It takes a bit to recharge after latching onto something."
-	real = 0
-	sterile = 1
+	real = FALSE
+	sterile = TRUE

 /obj/item/clothing/mask/facehugger/toy/Die()
 	return
@@ -7,7 +7,8 @@ GLOBAL_LIST_EMPTY(wormhole_effect)
 	desc = "A single use device harnessing outdated wormhole technology, Nanotrasen has since turned its eyes to bluespace for more accurate teleportation. \
 		The wormholes it creates are unpleasant to travel through, to say the least. If attached to your belt, it'll automatically activate should you fall into a chasm."
 	icon_state = "Jaunter"
-	item_state = "electronic"
+	worn_icon_state = "electronic"
+	inhand_icon_state = "electronic"
 	w_class = WEIGHT_CLASS_SMALL
 	throw_speed = 3
 	throw_range = 5
@@ -98,7 +99,7 @@ GLOBAL_LIST_EMPTY(wormhole_effect)
 	icon = 'icons/obj/lighting.dmi'
 	desc = "A single-use extraction flare that will let you create a portal to any beacon on the station. You must choose the destination beforehand, else it will target a random beacon. The portal is generated 5 seconds after activation, and has 1 use."
 	icon_state = "flare-contractor"
-	item_state = "flare"
+	inhand_icon_state = "flare"
 	var/destination

 /obj/item/wormhole_jaunter/contractor/examine(mob/user)
@@ -5,7 +5,6 @@
 	desc = "A rusted and dulled blade. It doesn't look like it'd do much damage."
 	icon = 'icons/obj/weapons/magical_weapons.dmi'
 	icon_state = "spectral"
-	item_state = "spectral"
 	flags = CONDUCT
 	sharp = TRUE
 	w_class = WEIGHT_CLASS_BULKY
@@ -228,7 +227,6 @@
 	icon_state = "lavastaff"
 	lefthand_file = 'icons/mob/inhands/staves_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/staves_righthand.dmi'
-	item_state = "lavastaff"
 	slot_flags = ITEM_SLOT_BACK
 	w_class = WEIGHT_CLASS_BULKY
 	force = 25
@@ -3,9 +3,8 @@
 /obj/item/hierophant_club
 	name = "hierophant club"
 	desc = "The strange technology of this large club allows various nigh-magical feats. It used to beat you, but now you can set the beat."
-	icon_state = "hierophant_club_ready_beacon"
-	item_state = "hierophant_club_ready_beacon"
 	icon = 'icons/obj/lavaland/artefacts.dmi'
+	icon_state = "hierophant_club_ready_beacon"
 	lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
 	inhand_x_dimension = 64
@@ -115,7 +114,6 @@

 /obj/item/hierophant_club/update_icon_state()
 	icon_state = "hierophant_club[timer <= world.time ? "_ready":""][(beacon && !QDELETED(beacon)) ? "":"_beacon"]"
-	item_state = icon_state
 	if(ismob(loc))
 		var/mob/M = loc
 		M.update_inv_l_hand()
@@ -1,11 +1,10 @@
 /obj/item/storm_staff
 	name = "staff of storms"
 	desc = "An ancient staff retrieved from the remains of Legion. The wind stirs as you move it."
+	icon = 'icons/obj/guns/magic.dmi'
 	icon_state = "staffofstorms"
 	lefthand_file = 'icons/mob/inhands/staves_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/staves_righthand.dmi'
-	item_state = "staffofstorms"
-	icon = 'icons/obj/guns/magic.dmi'
 	slot_flags = ITEM_SLOT_BACK
 	w_class = WEIGHT_CLASS_BULKY
 	force = 25
@@ -17,6 +17,9 @@
 	desc = "Somehow, it's in two places at once."
 	icon = 'icons/obj/storage.dmi'
 	icon_state = "cultpack"
+	inhand_icon_state = "backpack"
+	lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
 	slot_flags = ITEM_SLOT_BACK
 	resistance_flags = INDESTRUCTIBLE
 	var/obj/item/storage/backpack/shared/bag
@@ -150,10 +153,10 @@

 /obj/item/oar
 	name = "oar"
+	desc = "Not to be confused with the kind Research hassles you for."
 	icon = 'icons/obj/vehicles.dmi'
 	icon_state = "oar"
-	item_state = "rods"
-	desc = "Not to be confused with the kind Research hassles you for."
+	inhand_icon_state = "rods"
 	force = 12
 	resistance_flags = LAVA_PROOF | FIRE_PROOF

@@ -200,7 +203,7 @@
 	desc = "This lantern gives off no light, but is home to a friendly wisp."
 	icon = 'icons/obj/lighting.dmi'
 	icon_state = "lantern-blue"
-	item_state = "lantern"
+	inhand_icon_state = "lantern"
 	light_range = 7
 	var/obj/effect/wisp/wisp
 	var/sight_flags = SEE_MOBS
@@ -332,9 +335,11 @@
 /obj/item/gun/magic/hook
 	name = "meat hook"
 	desc = "Mid or feed."
-	ammo_type = /obj/item/ammo_casing/magic/hook
 	icon_state = "hook"
-	item_state = "chain"
+	inhand_icon_state = "chain"
+	lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
+	ammo_type = /obj/item/ammo_casing/magic/hook
 	fire_sound = 'sound/weapons/batonextend.ogg'
 	max_charges = 1
 	flags = NOBLUDGEON
@@ -31,7 +31,6 @@
 /obj/item/flashlight/lantern
 	name = "lantern"
 	icon_state = "lantern"
-	item_state = "lantern"
 	desc = "A mining lantern."
 	brightness_on = 6			// luminosity when on

@@ -9,9 +9,9 @@
 /obj/item/stack/ore
 	name = "rock"
 	icon = 'icons/obj/stacks/ores.dmi'
+	icon_state = "ore"
 	lefthand_file = 'icons/mob/inhands/ore_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/ore_righthand.dmi'
-	icon_state = "ore"
 	singular_name = "ore chunk"
 	var/points = 0 //How many points this ore gets you from the ore redemption machine
 	var/refined_type = null //What this ore defaults to being refined into
@@ -51,7 +51,6 @@
 	name = "sand pile"
 	desc = "A coarse, dust mainly composed of quartz and silica-rich rock. Among its many uses, it can be refined into glass when fired at high tempratures."
 	icon_state = "sand"
-	item_state = "sand"
 	singular_name = "sand pile"
 	points = 1
 	refined_type = /obj/item/stack/sheet/glass
@@ -99,7 +98,6 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	name = "volcanic ash"
 	desc = "A coarse, abrasive basaltic dust rich in silica and various elemental oxides. Commonly refined into glass or used as fertiliser."
 	icon_state = "volcanic_sand"
-	item_state = "volcanic_sand"
 	singular_name = "volcanic ash pile"

 /obj/item/stack/ore/glass/basalt/examine(mob/user)
@@ -115,7 +113,6 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	name = "iron ore"
 	desc = "Exceptionally common ore that can be refined into iron and steel."
 	icon_state = "iron_ore"
-	item_state = "iron_ore"
 	singular_name = "iron ore chunk"
 	points = 1
 	refined_type = /obj/item/stack/sheet/metal
@@ -125,7 +122,6 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	name = "plasma ore"
 	desc = "The reason you're here."
 	icon_state = "plasma_ore"
-	item_state = "plasma_ore"
 	origin_tech = "plasmatech=2;materials=2"
 	singular_name = "plasma ore chunk"
 	points = 15
@@ -136,7 +132,6 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	name = "silver ore"
 	desc = "Metal ore rich in precious silver."
 	icon_state = "silver_ore"
-	item_state = "silver_ore"
 	origin_tech = "materials=3"
 	singular_name = "silver ore chunk"
 	points = 16
@@ -147,7 +142,6 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	name = "gold ore"
 	desc = "WE'RE RICH!"
 	icon_state = "gold_ore"
-	item_state = "gold_ore"
 	origin_tech = "materials=4"
 	singular_name = "gold ore chunk"
 	points = 18
@@ -158,7 +152,6 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	name = "uranium ore"
 	desc = "Radioactive ore containing significant amounts of natural uranium."
 	icon_state = "uranium_ore"
-	item_state = "uranium_ore"
 	origin_tech = "materials=5"
 	singular_name = "uranium ore chunk"
 	points = 30
@@ -168,7 +161,6 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 /obj/item/stack/ore/titanium
 	name = "titanium ore"
 	icon_state = "titanium_ore"
-	item_state = "titanium_ore"
 	singular_name = "titanium ore chunk"
 	points = 50
 	materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT)
@@ -178,7 +170,6 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	name = "diamond ore"
 	desc = "Rock formation containing diamond."
 	icon_state = "diamond_ore"
-	item_state = "diamond_ore"
 	origin_tech = "materials=6"
 	singular_name = "diamond ore chunk"
 	points = 50
@@ -192,7 +183,6 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	name = "platinum ore"
 	desc = "Rock formation containing platinum."
 	icon_state = "platinum_ore"
-	item_state = "platinum_ore"
 	origin_tech = "materials=5"
 	singular_name = "platinum ore chunk"
 	points = 50
@@ -203,7 +193,6 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	name = "palladium ore"
 	desc = "Rock formation containing palladium."
 	icon_state = "palladium_ore"
-	item_state = "palladium_ore"
 	origin_tech = "materials=5"
 	singular_name = "palladium ore chunk"
 	points = 50
@@ -214,7 +203,6 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	name = "iridium ore"
 	desc = "Rock formation containing iridium."
 	icon_state = "iridium_ore"
-	item_state = "iridium_ore"
 	origin_tech = "materials=5"
 	singular_name = "iridium ore chunk"
 	points = 50
@@ -233,7 +221,6 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	name = "bananium ore"
 	desc = "HONK!"
 	icon_state = "bananium_ore"
-	item_state = "bananium_ore"
 	origin_tech = "materials=4"
 	singular_name = "bananium ore chunk"
 	points = 60
@@ -244,7 +231,6 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	name = "tranquillite ore"
 	desc = "..."
 	icon_state = "tranquillite_ore"
-	item_state = "tranquillite_ore"
 	origin_tech = "materials=4"
 	singular_name = "transquillite ore chunk"
 	points = 60
@@ -265,7 +251,6 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	desc = "Extremely explosive if struck with mining equipment, Gibtonite is often used by miners to speed up their work by using it as a mining charge. This material is illegal to possess by unauthorized personnel under Space Law."
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "Gibtonite ore"
-	item_state = "Gibtonite ore"
 	w_class = WEIGHT_CLASS_BULKY
 	throw_range = 0
 	anchored = TRUE //Forces people to carry it by hand, no pulling!