diff --git a/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm b/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm index d67f691c..d990a564 100644 --- a/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm +++ b/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm @@ -1,29 +1,41 @@ /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) + ..() + U = user + +/obj/item/clothing/under/rank/chef/modular/dropped() + ..() + U = null /obj/item/clothing/under/rank/chef/modular/worn_overlays(isinhands = FALSE) - . = list() if(!isinhands) - var/mob/living/carbon/U = usr + . = 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(!adjusted) + . += mutable_appearance('GainStation13/icons/mob/modclothes/chefmodular.dmi', "belly_[G.size]", GENITALS_UNDER_LAYER) + else + . += mutable_appearance('GainStation13/icons/mob/modclothes/chefmodular.dmi', "belly_[G.size]_d", 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(suit_style == DIGITIGRADE_SUIT_STYLE) + . += mutable_appearance('GainStation13/icons/mob/modclothes/chefmodular.dmi', "butt_[G.size]_l", GENITALS_FRONT_LAYER) + . += mutable_appearance('GainStation13/icons/mob/modclothes/chefmodular.dmi', "butt_[G.size]_l_NORTH", GENITALS_FRONT_LAYER) + else + . += mutable_appearance('GainStation13/icons/mob/modclothes/chefmodular.dmi', "butt_[G.size]", GENITALS_FRONT_LAYER) + . += mutable_appearance('GainStation13/icons/mob/modclothes/chefmodular.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 + . += mutable_appearance('GainStation13/icons/mob/modclothes/chefmodular.dmi', "breasts_[G.size]", GENITALS_BEHIND_LAYER) //nearest + . += mutable_appearance('GainStation13/icons/mob/modclothes/chefmodular.dmi', "breasts_[G.size]_NORTH", BODY_FRONT_LAYER) //farthest if(damaged_clothes) . += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform") if(blood_DNA) diff --git a/GainStation13/icons/mob/modclothes/chefanus.dmi b/GainStation13/icons/mob/modclothes/chefanus.dmi deleted file mode 100644 index 47d5507d..00000000 Binary files a/GainStation13/icons/mob/modclothes/chefanus.dmi and /dev/null differ diff --git a/GainStation13/icons/mob/modclothes/chefbelly.dmi b/GainStation13/icons/mob/modclothes/chefbelly.dmi deleted file mode 100644 index 14f5a11f..00000000 Binary files a/GainStation13/icons/mob/modclothes/chefbelly.dmi and /dev/null differ diff --git a/GainStation13/icons/mob/modclothes/chefbreasts.dmi b/GainStation13/icons/mob/modclothes/chefbreasts.dmi deleted file mode 100644 index d828a02e..00000000 Binary files a/GainStation13/icons/mob/modclothes/chefbreasts.dmi and /dev/null differ diff --git a/GainStation13/icons/mob/modclothes/chefmodular.dmi b/GainStation13/icons/mob/modclothes/chefmodular.dmi new file mode 100644 index 00000000..fe0a1a04 Binary files /dev/null and b/GainStation13/icons/mob/modclothes/chefmodular.dmi differ