From b65e33f7c88e36f5a92a04de6b49b59c5a180a7c Mon Sep 17 00:00:00 2001
From: Dan Porter <dpreid@gmail.com>
Date: Tue, 29 Aug 2023 19:44:49 +0100
Subject: [PATCH] Adds held sprite references for custom zippos

This change adds in overrides for item_state for zippos that differ from
the base silver model, which include:

* zippo-gold
* zippo-blue
* zippo-black
* zippo-red
* zippo-purple
---
 code/game/objects/items/weapons/lighters.dm                   | 4 ++++
 .../traitor/contractor/datums/rep_purchases/zippo.dm          | 1 +
 code/modules/customitems/item_defines.dm                      | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm
index fd5745d1f73..e9bd8390ba5 100644
--- a/code/game/objects/items/weapons/lighters.dm
+++ b/code/game/objects/items/weapons/lighters.dm
@@ -158,16 +158,19 @@
 	name = "gold engraved zippo"
 	desc = "An engraved golden Zippo lighter with the letters NT on it."
 	icon_state = "zippo-nt"
+	item_state = "zippo-gold"
 
 /obj/item/lighter/zippo/blue
 	name = "blue zippo lighter"
 	desc = "A zippo lighter made of some blue metal."
 	icon_state = "zippo-blue"
+	item_state = "zippo-blue"
 
 /obj/item/lighter/zippo/black
 	name = "black zippo lighter"
 	desc = "A black zippo lighter."
 	icon_state = "zippo-black"
+	item_state = "zippo-black"
 
 /obj/item/lighter/zippo/engraved
 	name = "engraved zippo lighter"
@@ -178,6 +181,7 @@
 	name = "Gonzo Fist zippo"
 	desc = "A Zippo lighter with the iconic Gonzo Fist on a matte black finish."
 	icon_state = "zippo-gonzo"
+	item_state = "zippo-red"
 
 ///////////
 //MATCHES//
diff --git a/code/modules/antagonists/traitor/contractor/datums/rep_purchases/zippo.dm b/code/modules/antagonists/traitor/contractor/datums/rep_purchases/zippo.dm
index 02607e1a604..5964acf38d3 100644
--- a/code/modules/antagonists/traitor/contractor/datums/rep_purchases/zippo.dm
+++ b/code/modules/antagonists/traitor/contractor/datums/rep_purchases/zippo.dm
@@ -12,3 +12,4 @@
 	name = "contractor zippo lighter"
 	desc = "An unique black and gold zippo commonly carried by elite Syndicate agents."
 	icon_state = "zippo-contractor"
+	item_state = "zippo-black"
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 2c058829abb..7b55c773778 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -207,24 +207,28 @@
 	desc = "All craftsspacemanship is of the highest quality. It is encrusted with refined plasma sheets. On the item is an image of a dwarf and the words 'Strike the Earth!' etched onto the side."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "zippo-purple"
+	item_state = "zippo-purple"
 
 /obj/item/lighter/zippo/fluff/michael_guess_1 // mrbits: Callista Gold
 	name = "engraved lighter"
 	desc = "A golden lighter, engraved with some ornaments and a G."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "zippo-guess"
+	item_state = "zippo-gold"
 
 /obj/item/lighter/zippo/fluff/duckchan // Duckchan: Rybys Romney
 	name = "Monogrammed Zippo"
 	desc = " A shiny purple zippo lighter, engraved with Rybys Romney and BuzzPing's name, with a festive green flame."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "zippo-duckchan"
+	item_state = "zippo-purple"
 
 /obj/item/lighter/zippo/fluff/warriorstar // Warriorstar: DEADLOCK
 	name = "zippo"
 	desc = "The lighter is made of a pastel purple metal which seems to glimmer even in complete darkness."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "zippo-warriorstar"
+	item_state = "zippo-purple"
 
 /obj/item/fluff/dogwhistle //phantasmicdream: Zeke Varloss
 	name = "Sax's whistle"