From a038931099b2c6d6a1b311c0dcee6970bb8d9fd7 Mon Sep 17 00:00:00 2001
From: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com>
Date: Wed, 6 Dec 2023 11:10:34 -0800
Subject: [PATCH] Fixes fire overlays. Possibly. Hopefully. Probably not.
 (#822)

## About The Pull Request

Fixes fire overlays. Possibly. Hopefully. Probably not.

## Why It's Good For The Game

Best case scenario, this PR fixes fire overlays being persistent.
Worst case scenario, this does nothing.

Will be sent to /tg/ upstream. if it works.

Yeah I'm using Bubberstation as a testing grounds for fixing an
extremely elusive bug, how can you tell?



## Changelog

:cl: BurgerBB
fix: Fixes fire overlays. Possibly. Hopefully. Probably not.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
---
 code/modules/mob/living/basic/basic.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/basic/basic.dm b/code/modules/mob/living/basic/basic.dm
index 00a82122be0..c09cd0179a6 100644
--- a/code/modules/mob/living/basic/basic.dm
+++ b/code/modules/mob/living/basic/basic.dm
@@ -281,7 +281,7 @@
 		cut_overlay(fire_overlay)
 		return null
 	else if(on_fire && !isnull(last_icon_state))
-		return last_icon_state
+		return fire_overlay //BUBBERSTATION CHANGE: FIXES FIRE OVERLAYS. POSSIBLY.
 	return null
 
 /mob/living/basic/put_in_hands(obj/item/I, del_on_fail = FALSE, merge_stacks = TRUE, ignore_animation = TRUE)