From a987420d223c34f0fd7420d2073f382d3380ebd9 Mon Sep 17 00:00:00 2001
From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Tue, 27 Oct 2020 21:40:07 +0000
Subject: [PATCH] fix for mam markings

---
 code/modules/client/preferences.dm          |  9 ++++---
 code/modules/client/preferences_savefile.dm | 27 ++++++++++++++-------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 792114050c..0e7f089f8c 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -565,9 +565,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 								var/datum/sprite_accessory/accessory = find_part_list[find_part]
 								if(accessory)
 									if(accessory.color_src == MATRIXED || accessory.color_src == MUTCOLORS || accessory.color_src == MUTCOLORS2 || accessory.color_src == MUTCOLORS3) //mutcolors1-3 are deprecated now, please don't rely on these in the future
-										var/primary_feature = "[accessory.mutant_part_string]_primary"
-										var/secondary_feature = "[accessory.mutant_part_string]_secondary"
-										var/tertiary_feature = "[accessory.mutant_part_string]_tertiary"
+										var/mutant_string = accessory.mutant_part_string
+										if(!mutant_string)
+											mutant_string = "[accessory]"
+										var/primary_feature = "[mutant_string]_primary"
+										var/secondary_feature = "[mutant_string]_secondary"
+										var/tertiary_feature = "[mutant_string]_tertiary"
 										if(!features[primary_feature])
 											features[primary_feature] = features["mcolor"]
 										if(!features[secondary_feature])
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 2fa936e72e..07f98e3538 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -235,9 +235,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 				if(ref_list)
 					var/datum/sprite_accessory/accessory = ref_list[feature_value]
 					if(accessory)
-						var/primary_string = "[accessory.mutant_part_string]_primary"
-						var/secondary_string = "[accessory.mutant_part_string]_secondary]"
-						var/tertiary_string = "[accessory.mutant_part_string]_tertiary]"
+						var/mutant_string = accessory.mutant_part_string
+						if(!mutant_string)
+							mutant_string = "[accessory]"
+						var/primary_string = "[mutant_string]_primary"
+						var/secondary_string = "[mutant_string]_secondary]"
+						var/tertiary_string = "[mutant_string]_tertiary]"
 						if(accessory.color_src == MATRIXED && !accessory.matrixed_sections && feature_value != "None")
 							message_admins("Sprite Accessory Failure (migration from [current_version] to 39): Accessory [accessory.type] is a matrixed item without any matrixed sections set!")
 							continue
@@ -842,9 +845,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 			if(ref_list)
 				var/datum/sprite_accessory/accessory = ref_list[feature_value]
 				if(accessory)
-					var/primary_string = "[accessory.mutant_part_string]_primary"
-					var/secondary_string = "[accessory.mutant_part_string]_secondary]"
-					var/tertiary_string = "[accessory.mutant_part_string]_tertiary]"
+					var/mutant_string = accessory.mutant_part_string
+					if(!mutant_string)
+						mutant_string = "[accessory]"
+					var/primary_string = "[mutant_string]_primary"
+					var/secondary_string = "[mutant_string]_secondary]"
+					var/tertiary_string = "[mutant_string]_tertiary]"
 					if(accessory.color_src == MATRIXED && !accessory.matrixed_sections && feature_value != "None")
 						message_admins("Sprite Accessory Failure (loading data): Accessory [accessory.type] is a matrixed item without any matrixed sections set!")
 						continue
@@ -988,9 +994,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 			if(ref_list)
 				var/datum/sprite_accessory/accessory = ref_list[feature_value]
 				if(accessory)
-					var/primary_string = "[accessory.mutant_part_string]_primary"
-					var/secondary_string = "[accessory.mutant_part_string]_secondary]"
-					var/tertiary_string = "[accessory.mutant_part_string]_tertiary]"
+					var/mutant_string = accessory.mutant_part_string
+					if(!mutant_string)
+						mutant_string = "[accessory]"
+					var/primary_string = "[mutant_string]_primary"
+					var/secondary_string = "[mutant_string]_secondary]"
+					var/tertiary_string = "[mutant_string]_tertiary]"
 					if(accessory.color_src == MATRIXED && !accessory.matrixed_sections && feature_value != "None")
 						message_admins("Sprite Accessory Failure (saving data): Accessory [accessory.type] is a matrixed item without any matrixed sections set!")
 						continue