...

cmss13-devs · Sep 25, 2023 · 3be6e25 · 3be6e25
1 parent ae8151e
commit 3be6e25
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm
@@ -479,14 +479,16 @@ world
 			// Blend the overlay into the flattened icon
 			flat.Blend(add, blendMode2iconMode(curblend), layer_image.pixel_x + 2 - flatX1, layer_image.pixel_y + 2 - flatY1)
 
-		if(appearance.color)
+		if(apply_color && appearance.color)
 			if(islist(appearance.color))
-				flat.MapColors(arglist(appearance.color))
+				add.MapColors(arglist(appearance.color))
 			else
-				flat.Blend(appearance.color, ICON_MULTIPLY)
+				add.Blend(appearance.color, ICON_MULTIPLY)
 
-		if(appearance.alpha < 255)
-			flat.Blend(rgb(255, 255, 255, appearance.alpha), ICON_MULTIPLY)
+		if(alpha_apply && appearance.alpha < 255)
+-			flat.Blend(rgb(255, 255, 255, appearance.alpha), ICON_MULTIPLY)
++			// Blend the overlay into the flattened icon
++			flat.Blend(add, blendMode2iconMode(curblend), layer_image.pixel_x + 2 - flatX1, layer_image.pixel_y + 2 - flatY1)
 
 		if(no_anim)
 			//Clean up repeated frames