From e35cd61cc1ea4e56f704e49c989c199f09e22df1 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Wed, 7 Nov 2018 14:06:11 -0600 Subject: [PATCH] Probably fixes rogue icon overrides (#7700) Taurs should use normal legs to avoid bugs. --- .../mob/living/carbon/human/update_icons.dm | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 0a42b6eb7f..6422e23bcf 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -374,20 +374,22 @@ There are several things that need to be remembered: if(hud_used.inventory_shown) client.screen += wear_suit update_observer_view(wear_suit,1) - - if(S.mutantrace_variation) - if(S.adjusted == ALT_STYLE) - S.alternate_worn_icon = 'modular_citadel/icons/mob/suit_digi.dmi' - else + + if(S.mutantrace_variation) //All suits unless otherwise noted are snowflake'd, so let's ensure they're getting the override. + if(S.tauric) //Are we a suit with tauric mode possible? + if(S.taurmode == SNEK_TAURIC) + S.alternate_worn_icon = 'modular_citadel/icons/mob/taur_naga.dmi' + if(S.taurmode == PAW_TAURIC) + S.alternate_worn_icon = 'modular_citadel/icons/mob/taur_canine.dmi' + if(S.taurmode == NOT_TAURIC) + S.alternate_worn_icon = null + else //let's clear the icon override just in case. + S.alternate_worn_icon = null + + if(S.adjusted == ALT_STYLE) //Do we have Digitigrade legs? + S.alternate_worn_icon = 'modular_citadel/icons/mob/suit_digi.dmi' + else //We don't have anything special, but let's clear the icon again just in case. S.alternate_worn_icon = null - - if(S.tauric == TRUE) - if(S.taurmode == SNEK_TAURIC) - S.alternate_worn_icon = 'modular_citadel/icons/mob/taur_naga.dmi' - if(S.taurmode == PAW_TAURIC) - S.alternate_worn_icon = 'modular_citadel/icons/mob/taur_canine.dmi' - // if(S.taurmode == HOOF_TAURIC) //commenting out for eventual pede/spider/exotics - // S.alternate_worn_icon = 'modular_citadel/icons/mob/taur_hooved.dmi' overlays_standing[SUIT_LAYER] = S.build_worn_icon(state = wear_suit.icon_state, default_layer = SUIT_LAYER, default_icon_file = ((wear_suit.alternate_worn_icon) ? S.alternate_worn_icon : 'icons/mob/suit.dmi')) var/mutable_appearance/suit_overlay = overlays_standing[SUIT_LAYER]