From 18942b061221690a295a2bcd7c566895e7921eeb Mon Sep 17 00:00:00 2001 From: Alphas00 <154434082+Alphas00@users.noreply.github.com> Date: Sat, 30 Dec 2023 15:52:07 +0100 Subject: [PATCH] Modular clothes bug fix Fixed bug where putting the clothes from worn to hand would still display the clothes overlays Removed unnecessary repated info from the parent /chef --- .../clothing/under/jobs/modcivilian.dm | 52 ++++++++----------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm b/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm index 16dc8ba9..d72dec7d 100644 --- a/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm +++ b/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm @@ -1,41 +1,35 @@ /obj/item/clothing/under/rank/chef/modular name = "cook's modular suit" desc = "A suit which is given only to the most hardcore cooks in space. Now adjusts to the match the wearer's size!" - icon = 'icons/obj/clothing/uniforms.dmi' - icon_state = "chef" - item_color = "chef" - alt_covers_chest = TRUE var/mob/living/carbon/U /obj/item/clothing/under/rank/chef/modular/equipped(mob/user, slot) - if(slot == SLOT_W_UNIFORM) - U = user - else - U = null + U = user /obj/item/clothing/under/rank/chef/modular/dropped() U = null /obj/item/clothing/under/rank/chef/modular/worn_overlays(isinhands = FALSE) - . = list() - var/obj/item/organ/O - var/obj/item/organ/genital/G - for(O in U.internal_organs) - if(istype(O, /obj/item/organ/genital/belly)) - G = O - . += mutable_appearance('GainStation13/icons/mob/modclothes/chefbelly.dmi', "belly_[G.size]", GENITALS_UNDER_LAYER) - if(istype(O, /obj/item/organ/genital/anus)) - G = O - . += mutable_appearance('GainStation13/icons/mob/modclothes/chefanus.dmi', "butt_[G.size]", GENITALS_FRONT_LAYER) - . += mutable_appearance('GainStation13/icons/mob/modclothes/chefanus.dmi', "butt_[G.size]_NORTH", GENITALS_FRONT_LAYER) - if(istype(O, /obj/item/organ/genital/breasts)) - G = O - . += mutable_appearance('GainStation13/icons/mob/modclothes/chefbreasts.dmi', "breasts_[G.size]", GENITALS_BEHIND_LAYER) //nearest - . += mutable_appearance('GainStation13/icons/mob/modclothes/chefbreasts.dmi', "breasts_[G.size]_NORTH", BODY_FRONT_LAYER) //farthest - if(damaged_clothes) - . += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform") - if(blood_DNA) - . += mutable_appearance('icons/effects/blood.dmi', "uniformblood", color = blood_DNA_to_color()) - if(accessory_overlay) - . += accessory_overlay + if(!isinhands) + . = list() + var/obj/item/organ/O + var/obj/item/organ/genital/G + for(O in U.internal_organs) + if(istype(O, /obj/item/organ/genital/belly)) + G = O + . += mutable_appearance('GainStation13/icons/mob/modclothes/chefbelly.dmi', "belly_[G.size]", GENITALS_UNDER_LAYER) + if(istype(O, /obj/item/organ/genital/anus)) + G = O + . += mutable_appearance('GainStation13/icons/mob/modclothes/chefanus.dmi', "butt_[G.size]", GENITALS_FRONT_LAYER) + . += mutable_appearance('GainStation13/icons/mob/modclothes/chefanus.dmi', "butt_[G.size]_NORTH", GENITALS_FRONT_LAYER) + if(istype(O, /obj/item/organ/genital/breasts)) + G = O + . += mutable_appearance('GainStation13/icons/mob/modclothes/chefbreasts.dmi', "breasts_[G.size]", GENITALS_BEHIND_LAYER) //nearest + . += mutable_appearance('GainStation13/icons/mob/modclothes/chefbreasts.dmi', "breasts_[G.size]_NORTH", BODY_FRONT_LAYER) //farthest + if(damaged_clothes) + . += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform") + if(blood_DNA) + . += mutable_appearance('icons/effects/blood.dmi', "uniformblood", color = blood_DNA_to_color()) + if(accessory_overlay) + . += accessory_overlay