From b7dfac961539a1cd919462f98e144d9d97d9a01d Mon Sep 17 00:00:00 2001 From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com> Date: Sun, 24 May 2026 04:09:46 +0800 Subject: [PATCH] fixes medical ATK and ABK blinky lights (#22490) title --- code/game/objects/items/stacks/medical.dm | 6 +- .../changelogs/wezzy_fixes-medical-blinky.yml | 58 +++++++++++++++++++ 2 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 html/changelogs/wezzy_fixes-medical-blinky.yml diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 612896d9a1e..cdc5b4585f0 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -103,14 +103,12 @@ Contains: return //If it does not, do nothing var/ratio = CEILING(clamp(amount / max_amount, 0, 1) * charge_sections, 1) ClearOverlays() - var/iconState = "[icon_state]_charge" + var/overlay_icon_state = "[icon_state]_charge" if(!amount) //Checks if there are still charges left in the item return //If it does not, do nothing, as the overlays have been cut before this already. else - var/mutable_appearance/charge_overlay = mutable_appearance(icon, iconState) for(var/i = ratio, i >= 1, i--) - charge_overlay.pixel_x = charge_x_offset * (i - 1) - AddOverlays(charge_overlay) + AddOverlays(image(icon, overlay_icon_state, pixel_x = charge_x_offset * (i - 1))) // Bruise Pack. /obj/item/stack/medical/bruise_pack diff --git a/html/changelogs/wezzy_fixes-medical-blinky.yml b/html/changelogs/wezzy_fixes-medical-blinky.yml new file mode 100644 index 00000000000..b9ef5cb89a9 --- /dev/null +++ b/html/changelogs/wezzy_fixes-medical-blinky.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes ATK and ABK stack overlays"