Merge pull request #8220 from Poojawa/master

fixes floaty-leg syndrome for xenos and random color issues

code/__HELPERS/mobs.dm

@@ -123,12 +123,15 @@
 			var/datum/sprite_accessory/S = instance
 			if(!S.ckeys_allowed)
 				snowflake_mam_snouts_list[S.name] = mspath
+	var/color1 = random_short_color()
+	var/color2 = random_short_color()
+	var/color3 = random_short_color()
 
 	//CIT CHANGE - changes this entire return to support cit's snowflake parts
 	return(list(
-		"mcolor" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
-		"mcolor2" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
-		"mcolor3" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
+		"mcolor" = color1,
+		"mcolor2" = color2,
+		"mcolor3" = color3,
 		"tail_lizard" = pick(GLOB.tails_list_lizard),
 		"tail_human" = "None",
 		"wings" = "None",

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

@@ -94,4 +94,9 @@
 	inherent_traits = list(TRAIT_NOGUNS)
 	mutantlungs = /obj/item/organ/lungs/ashwalker
 	burnmod = 0.9
-	brutemod = 0.9
+	brutemod = 0.9
+
+/datum/species/lizard/ashwalker/on_species_gain(mob/living/carbon/human/C, datum/species/old_species)
+	if((C.dna.features["spines"] != "None" ) && (C.dna.features["tail"] == "None")) //tbh, it's kinda ugly for them not to have a tail yet have floating spines
+		C.dna.features["tail"] = "Smooth"
+	return ..()

code/modules/surgery/bodyparts/bodyparts.dm

@@ -495,7 +495,6 @@
 
 
 	if(should_draw_greyscale)
-		marking.color = null
 		var/draw_color = mutation_color || species_color || (skin_tone && skintone2hex(skin_tone))
 		if(draw_color)
 			limb.color = "#[draw_color]"