diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 73cdf949f0..6b97157507 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/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() diff --git a/code/modules/mob/new_player/sprite_accessories_Citadel.dm b/code/modules/mob/new_player/sprite_accessories_Citadel.dm index 4511ad1aee..fb210719ed 100644 --- a/code/modules/mob/new_player/sprite_accessories_Citadel.dm +++ b/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 diff --git a/icons/mob/mam_bodyparts.dmi b/icons/mob/mam_bodyparts.dmi index 874d4aacb0..9bef6bb272 100644 Binary files a/icons/mob/mam_bodyparts.dmi and b/icons/mob/mam_bodyparts.dmi differ diff --git a/icons/mob/special/mam_taur.dmi b/icons/mob/special/mam_taur.dmi index 95a7f85461..496fa55ff7 100644 Binary files a/icons/mob/special/mam_taur.dmi and b/icons/mob/special/mam_taur.dmi differ diff --git a/icons/mob/special/taur.dmi b/icons/mob/special/taur.dmi index e70ded7ce1..ef21ca0c42 100644 Binary files a/icons/mob/special/taur.dmi and b/icons/mob/special/taur.dmi differ