cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 10:33:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Cleans up lighter code a tiny bit and fixes colored lighters becoming green (#26129)

Browse Source 
* 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 <yumyumkillkill@gmail.com>

* Applies suggestions from @DGamerL

---------

Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
This commit is contained in:
Spaghetti-bit
2024-07-05 09:59:16 -07:00
committed by GitHub
parent 8da5beb34b
commit 8cfdc72b31
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/lighters.dm
+11 -8
View File
@@ -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