From 60673d9c5c09fd4b9498d568d9bcb3ddadbc38f3 Mon Sep 17 00:00:00 2001
From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Mon, 10 May 2021 17:13:24 +0100
Subject: [PATCH] AAAAAA

---
 code/modules/client/preferences.dm           | 17 +++++++++
 code/modules/surgery/bodyparts/_bodyparts.dm | 39 ++++++++++----------
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 7ae8ec280b..19103d8d9a 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -2477,6 +2477,23 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						if(color_option)
 							if(color_option == "Secondary") color_number = 2
 							if(color_option == "Tertiary") color_number = 3
+							// perform some magic on the color number
+							var/list/marking_list = features[marking_type][index]
+							var/datum/sprite_accessory/mam_body_markings/S = GLOB.mam_body_markings_list[marking_list[2]]
+							var/matrixed_sections = S.covered_limbs[GLOB.bodypart_names[num2text(marking_list[1])]]
+							if(color_number == 1)
+								switch(matrixed_sections)
+									if(MATRIX_GREEN)
+										color_number = 2
+									if(MATRIX_BLUE)
+										color_number = 3
+							else if(color_number == 2)
+								switch(matrixed_sections)
+									if(MATRIX_RED_BLUE)
+										color_number = 3
+									if(MATRIX_GREEN_BLUE)
+										color_number = 3
+
 							var/color_list = features[marking_type][index][3]
 							var/new_marking_color = input(user, "Choose your character's marking color:", "Character Preference","#"+color_list[color_number]) as color|null
 							if(new_marking_color)
diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm
index 8c7a99f8b1..168a12a2ef 100644
--- a/code/modules/surgery/bodyparts/_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/_bodyparts.dm
@@ -843,12 +843,14 @@
 			for(var/I in aux_icons)
 				var/aux_layer = aux_icons[I]
 				aux += image(limb.icon, "[species_id]_[I]", -aux_layer, image_dir)
-				if(!isnull(marking_value))
-					if(species_id == "husk")
-						auxmarking += image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_[I]", -aux_layer, image_dir)
-					else
-						for(var/marking_list in body_markings_list)
-							auxmarking += image(marking_list[1], "[marking_list[2]]_[I]", -aux_layer, image_dir)
+				if(species_id == "husk")
+					auxmarking += image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_[I]", -aux_layer, image_dir)
+				else
+					for(var/marking_list in body_markings_list)
+						var/image/aux_marking_image = image(marking_list[1], "[marking_list[2]]_[I]", -aux_layer, image_dir)
+						if(length(marking_list) == 3)
+							aux_marking_image.color = marking_list[3]
+						auxmarking += aux_marking_image
 			. += aux
 			. += auxmarking
 
@@ -863,12 +865,14 @@
 			for(var/I in aux_icons)
 				var/aux_layer = aux_icons[I]
 				aux += image(limb.icon, "[I]", -aux_layer, image_dir)
-				if(!isnull(marking_value))
-					if(species_id == "husk")
-						auxmarking += image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_[I]", -aux_layer, image_dir)
-					else
-						for(var/marking_list in body_markings_list)
-							auxmarking += image(marking_list[1], "[marking_list[2]]_[I]", -aux_layer, image_dir)
+				if(species_id == "husk")
+					auxmarking += image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_[I]", -aux_layer, image_dir)
+				else
+					for(var/marking_list in body_markings_list)
+						var/image/aux_marking_image = image(marking_list[1], "[marking_list[2]]_[I]", -aux_layer, image_dir)
+						if(length(marking_list) == 3)
+							aux_marking_image.color = marking_list[3]
+						auxmarking += aux_marking_image
 			. += auxmarking
 			. += aux
 
@@ -907,13 +911,10 @@
 					if(grayscale)
 						I.icon_state += "_g"
 					I.color = draw_color
-				if(!isnull(marking_value))
-					for(var/a in auxmarking)
-						var/image/I = a
-						if(species_id == "husk")
-							I.color = "#141414"
-						else
-							I.color = list(markings_color)
+				for(var/a in auxmarking)
+					var/image/I = a
+					if(species_id == "husk")
+						I.color = "#141414"
 
 			if(!isnull(body_markings))
 				if(species_id == "husk")