From 6fdf58f6b6ac5f3df63e83f7c45571f9a82a7487 Mon Sep 17 00:00:00 2001 From: GPeckman <21979502+GPeckman@users.noreply.github.com> Date: Tue, 31 Oct 2023 09:45:38 -0400 Subject: [PATCH] Fixes Permanent Fire Visual Bug (#79326) ## About The Pull Request There was a bug where the fire visual effect would remain even after the fire status effect was removed. It happened most often with lava, but apparently happened in some other circumstances too. I believe I have tracked down and fixed all sources of the bug. The culprit was `/mob/living/proc/update_fire`. It was searching for a base `/datum/status_effect/fire_handler` status effect, when it should have been looking for `/datum/status_effect/fire_handler/fire_stacks`. I tested it with lava, and it fixed the bug. If anyone knows of a reliable way to cause the bug without lava, I would be happy to test it there as well. Closes #73283. ## Changelog :cl: fix: The fire visual on mobs should no longer persist after the fire has been extinguished. /:cl: --- code/modules/mob/living/living.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index e8be8f51da47..e0ff64926255 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1564,9 +1564,9 @@ GLOBAL_LIST_EMPTY(fire_appearances) return fire_status.ignite(silent) /mob/living/proc/update_fire() - var/datum/status_effect/fire_handler/fire_handler = has_status_effect(/datum/status_effect/fire_handler) - if(fire_handler) - fire_handler.update_overlay() + var/datum/status_effect/fire_handler/fire_stacks/fire_stacks = has_status_effect(/datum/status_effect/fire_handler/fire_stacks) + if(fire_stacks) + fire_stacks.update_overlay() /** * Extinguish all fire on the mob