From c31eb79af9a5f8d3c21eaee98caebc6e6268e67a Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Fri, 30 Apr 2021 19:03:56 +0200
Subject: [PATCH] [MIRROR] Makes icon2html support mutable appearences again
 (#5361)

* Makes icon2html support mutable appearances again (#58796)

Fixes prayers not having the cute little icon attached to them

* Makes icon2html support mutable appearences again

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
---
 code/__HELPERS/icons.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm
index 62fde60c4ed..fc192a38965 100644
--- a/code/__HELPERS/icons.dm
+++ b/code/__HELPERS/icons.dm
@@ -1116,7 +1116,8 @@ GLOBAL_LIST_INIT(freon_color_matrix, list("#2E5E69", "#60A2A8", "#A1AFB1", rgb(0
 
 		if (isnull(icon_state))
 			icon_state = A.icon_state
-			if (isnull(icon_state) || A.flags_1 & HTML_USE_INITAL_ICON_1)
+			//Despite casting to atom, this code path supports mutable appearances, so let's be nice to them
+			if(isnull(icon_state) || (isatom(thing) && A.flags_1 & HTML_USE_INITAL_ICON_1))
 				icon_state = initial(A.icon_state)
 				if (isnull(dir))
 					dir = initial(A.dir)