Merge branch 'rp-markings-attempt-two' of https://github.com/timothyteakettle/Citadel-Station-13 into rp-markings-attempt-two

code/__HELPERS/global_lists.dm

@@ -14,7 +14,6 @@
 	//socks
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear/socks, GLOB.socks_list)
 	//bodypart accessories (blizzard intensifies)
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/body_markings, GLOB.body_markings_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/lizard, GLOB.tails_list_lizard)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/tails_animated/lizard, GLOB.animated_tails_list_lizard)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/human, GLOB.tails_list_human)

code/__HELPERS/mobs.dm

@@ -64,8 +64,6 @@
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/spines, GLOB.spines_list)
 	if(!GLOB.legs_list.len)
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/legs, GLOB.legs_list)
-	if(!GLOB.body_markings_list.len)
-		init_sprite_accessory_subtypes(/datum/sprite_accessory/body_markings, GLOB.body_markings_list)
 	if(!GLOB.wings_list.len)
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/wings, GLOB.wings_list)
 	if(!GLOB.deco_wings_list.len)
@@ -177,7 +175,6 @@
 		"ears"				= "None",
 		"frills"			= pick(GLOB.frills_list),
 		"spines"			= pick(GLOB.spines_list),
-		"body_markings"		= pick(GLOB.body_markings_list),
 		"legs"				= pick("Plantigrade","Digitigrade"),
 		"caps"				= pick(GLOB.caps_list),
 		"insect_wings"		= pick(GLOB.insect_wings_list),

code/_globalvars/lists/flavor_misc.dm

@@ -17,7 +17,6 @@ GLOBAL_LIST_EMPTY(undershirt_f)	 //stores only undershirt name
 	//Socks
 GLOBAL_LIST_EMPTY_TYPED(socks_list, /datum/sprite_accessory/underwear/socks)		//stores socks indexed by name
 	//Lizard Bits (all datum lists indexed by name)
-GLOBAL_LIST_EMPTY(body_markings_list)
 GLOBAL_LIST_EMPTY(tails_list_lizard)
 GLOBAL_LIST_EMPTY(animated_tails_list_lizard)
 GLOBAL_LIST_EMPTY(snouts_list)
@@ -55,7 +54,6 @@ GLOBAL_LIST_INIT(mutant_reference_list, list(
 	"frills" = GLOB.frills_list,
 	"horns" = GLOB.horns_list,
 	"ears" = GLOB.ears_list,
-	"body_markings" = GLOB.body_markings_list,
 	"wings" = GLOB.wings_list,
 	"wingsopen" = GLOB.wings_open_list,
 	"deco_wings" = GLOB.deco_wings_list,
@@ -299,7 +297,7 @@ GLOBAL_LIST_INIT(roundstart_languages, get_roundstart_languages())
 //locked parts are those that your picked species requires to have
 //unlocked parts are those that anyone can choose on customisation regardless
 //parts not in unlocked, but in all, are thus locked
-GLOBAL_LIST_INIT(all_mutant_parts, list("tail_lizard" = "Tail", "mam_tail" = "Tail", "tail_human" = "Tail", "snout" = "Snout", "frills" = "Frills", "spines" = "Spines", "body_markings" = "Body Markings", "mam_body_markings" = "Species Markings" , "mam_ears" = "Ears", "ears" = "Ears", "mam_snouts" = "Snout", "legs" = "Legs", "deco_wings" = "Decorative Wings", "insect_wings" = "Insect Wings", "insect_fluff" = "Insect Fluff", "taur" = "Tauric Body", "insect_markings" = "Insect Markings", "wings" = "Wings", "arachnid_legs" = "Arachnid Legs", "arachnid_spinneret" = "Spinneret", "arachnid_mandibles" = "Mandibles", "xenohead" = "Caste Head", "xenotail" = "Tail", "xenodorsal" = "Dorsal Spines", "ipc_screen" = "Screen", "ipc_antenna" = "Antenna", "meat_type" = "Meat Type", "horns" = "Horns"))
+GLOBAL_LIST_INIT(all_mutant_parts, list("tail_lizard" = "Tail", "mam_tail" = "Tail", "tail_human" = "Tail", "snout" = "Snout", "frills" = "Frills", "spines" = "Spines", "mam_body_markings" = "Species Markings" , "mam_ears" = "Ears", "ears" = "Ears", "mam_snouts" = "Snout", "legs" = "Legs", "deco_wings" = "Decorative Wings", "insect_wings" = "Insect Wings", "insect_fluff" = "Insect Fluff", "taur" = "Tauric Body", "insect_markings" = "Insect Markings", "wings" = "Wings", "arachnid_legs" = "Arachnid Legs", "arachnid_spinneret" = "Spinneret", "arachnid_mandibles" = "Mandibles", "xenohead" = "Caste Head", "xenotail" = "Tail", "xenodorsal" = "Dorsal Spines", "ipc_screen" = "Screen", "ipc_antenna" = "Antenna", "meat_type" = "Meat Type", "horns" = "Horns"))
 GLOBAL_LIST_INIT(unlocked_mutant_parts, list("horns", "insect_fluff"))
 
 //parts in either of the above two lists that require a second option that allows them to be coloured
@@ -352,4 +350,6 @@ GLOBAL_LIST_INIT(nongendered_limb_types, list("fly", "zombie" ,"synth", "shadow"
 GLOBAL_LIST_INIT(eye_types, list("normal", "insect", "moth", "double", "double2", "double3", "cyclops"))
 
 //list linking bodypart bitflags to their actual names
-GLOBAL_LIST_INIT(bodypart_names, list(num2text(HEAD) = "Head", num2text(CHEST) = "Chest", num2text(LEG_LEFT) = "Left Leg", num2text(LEG_RIGHT) = "Right Leg", num2text(ARM_LEFT) = "Left Arm", num2text(ARM_RIGHT) = "Right Arm"))
+GLOBAL_LIST_INIT(bodypart_names, list(num2text(HEAD) = "Head", num2text(CHEST) = "Chest", num2text(LEG_LEFT) = "Left Leg", num2text(LEG_RIGHT) = "Right Leg", num2text(ARM_LEFT) = "Left Arm", num2text(ARM_RIGHT) = "Right Arm"))
+// list linking bodypart names back to the bitflags
+GLOBAL_LIST_INIT(bodypart_values, list("Head" = num2text(HEAD), "Chest" = num2text(CHEST), "Left Leg" = num2text(LEG_LEFT), "Right Leg" = num2text(LEG_RIGHT), "Left Arm" = num2text(ARM_LEFT), "Right Arm" = num2text(ARM_RIGHT)))

code/modules/admin/create_mob.dm

@@ -41,7 +41,6 @@
 	H.dna.features["horns"] = pick(GLOB.horns_list)
 	H.dna.features["frills"] = pick(GLOB.frills_list)
 	H.dna.features["spines"] = pick(GLOB.spines_list)
-	H.dna.features["body_markings"] = pick(GLOB.body_markings_list)
 	H.dna.features["insect_wings"] = pick(GLOB.insect_wings_list)
 	H.dna.features["deco_wings"] = pick(GLOB.deco_wings_list)
 	H.dna.features["insect_fluff"] = pick(GLOB.insect_fluffs_list)

code/modules/client/preferences.dm

@@ -124,7 +124,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/eye_type = DEFAULT_EYES_TYPE	//Eye type
 	var/split_eye_colors = FALSE
 	var/datum/species/pref_species = new /datum/species/human()	//Mutant race
-	var/list/features = list("mcolor" = "FFFFFF", "mcolor2" = "FFFFFF", "mcolor3" = "FFFFFF", "tail_lizard" = "Smooth", "tail_human" = "None", "snout" = "Round", "horns" = "None", "horns_color" = "85615a", "ears" = "None", "wings" = "None", "wings_color" = "FFF", "frills" = "None", "deco_wings" = "None", "spines" = "None", "body_markings" = list(), "legs" = "Plantigrade", "insect_wings" = "Plain", "insect_fluff" = "None", "insect_markings" = "None", "arachnid_legs" = "Plain", "arachnid_spinneret" = "Plain", "arachnid_mandibles" = "Plain", "mam_body_markings" = list(), "mam_ears" = "None", "mam_snouts" = "None", "mam_tail" = "None", "mam_tail_animated" = "None", "xenodorsal" = "Standard", "xenohead" = "Standard", "xenotail" = "Xenomorph Tail", "taur" = "None", "genitals_use_skintone" = FALSE, "has_cock" = FALSE, "cock_shape" = DEF_COCK_SHAPE, "cock_length" = COCK_SIZE_DEF, "cock_diameter_ratio" = COCK_DIAMETER_RATIO_DEF, "cock_color" = "ffffff", "cock_taur" = FALSE, "has_balls" = FALSE, "balls_color" = "ffffff", "balls_shape" = DEF_BALLS_SHAPE, "balls_size" = BALLS_SIZE_DEF, "balls_cum_rate" = CUM_RATE, "balls_cum_mult" = CUM_RATE_MULT, "balls_efficiency" = CUM_EFFICIENCY, "has_breasts" = FALSE, "breasts_color" = "ffffff", "breasts_size" = BREASTS_SIZE_DEF, "breasts_shape" = DEF_BREASTS_SHAPE, "breasts_producing" = FALSE, "has_vag" = FALSE, "vag_shape" = DEF_VAGINA_SHAPE, "vag_color" = "ffffff", "has_womb" = FALSE, "balls_visibility"	= GEN_VISIBLE_NO_UNDIES, "breasts_visibility"= GEN_VISIBLE_NO_UNDIES, "cock_visibility"	= GEN_VISIBLE_NO_UNDIES, "vag_visibility"	= GEN_VISIBLE_NO_UNDIES, "ipc_screen" = "Sunburst", "ipc_antenna" = "None", "flavor_text" = "", "silicon_flavor_text" = "", "ooc_notes" = "", "meat_type" = "Mammalian", "body_model" = MALE, "body_size" = RESIZE_DEFAULT_SIZE, "color_scheme" = OLD_CHARACTER_COLORING)
+	var/list/features = list("mcolor" = "FFFFFF", "mcolor2" = "FFFFFF", "mcolor3" = "FFFFFF", "tail_lizard" = "Smooth", "tail_human" = "None", "snout" = "Round", "horns" = "None", "horns_color" = "85615a", "ears" = "None", "wings" = "None", "wings_color" = "FFF", "frills" = "None", "deco_wings" = "None", "spines" = "None", "legs" = "Plantigrade", "insect_wings" = "Plain", "insect_fluff" = "None", "insect_markings" = "None", "arachnid_legs" = "Plain", "arachnid_spinneret" = "Plain", "arachnid_mandibles" = "Plain", "mam_body_markings" = list(), "mam_ears" = "None", "mam_snouts" = "None", "mam_tail" = "None", "mam_tail_animated" = "None", "xenodorsal" = "Standard", "xenohead" = "Standard", "xenotail" = "Xenomorph Tail", "taur" = "None", "genitals_use_skintone" = FALSE, "has_cock" = FALSE, "cock_shape" = DEF_COCK_SHAPE, "cock_length" = COCK_SIZE_DEF, "cock_diameter_ratio" = COCK_DIAMETER_RATIO_DEF, "cock_color" = "ffffff", "cock_taur" = FALSE, "has_balls" = FALSE, "balls_color" = "ffffff", "balls_shape" = DEF_BALLS_SHAPE, "balls_size" = BALLS_SIZE_DEF, "balls_cum_rate" = CUM_RATE, "balls_cum_mult" = CUM_RATE_MULT, "balls_efficiency" = CUM_EFFICIENCY, "has_breasts" = FALSE, "breasts_color" = "ffffff", "breasts_size" = BREASTS_SIZE_DEF, "breasts_shape" = DEF_BREASTS_SHAPE, "breasts_producing" = FALSE, "has_vag" = FALSE, "vag_shape" = DEF_VAGINA_SHAPE, "vag_color" = "ffffff", "has_womb" = FALSE, "balls_visibility"	= GEN_VISIBLE_NO_UNDIES, "breasts_visibility"= GEN_VISIBLE_NO_UNDIES, "cock_visibility"	= GEN_VISIBLE_NO_UNDIES, "vag_visibility"	= GEN_VISIBLE_NO_UNDIES, "ipc_screen" = "Sunburst", "ipc_antenna" = "None", "flavor_text" = "", "silicon_flavor_text" = "", "ooc_notes" = "", "meat_type" = "Mammalian", "body_model" = MALE, "body_size" = RESIZE_DEFAULT_SIZE, "color_scheme" = OLD_CHARACTER_COLORING)
 
 	var/custom_speech_verb = "default" //if your say_mod is to be something other than your races
 	var/custom_tongue = "default" //if your tongue is to be something other than your races
@@ -517,9 +517,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			// rp marking selection
 			// assume you can only have mam markings or regular markings or none, never both
 			var/marking_type
-			if(parent.can_have_part("body_markings"))
-				marking_type = "body_markings"
-			else if(parent.can_have_part("mam_body_markings"))
+			if(parent.can_have_part("mam_body_markings"))
 				marking_type = "mam_body_markings"
 			if(marking_type)
 				dat += APPEARANCE_CATEGORY_COLUMN
@@ -529,24 +527,27 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				if(length(features[marking_type]))
 					dat += "<table>"
 					var/list/markings = features[marking_type]
-					for(var/list/marking_list in markings)
+					var/list/reverse_markings = reverseList(markings)
+					for(var/list/marking_list in reverse_markings)
 						var/marking_index = markings.Find(marking_list) // consider changing loop to go through indexes over lists instead of using Find here
-						var/actual_name = GLOB.bodypart_names[num2text(marking_list[1])] // get the actual name from the bitflag representing the part the marking is applied to
+						var/limb_value = marking_list[1]
+						var/actual_name = GLOB.bodypart_names[num2text(limb_value)] // get the actual name from the bitflag representing the part the marking is applied to
 						var/color_marking_dat = ""
 						var/number_colors = 1
-						var/datum/sprite_accessory/S = (marking_type == "mam_body_markings") ? GLOB.mam_body_markings_list[marking_list[2]] : GLOB.body_markings_list[marking_list[2]]
-						if(S && S.matrixed_sections && S.matrixed_sections != MATRIX_NONE)
+						var/datum/sprite_accessory/mam_body_markings/S = GLOB.mam_body_markings_list[marking_list[2]]
+						var/matrixed_sections = S.covered_limbs[limb_value]
+						if(S && matrixed_sections)
 							// if it has nothing initialize it to white
 							if(length(marking_list) == 2)
 								marking_list += list(list("#FFFFFF","#FFFFFF","#FFFFFF")) // just assume its 3 colours if it isnt it doesnt matter we just wont use the other values
 							// we know it has one matrixed section at minimum
 							color_marking_dat += "<span style='border: 1px solid #161616; background-color: [marking_list[3][1]];'>&nbsp;&nbsp;&nbsp;</span>"
 							// if it has a second section, add it
-							if(S.matrixed_sections == MATRIX_RED_BLUE || S.matrixed_sections == MATRIX_GREEN_BLUE || S.matrixed_sections == MATRIX_RED_GREEN)
+							if(matrixed_sections == MATRIX_RED_BLUE || matrixed_sections == MATRIX_GREEN_BLUE || matrixed_sections == MATRIX_RED_GREEN || matrixed_sections == MATRIX_ALL)
 								color_marking_dat += "<span style='border: 1px solid #161616; background-color: [marking_list[3][2]];'>&nbsp;&nbsp;&nbsp;</span>"
 								number_colors = 2
 							// if it has a third section, add it
-							if(S.matrixed_sections == MATRIX_ALL)
+							if(matrixed_sections == MATRIX_ALL)
 								color_marking_dat += "<span style='border: 1px solid #161616; background-color: [marking_list[3][3]];'>&nbsp;&nbsp;&nbsp;</span>"
 								number_colors = 3
 							color_marking_dat += " <a href='?_src_=prefs;preference=marking_color;marking_index=[marking_index];marking_type=[marking_type];number_colors=[number_colors];task=input'>Change</a><BR>"
@@ -554,7 +555,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					dat += "</table>"
 
 			for(var/mutant_part in GLOB.all_mutant_parts)
-				if(mutant_part == "body_markings" || mutant_part == "mam_body_markings")
+				if(mutant_part == "mam_body_markings")
 					continue
 				if(parent.can_have_part(mutant_part))
 					if(!mutant_category)
@@ -1765,8 +1766,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						pref_species = new newtype()
 						//let's ensure that no weird shit happens on species swapping.
 						custom_species = null
-						if(!parent.can_have_part("body_markings"))
-							features["body_markings"] = list()
 						if(!parent.can_have_part("mam_body_markings"))
 							features["mam_body_markings"] = list()
 						if(parent.can_have_part("mam_body_markings"))
@@ -2144,7 +2143,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						features["xenodorsal"] = new_dors
 
 				//every single primary/secondary/tertiary colouring done at once
-				if("xenodorsal_primary","xenodorsal_secondary","xenodorsal_tertiary","xhead_primary","xhead_secondary","xhead_tertiary","tail_primary","tail_secondary","tail_tertiary","insect_markings_primary","insect_markings_secondary","insect_markings_tertiary","body_markings_primary","body_markings_secondary","body_markings_tertiary","insect_fluff_primary","insect_fluff_secondary","insect_fluff_tertiary","ears_primary","ears_secondary","ears_tertiary","frills_primary","frills_secondary","frills_tertiary","ipc_antenna_primary","ipc_antenna_secondary","ipc_antenna_tertiary","taur_primary","taur_secondary","taur_tertiary","snout_primary","snout_secondary","snout_tertiary","spines_primary","spines_secondary","spines_tertiary", "mam_body_markings_primary", "mam_body_markings_secondary", "mam_body_markings_tertiary")
+				if("xenodorsal_primary","xenodorsal_secondary","xenodorsal_tertiary","xhead_primary","xhead_secondary","xhead_tertiary","tail_primary","tail_secondary","tail_tertiary","insect_markings_primary","insect_markings_secondary","insect_markings_tertiary","insect_fluff_primary","insect_fluff_secondary","insect_fluff_tertiary","ears_primary","ears_secondary","ears_tertiary","frills_primary","frills_secondary","frills_tertiary","ipc_antenna_primary","ipc_antenna_secondary","ipc_antenna_tertiary","taur_primary","taur_secondary","taur_tertiary","snout_primary","snout_secondary","snout_tertiary","spines_primary","spines_secondary","spines_tertiary", "mam_body_markings_primary", "mam_body_markings_secondary", "mam_body_markings_tertiary")
 					var/the_feature = features[href_list["preference"]]
 					if(!the_feature)
 						features[href_list["preference"]] = "FFFFFF"
@@ -2439,20 +2438,15 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					if(marking_type && features[marking_type])
 						var/selected_limb = input(user, "Choose the limb to apply to.", "Character Preference") as null|anything in list("Head", "Chest", "Left Arm", "Right Arm", "Left Leg", "Right Leg")
 						if(selected_limb)
+							var/limb_value = text2num(GLOB.bodypart_values[selected_limb])
 							var/list/marking_list = GLOB.mam_body_markings_list
-							if(marking_type == "body_markings") marking_list = GLOB.body_markings_list
 							var/list/snowflake_markings_list = list()
 							for(var/path in marking_list)
 								var/datum/sprite_accessory/S = marking_list[path]
 								if(istype(S))
-									// gross copypasta here because mam markings arent a subtype of regular markings despite one containing the other ???
-									if(istype(S, /datum/sprite_accessory/body_markings))
-										var/datum/sprite_accessory/body_markings/marking = S
-										if(!(GLOB.bodypart_names[num2text(selected_limb)] in marking.covered_limbs))
-											continue
 									if(istype(S, /datum/sprite_accessory/mam_body_markings))
 										var/datum/sprite_accessory/mam_body_markings/marking = S
-										if(!(GLOB.bodypart_names[num2text(selected_limb)] in marking.covered_limbs))
+										if(!(limb_value in marking.covered_limbs))
 											continue
 
 									if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
@@ -2460,7 +2454,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 							var/selected_marking = input(user, "Select the marking to apply to the limb.") as null|anything in snowflake_markings_list
 							if(selected_marking)
-								features[marking_type] += list(list(selected_limb, selected_marking))
+								features[marking_type] += list(list(limb_value, selected_marking))
 
 				if("marking_color")
 					var/index = text2num(href_list["marking_index"])

code/modules/client/preferences_savefile.dm

@@ -295,11 +295,16 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 			L -= ROLE_SYNDICATE
 		S["be_special"] << L
 
-	if(current_version < 51) // rp markings means markings are now stored as a list
+	if(current_version < 51) // rp markings means markings are now stored as a list, lizard markings now mam like the rest
 		var/marking_type
 		var/species_id = S["species"]
 		var/datum/species/actual_species = GLOB.species_datums[species_id]
-		if(actual_species.mutant_bodyparts["body_markings"] && S["feature_lizard_body_markings"]) marking_type = "feature_lizard_body_markings"
+
+		// convert lizard markings to lizard markings
+		if(species_id == SPECIES_LIZARD && S["feature_lizard_body_markings"])
+			S["feature_mam_body_markings"] = S["feature_lizard_body_markings"]
+
+		// convert mam body marking data to the new rp marking data
 		if(actual_species.mutant_bodyparts["mam_body_markings"] && S["feature_mam_body_markings"]) marking_type = "feature_mam_body_markings"
 
 		if(marking_type)
@@ -600,7 +605,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	var/savefile/S = new /savefile(path)
 	if(!S)
 		return FALSE
-	features = list("mcolor" = "FFFFFF", "mcolor2" = "FFFFFF", "mcolor3" = "FFFFFF", "tail_lizard" = "Smooth", "tail_human" = "None", "snout" = "Round", "horns" = "None", "horns_color" = "85615a", "ears" = "None", "wings" = "None", "wings_color" = "FFF", "frills" = "None", "deco_wings" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Plantigrade", "insect_wings" = "Plain", "insect_fluff" = "None", "insect_markings" = "None", "arachnid_legs" = "Plain", "arachnid_spinneret" = "Plain", "arachnid_mandibles" = "Plain", "mam_body_markings" = "Plain", "mam_ears" = "None", "mam_snouts" = "None", "mam_tail" = "None", "mam_tail_animated" = "None", "xenodorsal" = "Standard", "xenohead" = "Standard", "xenotail" = "Xenomorph Tail", "taur" = "None", "genitals_use_skintone" = FALSE, "has_cock" = FALSE, "cock_shape" = DEF_COCK_SHAPE, "cock_length" = COCK_SIZE_DEF, "cock_diameter_ratio" = COCK_DIAMETER_RATIO_DEF, "cock_color" = "ffffff", "cock_taur" = FALSE, "has_balls" = FALSE, "balls_color" = "ffffff", "balls_shape" = DEF_BALLS_SHAPE, "balls_size" = BALLS_SIZE_DEF, "balls_cum_rate" = CUM_RATE, "balls_cum_mult" = CUM_RATE_MULT, "balls_efficiency" = CUM_EFFICIENCY, "has_breasts" = FALSE, "breasts_color" = "ffffff", "breasts_size" = BREASTS_SIZE_DEF, "breasts_shape" = DEF_BREASTS_SHAPE, "breasts_producing" = FALSE, "has_vag" = FALSE, "vag_shape" = DEF_VAGINA_SHAPE, "vag_color" = "ffffff", "has_womb" = FALSE, "balls_visibility"	= GEN_VISIBLE_NO_UNDIES, "breasts_visibility"= GEN_VISIBLE_NO_UNDIES, "cock_visibility"	= GEN_VISIBLE_NO_UNDIES, "vag_visibility"	= GEN_VISIBLE_NO_UNDIES, "ipc_screen" = "Sunburst", "ipc_antenna" = "None", "flavor_text" = "", "silicon_flavor_text" = "", "ooc_notes" = "", "meat_type" = "Mammalian", "body_model" = MALE, "body_size" = RESIZE_DEFAULT_SIZE, "color_scheme" = OLD_CHARACTER_COLORING)
+	features = list("mcolor" = "FFFFFF", "mcolor2" = "FFFFFF", "mcolor3" = "FFFFFF", "tail_lizard" = "Smooth", "tail_human" = "None", "snout" = "Round", "horns" = "None", "horns_color" = "85615a", "ears" = "None", "wings" = "None", "wings_color" = "FFF", "frills" = "None", "deco_wings" = "None", "spines" = "None", "legs" = "Plantigrade", "insect_wings" = "Plain", "insect_fluff" = "None", "insect_markings" = "None", "arachnid_legs" = "Plain", "arachnid_spinneret" = "Plain", "arachnid_mandibles" = "Plain", "mam_body_markings" = "Plain", "mam_ears" = "None", "mam_snouts" = "None", "mam_tail" = "None", "mam_tail_animated" = "None", "xenodorsal" = "Standard", "xenohead" = "Standard", "xenotail" = "Xenomorph Tail", "taur" = "None", "genitals_use_skintone" = FALSE, "has_cock" = FALSE, "cock_shape" = DEF_COCK_SHAPE, "cock_length" = COCK_SIZE_DEF, "cock_diameter_ratio" = COCK_DIAMETER_RATIO_DEF, "cock_color" = "ffffff", "cock_taur" = FALSE, "has_balls" = FALSE, "balls_color" = "ffffff", "balls_shape" = DEF_BALLS_SHAPE, "balls_size" = BALLS_SIZE_DEF, "balls_cum_rate" = CUM_RATE, "balls_cum_mult" = CUM_RATE_MULT, "balls_efficiency" = CUM_EFFICIENCY, "has_breasts" = FALSE, "breasts_color" = "ffffff", "breasts_size" = BREASTS_SIZE_DEF, "breasts_shape" = DEF_BREASTS_SHAPE, "breasts_producing" = FALSE, "has_vag" = FALSE, "vag_shape" = DEF_VAGINA_SHAPE, "vag_color" = "ffffff", "has_womb" = FALSE, "balls_visibility"	= GEN_VISIBLE_NO_UNDIES, "breasts_visibility"= GEN_VISIBLE_NO_UNDIES, "cock_visibility"	= GEN_VISIBLE_NO_UNDIES, "vag_visibility"	= GEN_VISIBLE_NO_UNDIES, "ipc_screen" = "Sunburst", "ipc_antenna" = "None", "flavor_text" = "", "silicon_flavor_text" = "", "ooc_notes" = "", "meat_type" = "Mammalian", "body_model" = MALE, "body_size" = RESIZE_DEFAULT_SIZE, "color_scheme" = OLD_CHARACTER_COLORING)
 
 	S.cd = "/"
 	if(!slot)
@@ -670,7 +675,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["feature_lizard_horns"]			>> features["horns"]
 	S["feature_lizard_frills"]			>> features["frills"]
 	S["feature_lizard_spines"]			>> features["spines"]
-	features["body_markings"] = safe_json_decode(S["feature_lizard_body_markings"])
 	S["feature_lizard_legs"]			>> features["legs"]
 	S["feature_human_tail"]				>> features["tail_human"]
 	S["feature_human_ears"]				>> features["ears"]
@@ -1037,7 +1041,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["feature_human_ears"]				, features["ears"])
 	WRITE_FILE(S["feature_lizard_frills"]			, features["frills"])
 	WRITE_FILE(S["feature_lizard_spines"]			, features["spines"])
-	WRITE_FILE(S["feature_lizard_body_markings"]	, safe_json_encode(features["body_markings"]))
 	WRITE_FILE(S["feature_lizard_legs"]				, features["legs"])
 	WRITE_FILE(S["feature_deco_wings"]				, features["deco_wings"])
 	WRITE_FILE(S["feature_horns_color"]				, features["horns_color"])

code/modules/mining/lavaland/necropolis_chests.dm

@@ -994,7 +994,6 @@
 			H.dna.features["wings"] = "None"
 			H.dna.features["frills"] = "None"
 			H.dna.features["spines"] = "Long"
-			H.dna.features["body_markings"] = "Dark Tiger Body"
 			H.dna.features["legs"] = "Digitigrade"
 			H.dna.features["taur_body"] = "None"
 			H.left_eye_color = "fee5a3"

code/modules/mob/dead/new_player/sprite_accessories/Citadel_Snowflake.dm

@@ -12,6 +12,7 @@
 	name = "DataShark"
 	icon_state = "datashark"
 	ckeys_allowed = list("rubyflamewing")
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_GREEN, LEG_LEFT = MATRIX_GREEN, LEG_RIGHT = MATRIX_GREEN, ARM_LEFT = MATRIX_GREEN, ARM_RIGHT = MATRIX_GREEN)
 
 //Sabresune
 /datum/sprite_accessory/ears/mam_ears/sabresune
@@ -39,6 +40,7 @@
 	name = "Sabresune"
 	icon_state = "sabresune"
 	ckeys_allowed = list("poojawa")
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN)
 
 //Lunasune
 /datum/sprite_accessory/ears/mam_ears/lunasune

code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm

@@ -1,40 +1,3 @@
-/******************************************
-************* Lizard Markings *************
-*******************************************/
-
-/datum/sprite_accessory/body_markings
-	icon = 'icons/mob/mutant_bodyparts.dmi'
-	relevant_layers = list(BODY_ADJ_LAYER)
-	mutant_part_string = "body_markings"
-	var/list/covered_limbs = list(HEAD, CHEST, LEG_LEFT, LEG_RIGHT, ARM_LEFT, ARM_RIGHT)
-
-/datum/sprite_accessory/body_markings/none
-	name = "None"
-	icon_state = "none"
-	relevant_layers = null
-
-/datum/sprite_accessory/body_markings/dtiger
-	name = "Dark Tiger Body"
-	icon_state = "dtiger"
-	gender_specific = 1
-
-/datum/sprite_accessory/body_markings/guilmon
-	name = "Guilmon"
-	icon_state = "guilmon"
-	color_src = MATRIXED
-	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
-	matrixed_sections = MATRIX_ALL
-
-/datum/sprite_accessory/body_markings/ltiger
-	name = "Light Tiger Body"
-	icon_state = "ltiger"
-	gender_specific = 1
-
-/datum/sprite_accessory/body_markings/lbelly
-	name = "Light Belly"
-	icon_state = "lbelly"
-	gender_specific = 1
-
 /******************************************
 ************ Furry Markings ***************
 *******************************************/
@@ -50,7 +13,7 @@
 	gender_specific = 0
 	icon = 'modular_citadel/icons/mob/mam_markings.dmi'
 	recommended_species = list("mammal", "xeno", "slimeperson", "podweak")
-	matrixed_sections = MATRIX_ALL
+	matrixed_sections = MATRIX_ALL // this value is used if there is no value in covered_limbs, don't rely on it, it's a backup value
 	var/list/covered_limbs = list(HEAD, CHEST, LEG_LEFT, LEG_RIGHT, ARM_LEFT, ARM_RIGHT)
 
 /datum/sprite_accessory/mam_body_markings/none
@@ -64,87 +27,107 @@
 /datum/sprite_accessory/mam_body_markings/redpanda
 	name = "Redpanda"
 	icon_state = "redpanda"
+	covered_limbs = list(HEAD = MATRIX_RED_BLUE, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN)
 
 /datum/sprite_accessory/mam_body_markings/bat
 	name = "Bat"
 	icon_state = "bat"
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_ALL, LEG_LEFT = MATRIX_RED_BLUE, LEG_RIGHT = MATRIX_RED_BLUE, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED)
 
 /datum/sprite_accessory/mam_body_markings/bee
 	name = "Bee"
 	icon_state = "bee"
 	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_GREEN, LEG_LEFT = MATRIX_GREEN, LEG_RIGHT = MATRIX_GREEN, ARM_LEFT = MATRIX_GREEN, ARM_RIGHT = MATRIX_GREEN)
 
 /datum/sprite_accessory/mam_body_markings/belly
 	name = "Belly"
 	icon_state = "belly"
 	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_GREEN, LEG_LEFT = MATRIX_RED, LEG_RIGHT = MATRIX_RED)
 
 /datum/sprite_accessory/mam_body_markings/bellyslim
 	name = "Bellyslim"
 	icon_state = "bellyslim"
 	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED, LEG_RIGHT = MATRIX_RED, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED)
 
 /datum/sprite_accessory/mam_body_markings/cow
 	name = "Bovine"
 	icon_state = "bovine"
+	covered_limbs = list(HEAD = MATRIX_ALL, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_ALL, LEG_RIGHT = MATRIX_ALL, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN)
 
 /datum/sprite_accessory/mam_body_markings/corgi
 	name = "Corgi"
 	icon_state = "corgi"
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN)
 
 /datum/sprite_accessory/mam_body_markings/corvid
 	name = "Corvid"
 	icon_state = "corvid"
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_ALL, LEG_RIGHT = MATRIX_ALL, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED)
 
 /datum/sprite_accessory/mam_body_markings/dalmation
 	name = "Dalmation"
 	icon_state = "dalmation"
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN)
 
 /datum/sprite_accessory/mam_body_markings/deer
 	name = "Deer"
 	icon_state = "deer"
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_GREEN_BLUE, LEG_RIGHT = MATRIX_GREEN_BLUE, ARM_LEFT = MATRIX_GREEN, ARM_RIGHT = MATRIX_GREEN)
 
 /datum/sprite_accessory/mam_body_markings/dog
 	name = "Dog"
 	icon_state = "dog"
+	covered_limbs = list(HEAD = MATRIX_RED_BLUE, CHEST = MATRIX_ALL, LEG_LEFT = MATRIX_GREEN_BLUE, LEG_RIGHT = MATRIX_GREEN_BLUE, ARM_LEFT = MATRIX_ALL, ARM_RIGHT = MATRIX_ALL)
 
 /datum/sprite_accessory/mam_body_markings/eevee
 	name = "Eevee"
 	icon_state = "eevee"
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_GREEN)
 
 /datum/sprite_accessory/mam_body_markings/fennec
 	name = "Fennec"
 	icon_state = "Fennec"
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN)
 
 /datum/sprite_accessory/mam_body_markings/fox
 	name = "Fox"
 	icon_state = "fox"
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED_BLUE, ARM_RIGHT = MATRIX_RED_BLUE)
 
 /datum/sprite_accessory/mam_body_markings/frog
 	name = "Frog"
 	icon_state = "frog"
 	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_GREEN, LEG_LEFT = MATRIX_GREEN, LEG_RIGHT = MATRIX_GREEN, ARM_LEFT = MATRIX_GREEN, ARM_RIGHT = MATRIX_GREEN)
 
 /datum/sprite_accessory/mam_body_markings/goat
 	name = "Goat"
 	icon_state = "goat"
+	covered_limbs = list(HEAD = MATRIX_RED, CHEST = MATRIX_RED, LEG_LEFT = MATRIX_RED_BLUE, LEG_RIGHT = MATRIX_RED_BLUE, ARM_LEFT = MATRIX_RED_BLUE, ARM_RIGHT = MATRIX_RED_BLUE)
 
 /datum/sprite_accessory/mam_body_markings/handsfeet
 	name = "Handsfeet"
 	icon_state = "handsfeet"
 	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+	covered_limbs = list(HEAD = MATRIX_RED, CHEST = MATRIX_RED, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN)
 
 /datum/sprite_accessory/mam_body_markings/hawk
 	name = "Hawk"
 	icon_state = "hawk"
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_ALL, LEG_RIGHT = MATRIX_ALL, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED)
 
 /datum/sprite_accessory/mam_body_markings/husky
 	name = "Husky"
 	icon_state = "husky"
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_ALL, LEG_RIGHT = MATRIX_ALL, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN)
 
 /datum/sprite_accessory/mam_body_markings/hyena
 	name = "Hyena"
 	icon_state = "hyena"
+	covered_limbs = list(HEAD = MATRIX_ALL, CHEST = MATRIX_ALL, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN)
 
 /datum/sprite_accessory/mam_body_markings/insect
 	name = "Insect"
@@ -154,78 +137,118 @@
 /datum/sprite_accessory/mam_body_markings/lab
 	name = "Lab"
 	icon_state = "lab"
+	covered_limbs = list(HEAD = MATRIX_RED, CHEST = MATRIX_RED, LEG_LEFT = MATRIX_RED, LEG_RIGHT = MATRIX_RED, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED)
 
 /datum/sprite_accessory/mam_body_markings/orca
 	name = "Orca"
 	icon_state = "orca"
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN)
 
 /datum/sprite_accessory/mam_body_markings/otie
 	name = "Otie"
 	icon_state = "otie"
+	covered_limbs = list(HEAD = MATRIX_ALL, CHEST = MATRIX_ALL, LEG_LEFT = MATRIX_ALL, LEG_RIGHT = MATRIX_ALL, ARM_LEFT = MATRIX_ALL, ARM_RIGHT = MATRIX_ALL)
 
 /datum/sprite_accessory/mam_body_markings/otter
 	name = "Otter"
 	icon_state = "otter"
+	covered_limbs = list(HEAD = MATRIX_ALL, CHEST = MATRIX_GREEN)
 
 /datum/sprite_accessory/mam_body_markings/panther
 	name = "Panther"
 	icon_state = "panther"
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN)
 
 /datum/sprite_accessory/mam_body_markings/plain
 	name = "Plain"
 	icon_state = "plain"
 	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+	covered_limbs = list(HEAD = MATRIX_RED, CHEST = MATRIX_RED, LEG_LEFT = MATRIX_RED, LEG_RIGHT = MATRIX_RED, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED)
 
 /datum/sprite_accessory/mam_body_markings/possum
 	name = "Possum"
 	icon_state = "possum"
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED_BLUE, LEG_RIGHT = MATRIX_RED_BLUE, ARM_LEFT = MATRIX_RED_BLUE, ARM_RIGHT = MATRIX_RED_BLUE)
 
 /datum/sprite_accessory/mam_body_markings/raccoon
 	name = "Raccoon"
 	icon_state = "raccoon"
+	covered_limbs = list(HEAD = MATRIX_ALL, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_ALL, LEG_RIGHT = MATRIX_ALL, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN)
 
 /datum/sprite_accessory/mam_body_markings/sergal
 	name = "Sergal"
 	icon_state = "sergal"
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN)
 
 /datum/sprite_accessory/mam_body_markings/pede
 	name = "Scolipede"
 	icon_state = "scolipede"
 	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+	covered_limbs = list(HEAD = MATRIX_GREEN, CHEST = MATRIX_GREEN_BLUE, LEG_LEFT = MATRIX_GREEN, LEG_RIGHT = MATRIX_GREEN, ARM_LEFT = MATRIX_GREEN, ARM_RIGHT = MATRIX_GREEN)
 
 /datum/sprite_accessory/mam_body_markings/shark
 	name = "Shark"
 	icon_state = "shark"
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED, LEG_LEFT = MATRIX_RED, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED_GREEN, ARM_RIGHT = MATRIX_RED_GREEN)
 
 /datum/sprite_accessory/mam_body_markings/shepherd
 	name = "Shepherd"
 	icon_state = "shepherd"
+	covered_limbs = list(HEAD = MATRIX_ALL, CHEST = MATRIX_ALL, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED)
 
 /datum/sprite_accessory/mam_body_markings/skunk
 	name = "Skunk"
 	icon_state = "skunk"
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED_GREEN, LEG_RIGHT = MATRIX_RED_GREEN, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED)
 
 /datum/sprite_accessory/mam_body_markings/tajaran
 	name = "Tajaran"
 	icon_state = "tajaran"
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED_GREEN, LEG_LEFT = MATRIX_RED, LEG_RIGHT = MATRIX_RED, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED)
 
 /datum/sprite_accessory/mam_body_markings/tiger
 	name = "Tiger"
 	icon_state = "tiger"
+	covered_limbs = list(HEAD = MATRIX_ALL, CHEST = MATRIX_ALL, LEG_LEFT = MATRIX_ALL, LEG_RIGHT = MATRIX_ALL, ARM_LEFT = MATRIX_RED_BLUE, ARM_RIGHT = MATRIX_RED_BLUE)
 
 /datum/sprite_accessory/mam_body_markings/turian
 	name = "Turian"
 	icon_state = "turian"
 	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+	covered_limbs = list(HEAD = MATRIX_RED_GREEN, CHEST = MATRIX_RED, LEG_LEFT = MATRIX_RED, LEG_RIGHT = MATRIX_RED, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED)
 
 /datum/sprite_accessory/mam_body_markings/wolf
 	name = "Wolf"
 	icon_state = "wolf"
+	covered_limbs = list(HEAD = MATRIX_ALL, CHEST = MATRIX_ALL, LEG_LEFT = MATRIX_RED_BLUE, LEG_RIGHT = MATRIX_RED_BLUE, ARM_LEFT = MATRIX_RED_BLUE, ARM_RIGHT = MATRIX_RED_BLUE)
 
 /datum/sprite_accessory/mam_body_markings/xeno
 	name = "Xeno"
 	icon_state = "xeno"
 	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+	covered_limbs = list(HEAD = MATRIX_BLUE, CHEST = MATRIX_GREEN, LEG_LEFT = MATRIX_GREEN, LEG_RIGHT = MATRIX_GREEN, ARM_LEFT = MATRIX_GREEN, ARM_RIGHT = MATRIX_GREEN)
+
+// sticking old lizard markings here for now
+/datum/sprite_accessory/mam_body_markings/dtiger
+	name = "Dark Tiger Body"
+	icon_state = "dtiger"
+	covered_limbs = list(HEAD = MATRIX_RED, CHEST = MATRIX_RED, LEG_LEFT = MATRIX_RED, LEG_RIGHT = MATRIX_RED, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED)
+
+/datum/sprite_accessory/mam_body_markings/guilmon
+	name = "Guilmon"
+	icon_state = "guilmon"
+	icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+	covered_limbs = list(HEAD = MATRIX_RED_BLUE, CHEST = MATRIX_GREEN_BLUE, LEG_LEFT = MATRIX_BLUE, LEG_RIGHT = MATRIX_BLUE, ARM_LEFT = MATRIX_GREEN_BLUE, ARM_RIGHT = MATRIX_GREEN_BLUE)
+
+/datum/sprite_accessory/mam_body_markings/ltiger
+	name = "Light Tiger Body"
+	icon_state = "ltiger"
+	covered_limbs = list(HEAD = MATRIX_RED, CHEST = MATRIX_RED, LEG_LEFT = MATRIX_RED, LEG_RIGHT = MATRIX_RED, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED)
+
+/datum/sprite_accessory/mam_body_markings/lbelly
+	name = "Light Belly"
+	icon_state = "lbelly"
+	covered_limbs = list(HEAD = MATRIX_RED, CHEST = MATRIX_RED, LEG_LEFT = MATRIX_RED, LEG_RIGHT = MATRIX_RED, ARM_LEFT = MATRIX_RED, ARM_RIGHT = MATRIX_RED)
 
 /******************************************
 ************* Insect Markings *************

code/modules/mob/dead/new_player/sprite_accessories/synthliz.dm

@@ -32,20 +32,20 @@
 	icon = 'modular_citadel/icons/mob/synthliz_body_markings.dmi'
 	name = "Synthetic Lizard - Pecs"
 	icon_state = "synthlizpecs"
-	matrixed_sections = MATRIX_GREEN
+	covered_limbs = list(CHEST = MATRIX_GREEN)
 
 /datum/sprite_accessory/mam_body_markings/synthliz/synthliz_pecslight
 	icon = 'modular_citadel/icons/mob/synthliz_body_markings.dmi'
 	name = "Synthetic Lizard - Pecs Light"
 	icon_state = "synthlizpecslight"
-	matrixed_sections = MATRIX_GREEN_BLUE
+	covered_limbs = list(CHEST = MATRIX_GREEN_BLUE)
 
 /datum/sprite_accessory/mam_body_markings/synthliz
 	recommended_species = list("synthliz")
 	icon = 'modular_citadel/icons/mob/synthliz_body_markings.dmi'
 	name = "Synthetic Lizard - Plates"
 	icon_state = "synthlizscutes"
-	matrixed_sections = MATRIX_GREEN
+	covered_limbs = list(CHEST = MATRIX_GREEN)
 
 //Synth tails
 /datum/sprite_accessory/tails/mam_tails/synthliz

code/modules/mob/living/carbon/human/species_types/lizardpeople.dm

@@ -11,7 +11,7 @@
 	coldmod = 1.5
 	heatmod = 0.67
 	mutant_bodyparts = list("mcolor" = "0F0", "mcolor2" = "0F0", "mcolor3" = "0F0", "tail_lizard" = "Smooth", "mam_snouts" = "Round",
-							 "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = list(),
+							 "horns" = "None", "frills" = "None", "spines" = "None", "mam_body_markings" = list(),
 							  "legs" = "Digitigrade", "taur" = "None", "deco_wings" = "None")
 	attack_verb = "slash"
 	attack_sound = 'sound/weapons/slash.ogg'