From e091faaef990c72f935432039b8bf29946f950ba Mon Sep 17 00:00:00 2001 From: warior4356 Date: Sun, 25 Jul 2021 02:14:13 -0700 Subject: [PATCH] Fixed IPCs and Golems unequipping jumpsuit slot items on update (#16338) * Fixes IPCs and Golems unequipping * Formatting fixes Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- .../mob/living/carbon/human/update_icons.dm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index e3ef4648fa4..af90d80e995 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -572,9 +572,22 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) standing.alpha = w_uniform.alpha standing.color = w_uniform.color overlays_standing[UNIFORM_LAYER] = standing - else + else if(!dna.species.nojumpsuit) + var/list/uniform_slots = list() + var/obj/item/organ/external/L = get_organ(BODY_ZONE_L_LEG) + if(!(L?.status & ORGAN_ROBOT)) + uniform_slots += l_store + var/obj/item/organ/external/R = get_organ(BODY_ZONE_R_LEG) + if(!(R?.status & ORGAN_ROBOT)) + uniform_slots += r_store + var/obj/item/organ/external/C = get_organ(BODY_ZONE_CHEST) + if(!(C?.status & ORGAN_ROBOT)) + uniform_slots += wear_id + uniform_slots += wear_pda + uniform_slots += belt + // Automatically drop anything in store / id / belt if you're not wearing a uniform. //CHECK IF NECESARRY - for(var/obj/item/thing in list(r_store, l_store, wear_id, wear_pda, belt)) // whoever made this + for(var/obj/item/thing in uniform_slots) // whoever made this if(thing) // you're a piece of fucking garbage unEquip(thing) // why the fuck would you goddamn do this motherfucking shit if(client) // INVENTORY CODE IN FUCKING ICON CODE