From 2d8b552c27267af700291e659d93b47d2d5757bc Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Sun, 22 Feb 2026 02:26:57 +0100 Subject: [PATCH] Potentially fix a hard delete to do with status icons. (#21916) title Co-authored-by: Matt Atlas --- code/modules/mob/living/carbon/human/life.dm | 3 + .../changelogs/mattatlas-harddeletestatus.yml | 58 +++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 html/changelogs/mattatlas-harddeletestatus.yml diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 8722d6f0de8..76454d1506f 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1134,6 +1134,7 @@ if(!has_drunk_status) add_status_to_hud(DRUNK_STRING, SPAN_GOOD("You are drunk. Your words are slurred, and your movements are uncoordinated.")) else if(has_drunk_status) + client.screen -= status_overlays[DRUNK_STRING] qdel(status_overlays[DRUNK_STRING]) status_overlays -= DRUNK_STRING @@ -1147,6 +1148,7 @@ if(!has_bleeding_status) add_status_to_hud(BLEEDING_STRING, SPAN_HIGHDANGER("Blood gushes from one of your bodyparts, inspect yourself and seal the wound.")) else if(has_bleeding_status) + client.screen -= status_overlays[BLEEDING_STRING] qdel(status_overlays[BLEEDING_STRING]) status_overlays -= BLEEDING_STRING @@ -1155,6 +1157,7 @@ if(!has_posing_status) add_status_to_hud(POSING_STRING, SPAN_NOTICE("You are posing. Your current pose is \"[pose]\"")) else if(has_posing_status) + client.screen -= status_overlays[POSING_STRING] qdel(status_overlays[POSING_STRING]) status_overlays -= POSING_STRING diff --git a/html/changelogs/mattatlas-harddeletestatus.yml b/html/changelogs/mattatlas-harddeletestatus.yml new file mode 100644 index 00000000000..3193e0180b6 --- /dev/null +++ b/html/changelogs/mattatlas-harddeletestatus.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: MattAtlas + +# 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: "Potentially fix a hard delete to do with status icons."