mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-24 04:27:35 +01:00
Sprite updates & state fix for zippo lighters (#22150)
* Update lighter icon state code
This commit adds a new `update_icon_state()` method which updates the
held icon sprite with the appropriate sprite for lit status before
updating the graphic, and drops the use of explicit icon_state
definitions for lit/unlit in favour of consistently named sprites for
lighters.
As no "lit" graphic exists for held zippos, nor sprites for other
custom or base lighters, updating of 'item_state' has been removed which
fixes #21257.
The naming of zippo sprites has been updated to reflect this change and
stay consistent with the base lighter object and sprites.
* Add missing sprites for colored zippos and lit state
This adds copies of the base zippo sprite for spiters to work on when
updating for custom held zippo combinations.
* 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
* Update held item sprite for lighter lit status
* Set parent items file for fluff lighters
* Update zippo sprites with lit and color variations
This commit adds the colorized versions of zippo lighters, as well
as including the lit animation ported over from TG appearances,
with variations applied for Paradise flame colors.
* fixup! Update lighter icon state code
* fixup! Update lighter icon state code
* fixup! Add missing sprites for colored zippos and lit state
* Correct purple held sprite to have blue flame
* Update code/modules/customitems/item_defines.dm
Fixup for ad1b5fb
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
---------
Co-authored-by: XFirebirdX <xfirebirdx@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
co-authored by
Henri215
XFirebirdX
parent
391948bf14
commit
2ab351cc91
@@ -202,37 +202,35 @@
|
||||
|
||||
to_chat(user, "<span class='warning'>You can't modify [target]!</span>")
|
||||
|
||||
// Custom zippo lighters
|
||||
/obj/item/lighter/zippo/fluff
|
||||
name = "custom zippo"
|
||||
desc = "A custom made zippo lighter."
|
||||
icon = 'icons/obj/custom_items.dmi'
|
||||
|
||||
/obj/item/lighter/zippo/fluff/purple // GodOfOreos: Jason Conrad
|
||||
name = "purple engraved zippo"
|
||||
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 = "purple_zippo_off"
|
||||
icon_on = "purple_zippo_on"
|
||||
icon_off = "purple_zippo_off"
|
||||
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 = "guessip"
|
||||
icon_on = "guessipon"
|
||||
icon_off = "guessip"
|
||||
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 = "rybysfluff"
|
||||
icon_on = "rybysfluffopen"
|
||||
icon_off = "rybysfluff"
|
||||
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 = "deadlock_zippo"
|
||||
icon_on = "deadlock_zippo_on"
|
||||
icon_off = "deadlock_zippo"
|
||||
icon_state = "zippo-warriorstar"
|
||||
item_state = "zippo-purple"
|
||||
|
||||
/obj/item/fluff/dogwhistle //phantasmicdream: Zeke Varloss
|
||||
name = "Sax's whistle"
|
||||
|
||||
Reference in New Issue
Block a user