From 04e1d9fc392a87f442dcb48ff479cdca294f16f1 Mon Sep 17 00:00:00 2001
From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Sat, 17 Oct 2020 03:42:14 +0100
Subject: [PATCH] more fixes

---
 code/modules/client/preferences.dm          | 6 ++++++
 code/modules/client/preferences_savefile.dm | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index b53a2f3c30..2d2f6e1e00 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -578,12 +578,18 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 											if(MATRIX_GREEN_BLUE) //composed of a green and blue section
 												primary_feature = secondary_feature //swap primary for secondary, as first option is green, which is linked to the secondary
 												secondary_feature = tertiary_feature //swap secondary for tertiary, as second option is blue, which is linked to the tertiary
+									if(!features[primary_feature])
+										features[primary_feature] = "FFFFFF"
 									dat += "<b>Primary Color</b><BR>"
 									dat += "<span style='border:1px solid #161616; background-color: #[features[primary_feature]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=[primary_feature];task=input'>Change</a><BR>"
 									if((accessory.color_src == MATRIXED && (matrixed_sections == MATRIX_RED_BLUE || matrixed_sections == MATRIX_GREEN_BLUE || matrixed_sections == MATRIX_RED_GREEN || matrixed_sections == MATRIX_ALL)) || (accessory.extra && (accessory.extra_color_src == MUTCOLORS || accessory.extra_color_src == MUTCOLORS2 || accessory.extra_color_src == MUTCOLORS3)))
+										if(!features[secondary_feature])
+											features[secondary_feature] = "FFFFFF"
 										dat += "<b>Secondary Color</b><BR>"
 										dat += "<span style='border:1px solid #161616; background-color: #[features[secondary_feature]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=[secondary_feature];task=input'>Change</a><BR>"
 										if((accessory.color_src == MATRIXED && matrixed_sections == MATRIX_ALL) || (accessory.extra2 && (accessory.extra2_color_src == MUTCOLORS || accessory.extra2_color_src == MUTCOLORS2 || accessory.extra2_color_src == MUTCOLORS3)))
+											if(!features[tertiary_feature])
+												features[tertiary_feature] = "FFFFFF"
 											dat += "<b>Tertiary Color</b><BR>"
 											dat += "<span style='border:1px solid #161616; background-color: #[features[tertiary_feature]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=[tertiary_feature];task=input'>Change</a><BR>"
 
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index edb98a7e64..7d5af1ff81 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -231,10 +231,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 			message_admins("[feature]")
 			var/feature_type = features[feature]
 			if(feature_type)
-				var/ref_list = GLOB.mutant_reference_list[feature_type]
+				var/ref_list = GLOB.mutant_reference_list[feature]
 				if(ref_list)
 					message_admins("ref list found [ref_list]")
-					var/datum/sprite_accessory/accessory = ref_list[feature]
+					var/datum/sprite_accessory/accessory = ref_list[feature_type]
 					if(accessory)
 						var/primary_string = "[feature_type]_primary"
 						var/secondary_string = "[feature_type]_secondary]"