taur peets (#202)

* stage one

* datums and shit

* game stuff

* modules

* tgstation.dme

* tools

* these things for icons

* compiling fixes

* merge spree on TG

* other updates

* updated maps with deepfryers

* My helpers were not helping

* quick taur fixes

coloration and most layers sorted Missing peets have been readded

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

@@ -599,6 +599,40 @@
 						I.color = "#[H.eye_color]"
 				standing += I
 
+			if(S.extra2) //apply the extra overlay, if there is one
+				if(S.gender_specific)
+					icon_string = "[g]_[bodypart]_extra2_[S.icon_state]_[layertext]"
+				else
+					icon_string = "m_[bodypart]_extra2_[S.icon_state]_[layertext]"
+
+				I = image("icon" = S.icon, "icon_state" = icon_string, "layer" =- layer)
+
+				if(S.center)
+					I = center_image(I,S.dimension_x,S.dimension_y)
+
+				switch(S.extra2_color_src) //change the color of the extra overlay
+					if(MUTCOLORS)
+						if(fixed_mut_color)
+							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"]]"
+						else
+							I.color = "#[H.hair_color]"
+				standing += I
+
 		H.overlays_standing[layer] = standing.Copy()
 		standing = list()
 

code/modules/mob/new_player/sprite_accessories_Citadel.dm

@@ -1,7 +1,10 @@
 /datum/sprite_accessory
 	var/extra = 0
 	var/extra_icon = 'icons/mob/mam_bodyparts.dmi'
-	var/extra_color_src = MUTCOLORS2 						//The color source for the extra overlay.
+	var/extra_color_src = MUTCOLORS2						//The color source for the extra overlay.
+	var/extra2 = 0
+	var/extra2_icon = 'icons/mob/mam_bodyparts.dmi'
+	var/extra2_color_src = MUTCOLORS3
 
 /* tbi eventually idk
 /datum/sprite_accessory/legs/digitigrade_mam
@@ -371,7 +374,8 @@
 	icon = 'icons/mob/special/mam_taur.dmi'
 	extra_icon = 'icons/mob/special/mam_taur.dmi'
 	extra = 1
-	extra_color_src = MUTCOLORS2
+	extra2_icon = 'icons/mob/special/mam_taur.dmi'
+	extra2 = 1
 	center = TRUE
 	dimension_x = 64
 
@@ -382,7 +386,6 @@
 /datum/sprite_accessory/taur/panther
 	name = "Panther"
 	icon_state = "panther"
-	hasinner = 1
 
 /datum/sprite_accessory/taur/tajaran
 	name = "Tajaran"
@@ -396,10 +399,9 @@
 	name = "Lab"
 	icon_state = "lab"
 
-/datum/sprite_accessory/taur/shepard
-	name = "Shepard"
-	icon_state = "shepard"
-	hasinner = 1
+/datum/sprite_accessory/taur/shepherd
+	name = "Shepherd"
+	icon_state = "shepherd"
 
 /datum/sprite_accessory/taur/husky
 	name = "Husky"
@@ -419,12 +421,10 @@
 
 /datum/sprite_accessory/taur/naga
 	name = "Naga"
-	hasinner = 1
 	icon_state = "naga"
 
 /datum/sprite_accessory/taur/otie
 	name = "Otie"
-	hasinner = 1
 	icon_state = "otie"
 
 /datum/sprite_accessory/taur/drake