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)