From 8cfdc72b31e4ce558f3a54430662ec6a577d9b09 Mon Sep 17 00:00:00 2001 From: Spaghetti-bit Date: Fri, 5 Jul 2024 09:59:16 -0700 Subject: [PATCH] fix: Cleans up lighter code a tiny bit and fixes colored lighters becoming green (#26129) * Cleans up lighter code a tiny bit and fixes colored lighters becoming green. * Applies a multitude of suggestions, cleans up code. * Slims down the code and fixes the zippo. * Axes `var/base_item_state` * Update code/game/objects/items/weapons/lighters.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Spaghetti-bit * Applies suggestions from @DGamerL --------- Signed-off-by: Spaghetti-bit Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> --- code/game/objects/items/weapons/lighters.dm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm index 235ec5816c9..9002eeac82e 100644 --- a/code/game/objects/items/weapons/lighters.dm +++ b/code/game/objects/items/weapons/lighters.dm @@ -18,11 +18,16 @@ var/next_on_message /// Cooldown until the next turned off message/sound can be activated var/next_off_message + /// Our lighter color suffix. => [base_icon_state]-[lightercolor] => lighter-r + var/lighter_color -/obj/item/lighter/random/New() - ..() - var/color = pick("r","c","y","g") - icon_state = "lighter-[color]" +/obj/item/lighter/random + base_icon_state = "lighter" + +/obj/item/lighter/random/Initialize(mapload) + . = ..() + lighter_color = pick("r","c","y","g") + update_icon() /obj/item/lighter/attack_self(mob/living/user) . = ..() @@ -118,12 +123,10 @@ return /obj/item/lighter/update_icon_state() - icon_state = "[initial(icon_state)][lit ? "-on" : ""]" - return ..() + icon_state = "[base_icon_state ? "[base_icon_state]" : initial(icon_state)][lighter_color ? "-[lighter_color]" : ""][lit ? "-on" : ""]" /obj/item/lighter/update_overlays() - item_state = "[initial(item_state)][lit ? "-on" : ""]" - return ..() + item_state = "[base_icon_state ? "[base_icon_state]" : initial(item_state)][lighter_color ? "-[lighter_color]" : ""][lit ? "-on" : ""]" /obj/item/lighter/get_heat() return lit * 1500