From f4f322dd0e0db017928d3501caff58194b9c47e2 Mon Sep 17 00:00:00 2001
From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Fri, 30 Oct 2020 19:39:43 +0000
Subject: [PATCH] better fix

---
 code/modules/client/preferences.dm           |  3 ++-
 code/modules/client/preferences_savefile.dm  |  9 ++++++---
 code/modules/surgery/bodyparts/_bodyparts.dm | 12 +++++++++++-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 0e7f089f8c..1c4bc8cd9d 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -567,7 +567,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 									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/mutant_string = accessory.mutant_part_string
 										if(!mutant_string)
-											mutant_string = "[accessory]"
+											if(istype(accessory, /datum/sprite_accessory/mam_body_markings))
+												mutant_string = "mam_body_markings"
 										var/primary_feature = "[mutant_string]_primary"
 										var/secondary_feature = "[mutant_string]_secondary"
 										var/tertiary_feature = "[mutant_string]_tertiary"
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index aa7eeb9ad3..3d653efbc1 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -237,7 +237,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 					if(accessory)
 						var/mutant_string = accessory.mutant_part_string
 						if(!mutant_string)
-							mutant_string = "[accessory]"
+							if(istype(accessory, /datum/sprite_accessory/mam_body_markings))
+								mutant_string = "mam_body_markings"
 						var/primary_string = "[mutant_string]_primary"
 						var/secondary_string = "[mutant_string]_secondary]"
 						var/tertiary_string = "[mutant_string]_tertiary]"
@@ -848,7 +849,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 				if(accessory)
 					var/mutant_string = accessory.mutant_part_string
 					if(!mutant_string)
-						mutant_string = "[accessory]"
+						if(istype(accessory, /datum/sprite_accessory/mam_body_markings))
+							mutant_string = "mam_body_markings"
 					var/primary_string = "[mutant_string]_primary"
 					var/secondary_string = "[mutant_string]_secondary]"
 					var/tertiary_string = "[mutant_string]_tertiary]"
@@ -998,7 +1000,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 				if(accessory)
 					var/mutant_string = accessory.mutant_part_string
 					if(!mutant_string)
-						mutant_string = "[accessory]"
+						if(istype(accessory, /datum/sprite_accessory/mam_body_markings))
+							mutant_string = "mam_body_markings"
 					var/primary_string = "[mutant_string]_primary"
 					var/secondary_string = "[mutant_string]_secondary]"
 					var/tertiary_string = "[mutant_string]_tertiary]"
diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm
index beef8559a4..d530b5a4de 100644
--- a/code/modules/surgery/bodyparts/_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/_bodyparts.dm
@@ -685,7 +685,17 @@
 			else
 				body_markings = "plain"
 				aux_marking = "plain"
-			markings_color = list(colorlist)
+			var/color_scheme = H.dna.features["color_scheme"]
+			if(color_scheme == ADVANCED_CHARACTER_COLORING)
+				var/alt_colorlist = list()
+				alt_colorlist.Cut()
+				alt_colorlist += ReadRGB("[H.dna.features["primary_mam_body_markings"]]00")
+				alt_colorlist += ReadRGB("[H.dna.features["secondary_mam_body_markings"]]00")
+				alt_colorlist += ReadRGB("[H.dna.features["tertiary_mam_body_markings"]]00")
+				alt_colorlist += list(0,0,0, S.hair_alpha)
+				markings_color = list(alt_colorlist)
+			else
+				markings_color = list(colorlist)
 		else
 			body_markings = null
 			aux_marking = null