day 4 dump

code/modules/mob/living/carbon/human/species.dm

@@ -56,6 +56,8 @@
 	var/siemens_coeff = 1 //base electrocution coefficient
 	var/exotic_damage_overlay = ""
 	var/fixed_mut_color = "" //to use MUTCOLOR with a fixed color that's independent of dna.feature["mcolor"]
+	var/fixed_mut_color2 = ""
+	var/fixed_mut_color3 = ""
 	var/generic="something"
 	var/adjective="unknown"
 	var/restricted=0 //Set to 1 to not allow anyone to choose it, 2 to hide it from the DNA scanner, and text to restrict it to one person
@@ -394,6 +396,10 @@
 					S = tails_list_human[H.dna.features["tail_human"]]
 				if("waggingtail_human")
 					S.= animated_tails_list_human[H.dna.features["tail_human"]]
+				if("mam_tail")
+					S = mam_tails_list[H.dna.features["mam_tail"]]
+				if("mam_waggingtail")
+					S.= mam_tails_animated_list[H.dna.features["mam_tail"]]
 				if("spines")
 					S = spines_list[H.dna.features["spines"]]
 				if("waggingspines")
@@ -409,7 +415,7 @@
 				if("body_markings")
 					S = body_markings_list[H.dna.features["body_markings"]]
 				if("mam_body_markings")
-					S = mam_body_markings_list[H.dna.features["mam_body_markings"]]
+					S. = mam_body_markings_list[H.dna.features["mam_body_markings"]]
 				if("wings")
 					S = wings_list[H.dna.features["wings"]]
 				if("wingsopen")
@@ -445,6 +451,16 @@
 								I.color = "#[fixed_mut_color]"
 							else
 								I.color = "#[H.dna.features["mcolor"]]"
+						if(MUTCOLORS2)
+							if(fixed_mut_color2)
+								I.color = "#[fixed_mut_color2]"
+							else
+								I.color = "#[H.dna.features["mcolor2"]]"
+						if(MUTCOLORS3)
+							if(fixed_mut_color3)
+								I.color = "#[fixed_mut_color3]"
+							else
+								I.color = "#[H.dna.features["mcolor3"]]"
 						if(HAIR)
 							if(hair_color == "mutcolor")
 								I.color = "#[H.dna.features["mcolor"]]"

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

@@ -6,7 +6,7 @@
 	name = "Human"
 	id = "human"
 	default_color = "FFFFFF"
-	specflags = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,LIPS)
+	specflags = list(EYECOLOR,HAIR,FACEHAIR,LIPS)
 	mutant_bodyparts = list("tail_human", "ears")
 	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "tail_human" = "None", "ears" = "None", "wings" = "None")
 	use_skintones = 1
@@ -1063,8 +1063,8 @@ datum/species/canid
 	default_color = "4B4B4B"
 	roundstart = 1
 	specflags = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
-	mutant_bodyparts = list("tail_human", "ears", "snout", "mam_body_markings") //Most mammal species will use the 'tail_human' and 'ears'. For exotic species and birds, consider making and using a different type to avoid monstrocities.
-	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "tail_human" = "Wolf", "ears" = "Wolf", "wings" = "None", "mam_body_markings" = "None")
+	mutant_bodyparts = list("mam_tail", "mam_ears", "snout", "mam_body_markings")
+	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "Wolf", "mam_ears" = "Wolf", "wings" = "None", "mam_body_markings" = "Belly")
 	attack_verb = "claw"
 	attack_sound = 'sound/weapons/slash.ogg'
 	miss_sound = 'sound/weapons/slashmiss.ogg'
@@ -1072,7 +1072,7 @@ datum/species/canid
 /datum/species/canid/spec_death(gibbed, mob/living/carbon/human/H)
 	if(H)
 		H.endTailWag()
-
+/*
 /datum/species/canid/wolf
 	name = "Wolf"
 	id = "wolf"
@@ -1097,7 +1097,7 @@ datum/species/canid
 	miss_sound = 'sound/weapons/slashmiss.ogg'
 
 //FELINE//
-/*
+
 /datum/species/tajaran
 	name = "Tajaran"
 	id = "tajaran"

code/modules/mob/new_player/sprite_accessories.dm

@@ -1125,6 +1125,7 @@
 
 /datum/sprite_accessory/body_markings
 	icon = 'icons/mob/mutant_bodyparts.dmi'
+	color_src = MUTCOLORS2
 
 /datum/sprite_accessory/body_markings/none
 	name = "None"
@@ -1407,39 +1408,52 @@
 	icon_state = "aqua"
 
 //WOLF//
-/datum/sprite_accessory/ears/wolf
+/datum/sprite_accessory/mam_ears/wolf
 	name = "Wolf"
 	icon_state = "wolf"
 	hasinner = 1
-	color_src = HAIR
-/datum/sprite_accessory/tails/human/wolf
+
+/datum/sprite_accessory/mam_tails/wolf
 	name = "Wolf"
 	icon_state = "wolf"
-//The static and wagging sprites can be toggled on and off with 'say "*wag"'
-/datum/sprite_accessory/tails_animated/human/wolf
+
+/datum/sprite_accessory/mam_tails_animated/wolf
 	name = "Wolf"
 	icon_state = "wolf"
+
+/datum/sprite_accessory/snouts/wolf
+	name = "Wolf"
+	icon_state = "wolf"
+
 //FOX//
 /datum/sprite_accessory/ears/fox
 	name = "Fox"
 	icon_state = "fox"
 	hasinner = 0
+
 /datum/sprite_accessory/tails/human/fox
 	name = "Fox"
 	icon_state = "fox"
+
 /datum/sprite_accessory/tails_animated/human/fox
 	name = "Fox"
 	icon_state = "fox"
 
+/datum/sprite_accessory/snouts/fox
+	name = "Fox"
+	icon_state = "fox"
+
 //Mammal Body Markings
+/datum/sprite_accessory/mam_body_markings
+		name = "None"
+	icon_state = "none"
+	color_src = MUTCOLORS2
 /datum/sprite_accessory/mam_body_markings/none
 	name = "None"
-	icon_state = ""
-/datum/sprite_accessory/mam_body_markings/lbelly
-	name = "Light Belly"
-	icon_state = "mam_lbelly"
+	icon_state = "none"
+
+/datum/sprite_accessory/mam_body_markings/belly
+	name = "Belly"
+	icon_state = "mam_belly"
 	gender_specific = 1
-/datum/sprite_accessory/mam_body_markings/dbelly
-	name = "Dark Belly"
-	icon_state = "mam_dbelly"
-	gender_specific = 1
+	color_src = MUTCOLORS2