diff --git a/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm b/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm index fc4b6b42..907dc9af 100644 --- a/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm +++ b/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm @@ -25,21 +25,39 @@ if(istype(O, /obj/item/organ/genital/belly)) G = O if(!adjusted) - . += mutable_appearance('GainStation13/icons/mob/modclothes/chefmodular.dmi', "belly_[G.size]", GENITALS_UNDER_LAYER) + if(G.size <= 9) //These need to be removed later, better to cap organ sizes to begin with + . += mutable_appearance('GainStation13/icons/mob/modclothes/chefmodular.dmi', "belly_[G.size]", GENITALS_UNDER_LAYER) + else + . += mutable_appearance('GainStation13/icons/mob/modclothes/chefmodular.dmi', "belly_9", GENITALS_UNDER_LAYER) else - . += mutable_appearance('GainStation13/icons/mob/modclothes/chefmodular.dmi', "belly_[G.size]_d", GENITALS_UNDER_LAYER) + if(G.size <= 9) + . += mutable_appearance('GainStation13/icons/mob/modclothes/chefmodular.dmi', "belly_[G.size]_d", GENITALS_UNDER_LAYER) + else + . += mutable_appearance('GainStation13/icons/mob/modclothes/chefmodular.dmi', "belly_9_d", GENITALS_UNDER_LAYER) if(istype(O, /obj/item/organ/genital/anus)) G = O 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) + if(G.size <= 10) + . += 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_10_l", GENITALS_FRONT_LAYER) + . += mutable_appearance('GainStation13/icons/mob/modclothes/chefmodular.dmi', "butt_10_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(G.size <= 10) + . += 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) + else + . += mutable_appearance('GainStation13/icons/mob/modclothes/chefmodular.dmi', "butt_10", GENITALS_FRONT_LAYER) + . += mutable_appearance('GainStation13/icons/mob/modclothes/chefmodular.dmi', "butt_10_NORTH", GENITALS_FRONT_LAYER) if(istype(O, /obj/item/organ/genital/breasts)) G = O - . += 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(G.size <= "impossible") + . += 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 + else + . += mutable_appearance('GainStation13/icons/mob/modclothes/chefmodular.dmi', "breasts_impossible", GENITALS_BEHIND_LAYER) //nearest + . += mutable_appearance('GainStation13/icons/mob/modclothes/chefmodular.dmi', "breasts_impossible_NORTH", BODY_FRONT_LAYER) //farthest if(damaged_clothes) . += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform") if(blood_DNA) @@ -74,21 +92,39 @@ if(istype(O, /obj/item/organ/genital/belly)) G = O if(!adjusted) - . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "belly_[G.size]", GENITALS_UNDER_LAYER) + if(G.size <= 9) //These need to be removed later, better to cap organ sizes to begin with + . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "belly_[G.size]", GENITALS_UNDER_LAYER) + else + . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "belly_9", GENITALS_UNDER_LAYER) else - . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "belly_[G.size]_d", GENITALS_UNDER_LAYER) + if(G.size <= 9) + . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "belly_[G.size]_d", GENITALS_UNDER_LAYER) + else + . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "belly_9_d", GENITALS_UNDER_LAYER) if(istype(O, /obj/item/organ/genital/anus)) G = O if(suit_style == DIGITIGRADE_SUIT_STYLE) - . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "butt_[G.size]_l", GENITALS_FRONT_LAYER) - . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "butt_[G.size]_l_NORTH", GENITALS_FRONT_LAYER) + if(G.size <= 10) + . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "butt_[G.size]_l", GENITALS_FRONT_LAYER) + . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "butt_[G.size]_l_NORTH", GENITALS_FRONT_LAYER) + else + . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "butt_10_l", GENITALS_FRONT_LAYER) + . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "butt_10_l_NORTH", GENITALS_FRONT_LAYER) else - . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "butt_[G.size]", GENITALS_FRONT_LAYER) - . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "butt_[G.size]_NORTH", GENITALS_FRONT_LAYER) + if(G.size <= 10) + . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "butt_[G.size]", GENITALS_FRONT_LAYER) + . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "butt_[G.size]_NORTH", GENITALS_FRONT_LAYER) + else + . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "butt_10", GENITALS_FRONT_LAYER) + . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "butt_10_NORTH", GENITALS_FRONT_LAYER) if(istype(O, /obj/item/organ/genital/breasts)) G = O - . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "breasts_[G.size]", GENITALS_BEHIND_LAYER) //nearest - . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "breasts_[G.size]_NORTH", BODY_FRONT_LAYER) //farthest + if(G.size <= "impossible") + . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "breasts_[G.size]", GENITALS_BEHIND_LAYER) //nearest + . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "breasts_[G.size]_NORTH", BODY_FRONT_LAYER) //farthest + else + . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "breasts_impossible", GENITALS_BEHIND_LAYER) //nearest + . += mutable_appearance('GainStation13/icons/mob/modclothes/graymodular.dmi', "breasts_impossible_NORTH", BODY_FRONT_LAYER) //farthest if(damaged_clothes) . += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform") if(blood_DNA)