From 42b67d92402138e7ab0ee645c2346f90582830ec Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Thu, 16 Apr 2020 16:33:04 +0200 Subject: [PATCH] PR is ready. --- .../mob/living/carbon/human/update_icons.dm | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 2857d6da9b..d3bde10e89 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -125,9 +125,8 @@ There are several things that need to be remembered: var/alt_worn = U.mob_overlay_icon || 'icons/mob/clothing/uniform.dmi' var/variant_flag = NONE - if((DIGITIGRADE in dna.species.species_traits) && U.mutantrace_variation & STYLE_DIGITIGRADE) - if(!(U.mutantrace_variation & STYLE_NO_ANTHRO_ICON)) - alt_worn = U.anthro_mob_worn_overlay || 'icons/mob/clothing/uniform_digi.dmi' + if((DIGITIGRADE in dna.species.species_traits) && U.mutantrace_variation & STYLE_DIGITIGRADE && !(U.mutantrace_variation & STYLE_NO_ANTHRO_ICON)) + alt_worn = U.anthro_mob_worn_overlay || 'icons/mob/clothing/uniform_digi.dmi' variant_flag |= STYLE_DIGITIGRADE var/mutable_appearance/uniform_overlay @@ -280,9 +279,8 @@ There are several things that need to be remembered: var/alt_icon = S.mob_overlay_icon || 'icons/mob/clothing/feet.dmi' var/variation_flag = NONE - if((DIGITIGRADE in dna.species.species_traits) && S.mutantrace_variation & STYLE_DIGITIGRADE) - if(!(S.mutantrace_variation & STYLE_NO_ANTHRO_ICON)) - alt_icon = S.anthro_mob_worn_overlay || 'icons/mob/clothing/feet_digi.dmi' + if((DIGITIGRADE in dna.species.species_traits) && S.mutantrace_variation & STYLE_DIGITIGRADE && !(S.mutantrace_variation & STYLE_NO_ANTHRO_ICON)) + alt_icon = S.anthro_mob_worn_overlay || 'icons/mob/clothing/feet_digi.dmi' variation_flag |= STYLE_DIGITIGRADE overlays_standing[SHOES_LAYER] = shoes.build_worn_icon(SHOES_LAYER, alt_icon, FALSE, NO_FEMALE_UNIFORM, variation_flag, FALSE) @@ -342,9 +340,8 @@ There are several things that need to be remembered: muzzled = TRUE else if(dna.species.mutant_bodyparts["snout"] && dna.features["snout"] != "None") muzzled = TRUE - if(muzzled && H.mutantrace_variation & STYLE_MUZZLE) - if(!(H.mutantrace_variation & STYLE_NO_ANTHRO_ICON)) - alt_icon = H.anthro_mob_worn_overlay || 'icons/mob/clothing/head_muzzled.dmi' + if(muzzled && H.mutantrace_variation & STYLE_MUZZLE &6 !(H.mutantrace_variation & STYLE_NO_ANTHRO_ICON)) + alt_icon = H.anthro_mob_worn_overlay || 'icons/mob/clothing/head_muzzled.dmi' variation_flag |= STYLE_MUZZLE overlays_standing[HEAD_LAYER] = H.build_worn_icon(HEAD_LAYER, alt_icon, FALSE, NO_FEMALE_UNIFORM, H.icon_state, variation_flag, FALSE) @@ -425,9 +422,8 @@ There are several things that need to be remembered: dimension_x = T.dimension_x dimension_y = T.dimension_y - else if((DIGITIGRADE in dna.species.species_traits) && S.mutantrace_variation & STYLE_DIGITIGRADE) //not a taur, but digitigrade legs. - if(!(S.mutantrace_variation & STYLE_NO_ANTHRO_ICON)) - worn_icon = S.anthro_mob_worn_overlay || 'icons/mob/clothing/suit_digi.dmi' + else if((DIGITIGRADE in dna.species.species_traits) && S.mutantrace_variation & STYLE_DIGITIGRADE && !(S.mutantrace_variation & STYLE_NO_ANTHRO_ICON)) //not a taur, but digitigrade legs. + worn_icon = S.anthro_mob_worn_overlay || 'icons/mob/clothing/suit_digi.dmi' variation_flag |= STYLE_DIGITIGRADE overlays_standing[SUIT_LAYER] = S.build_worn_icon(SUIT_LAYER, worn_icon, FALSE, NO_FEMALE_UNIFORM, worn_state, variation_flag, FALSE) @@ -494,9 +490,8 @@ There are several things that need to be remembered: muzzled = TRUE else if(dna.species.mutant_bodyparts["snout"] && dna.features["snout"] != "None") muzzled = TRUE - if(muzzled && M.mutantrace_variation & STYLE_MUZZLE) - if(!(M.mutantrace_variation & STYLE_NO_ANTHRO_ICON)) - alt_icon = M.anthro_mob_worn_overlay || 'icons/mob/clothing/mask_muzzled.dmi' + if(muzzled && M.mutantrace_variation & STYLE_MUZZLE && !(M.mutantrace_variation & STYLE_NO_ANTHRO_ICON)) + alt_icon = M.anthro_mob_worn_overlay || 'icons/mob/clothing/mask_muzzled.dmi' variation_flag |= STYLE_MUZZLE var/mutable_appearance/mask_overlay = M.build_worn_icon(FACEMASK_LAYER, alt_icon, FALSE, NO_FEMALE_UNIFORM, wear_mask.icon_state, variation_flag, FALSE)