Improves belt item overlay code, Adds new belt item overlay sprites (#17568)

* belt-improvements-and-sprites * fixes my fix of botany belt allowed contents
2026-07-19 11:05:03 +01:00 · 2022-04-12 07:57:21 -07:00
parent ae600a7d40
commit bcf90593ed
34 changed files with 67 additions and 7 deletions
@@ -20,6 +20,7 @@
 	icon = 'icons/obj/hydroponics/equipment.dmi'
 	icon_state = "weedspray"
 	item_state = "plantbgone"
+	belt_icon = null
 	volume = 100
 	container_type = OPENCONTAINER
 	slot_flags = SLOT_BELT
@@ -39,6 +40,7 @@
 	icon = 'icons/obj/hydroponics/equipment.dmi'
 	icon_state = "pestspray"
 	item_state = "plantbgone"
+	belt_icon = null
 	volume = 100
 	container_type = OPENCONTAINER
 	slot_flags = SLOT_BELT
@@ -57,6 +59,7 @@
 	desc = "It's used for removing weeds or scratching your back."
 	icon_state = "cultivator"
 	item_state = "cultivator"
+	belt_icon = "cultivator"
 	origin_tech = "engineering=2;biotech=2"
 	flags = CONDUCT
 	force = 5
@@ -81,6 +84,7 @@
 	desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood."
 	icon_state = "hatchet"
 	item_state = "hatchet"
+	belt_icon = "hatchet"
 	flags = CONDUCT
 	force = 12
 	w_class = WEIGHT_CLASS_TINY
@@ -143,6 +143,7 @@
 	desc = "A small tool for digging and moving dirt."
 	icon_state = "spade"
 	item_state = "spade"
+	belt_icon = "spade"
 	force = 5
 	throwforce = 7
 	w_class = WEIGHT_CLASS_SMALL
@@ -484,6 +484,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restrain
 	icon = 'icons/obj/power.dmi'
 	icon_state = "coil"
 	item_state = "coil_red"
+	belt_icon = "cable_coil"
 	amount = MAXCOIL
 	max_amount = MAXCOIL
 	merge_type = /obj/item/stack/cable_coil // This is here to let its children merge between themselves
@@ -4,6 +4,7 @@
 	ammo_type = /obj/item/ammo_casing/magic
 	icon_state = "nothingwand"
 	item_state = "wand"
+	belt_icon = "wand_nothing"
 	w_class = WEIGHT_CLASS_SMALL
 	can_charge = 0
 	max_charges = 100 //100, 50, 50, 34 (max charge distribution by 25%ths)
@@ -63,6 +64,7 @@
 	fire_sound = 'sound/magic/wandodeath.ogg'
 	ammo_type = /obj/item/ammo_casing/magic/death
 	icon_state = "deathwand"
+	belt_icon = "wand_death"
 	max_charges = 3 //3, 2, 2, 1

 /obj/item/gun/magic/wand/death/zap_self(mob/living/user)
@@ -88,6 +90,7 @@
 	ammo_type = /obj/item/ammo_casing/magic/heal
 	fire_sound = 'sound/magic/staff_healing.ogg'
 	icon_state = "revivewand"
+	belt_icon = "wand_revive"
 	max_charges = 3 //3, 2, 2, 1

 /obj/item/gun/magic/wand/resurrection/zap_self(mob/living/user)
@@ -111,6 +114,7 @@
 	ammo_type = /obj/item/ammo_casing/magic/change
 	fire_sound = 'sound/magic/staff_change.ogg'
 	icon_state = "polywand"
+	belt_icon = "wand_polymorph"
 	max_charges = 10 //10, 5, 5, 4

 /obj/item/gun/magic/wand/polymorph/zap_self(mob/living/user)
@@ -127,6 +131,7 @@
 	desc = "This wand will wrench targets through space and time to move them somewhere else."
 	ammo_type = /obj/item/ammo_casing/magic/teleport
 	icon_state = "telewand"
+	belt_icon = "wand_tele"
 	max_charges = 10 //10, 5, 5, 4
 	no_den_usage = TRUE
 	fire_sound = 'sound/magic/wand_teleport.ogg'
@@ -149,6 +154,7 @@
 	ammo_type = /obj/item/ammo_casing/magic/door
 	fire_sound = 'sound/magic/staff_door.ogg'
 	icon_state = "doorwand"
+	belt_icon = "wand_door"
 	max_charges = 20 //20, 10, 10, 7
 	no_den_usage = TRUE

@@ -167,6 +173,7 @@
 	fire_sound = 'sound/magic/fireball.ogg'
 	ammo_type = /obj/item/ammo_casing/magic/fireball
 	icon_state = "firewand"
+	belt_icon = "wand_fireball"
 	max_charges = 8 //8, 4, 4, 3

 /obj/item/gun/magic/wand/fireball/zap_self(mob/living/user)
@@ -7,6 +7,7 @@
 	desc = "A dropper. Transfers 5 units."
 	icon_state = "dropper"
 	item_state = "dropper"
+	belt_icon = "dropper"
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = list(1, 2, 3, 4, 5)
 	volume = 5
@@ -119,6 +119,7 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "beaker"
 	item_state = "beaker"
+	belt_icon = "beaker"
 	materials = list(MAT_GLASS=500)
 	var/obj/item/assembly_holder/assembly = null
 	var/can_assembly = 1
@@ -226,6 +227,7 @@
 	name = "vial"
 	desc = "A small glass vial. Can hold up to 25 units."
 	icon_state = "vial"
+	belt_icon = "vial"
 	materials = list(MAT_GLASS=250)
 	volume = 25
 	amount_per_transfer_from_this = 10
@@ -8,6 +8,7 @@
 	icon = 'icons/obj/hypo.dmi'
 	item_state = "hypo"
 	icon_state = "hypo"
+	belt_icon = "hypospray"
 	amount_per_transfer_from_this = 5
 	volume = 30
 	possible_transfer_amounts = list(1,2,3,4,5,10,15,20,25,30)
@@ -101,6 +102,7 @@
 	desc = "A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge."
 	icon_state = "autoinjector"
 	item_state = "autoinjector"
+	belt_icon = "autoinjector"
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(10)
 	volume = 10
@@ -4,6 +4,7 @@
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "cleaner"
 	item_state = "cleaner"
+	belt_icon = "space_cleaner"
 	flags = NOBLUDGEON
 	container_type = OPENCONTAINER
 	slot_flags = SLOT_BELT
@@ -150,6 +151,7 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "pepperspray"
 	item_state = "pepperspray"
+	belt_icon = null
 	volume = 40
 	spray_maxrange = 4
 	amount_per_transfer_from_this = 5
@@ -162,6 +164,7 @@
 	icon = 'icons/obj/hydroponics/harvest.dmi'
 	icon_state = "sunflower"
 	item_state = "sunflower"
+	belt_icon = null
 	amount_per_transfer_from_this = 1
 	volume = 10
 	list_reagents = list("water" = 10)
@@ -235,5 +238,6 @@
 	icon = 'icons/obj/hydroponics/equipment.dmi'
 	icon_state = "plantbgone"
 	item_state = "plantbgone"
+	belt_icon = null
 	volume = 100
 	list_reagents = list("glyphosate" = 100)
@@ -8,6 +8,7 @@
 	icon = 'icons/goonstation/objects/syringe.dmi'
 	item_state = "syringe_0"
 	icon_state = "0"
+	belt_icon = "syringe"
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = list()
 	volume = 15