From 1fd5120544f771cad171ed7bc69bea606ee1ebfd Mon Sep 17 00:00:00 2001
From: duncathan <dunc2403@dunc2403.com>
Date: Sat, 14 Oct 2017 00:07:22 -0600
Subject: [PATCH] fixes freon uncolouring

---
 code/__HELPERS/icons.dm | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm
index 81187a05cb5..554159ab222 100644
--- a/code/__HELPERS/icons.dm
+++ b/code/__HELPERS/icons.dm
@@ -1038,9 +1038,7 @@ GLOBAL_LIST_EMPTY(friendly_animal_types)
 /image/proc/setDir(newdir)
 	dir = newdir
 
-#define FROZEN_RED_COLOR "#2E5E69"
-#define FROZEN_GREEN_COLOR "#60A2A8"
-#define FROZEN_BLUE_COLOR "#A1AFB1"
+GLOBAL_LIST_INIT(freon_color_matrix, list("#2E5E69", "#60A2A8", "#A1AFB1", rgb(0,0,0)))
 
 /obj/proc/make_frozen_visual()
 	// Used to make the frozen item visuals for Freon.
@@ -1048,7 +1046,7 @@ GLOBAL_LIST_EMPTY(friendly_animal_types)
 		return
 	if(!(flags_2 & FROZEN_2))
 		name = "frozen [name]"
-		add_atom_colour(list(FROZEN_RED_COLOR, FROZEN_GREEN_COLOR, FROZEN_BLUE_COLOR, rgb(0,0,0)), TEMPORARY_COLOUR_PRIORITY)
+		add_atom_colour(GLOB.freon_color_matrix, TEMPORARY_COLOUR_PRIORITY)
 		alpha -= 25
 		flags_2 |= FROZEN_2
 
@@ -1056,14 +1054,10 @@ GLOBAL_LIST_EMPTY(friendly_animal_types)
 /obj/proc/make_unfrozen()
 	if(flags_2 & FROZEN_2)
 		name = replacetext(name, "frozen ", "")
-		remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, list(FROZEN_RED_COLOR, FROZEN_GREEN_COLOR, FROZEN_BLUE_COLOR, rgb(0,0,0)))
+		remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, GLOB.freon_color_matrix)
 		alpha += 25
 		flags_2 &= ~FROZEN_2
 
-#undef FROZEN_RED_COLOR
-#undef FROZEN_GREEN_COLOR
-#undef FROZEN_BLUE_COLOR
-
 
 //Converts an icon to base64. Operates by putting the icon in the iconCache savefile,
 // exporting it as text, and then parsing the base64 from that.