Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 7 commits into from
Jul 5, 2024
Merged

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

Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
82b84a8
Cleans up lighter code a tiny bit and fixes colored lighters becoming…
Spaghetti-bit Jul 2, 2024
5cdcc20
Merge branch 'ParadiseSS13:master' into lighters
Spaghetti-bit Jul 2, 2024
2fd4bd2
Applies a multitude of suggestions, cleans up code.
Spaghetti-bit Jul 3, 2024
83bacc7
Slims down the code and fixes the zippo.
Spaghetti-bit Jul 3, 2024
b98bcf2
Axes `var/base_item_state`
Spaghetti-bit Jul 3, 2024
d64f83c
Update code/game/objects/items/weapons/lighters.dm
Spaghetti-bit Jul 3, 2024
0318c40
Applies suggestions from @DGamerL
Spaghetti-bit Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions code/game/objects/items/weapons/lighters.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,14 @@
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 = null
Spaghetti-bit marked this conversation as resolved.
Show resolved Hide resolved

/obj/item/lighter/random/New()
..()
var/color = pick("r","c","y","g")
icon_state = "lighter-[color]"
/obj/item/lighter/random/Initialize(mapload)
. = ..()
lighter_color = pick("r","c","y","g")
base_icon_state = "lighter"
Spaghetti-bit marked this conversation as resolved.
Show resolved Hide resolved
update_icon()

/obj/item/lighter/attack_self(mob/living/user)
. = ..()
Expand Down Expand Up @@ -118,12 +121,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
Expand Down