From 0a20abb6eca96ec26e24b2aee4b2f824ce211edc Mon Sep 17 00:00:00 2001 From: Yoshax Date: Tue, 3 May 2016 22:19:25 +0100 Subject: [PATCH] Updates a missed check and updates parentheses on uniforms/suits hiding shoes (#1540) --- code/modules/mob/living/carbon/human/inventory.dm | 2 +- code/modules/mob/living/carbon/human/update_icons.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 77aff853ae..077574596d 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -267,7 +267,7 @@ This saves us from having to call add_fingerprint() any time something is put in update_inv_shoes(redraw_mob) if(slot_wear_suit) src.wear_suit = W - if(wear_suit.flags_inv & HIDESHOES) + if((wear_suit.flags_inv & HIDESHOES) || (w_uniform.flags_inv & HIDESHOES)) update_inv_shoes(0) W.equipped(src, slot) update_inv_wear_suit(redraw_mob) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index de6940cb32..e080091927 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -605,7 +605,7 @@ var/global/list/damage_icon_parts = list() if(update_icons) update_icons() /mob/living/carbon/human/update_inv_shoes(var/update_icons=1) - if(shoes && !(wear_suit && wear_suit.flags_inv & HIDESHOES) && !(w_uniform && w_uniform.flags_inv & HIDESHOES)) + if(shoes && !((wear_suit && wear_suit.flags_inv & HIDESHOES) || (w_uniform && w_uniform.flags_inv & HIDESHOES))) var/image/standing if(shoes.icon_override)