From 4e11595ae65c8ec6f524eec9a1223007e413724a Mon Sep 17 00:00:00 2001 From: AlManiak Date: Thu, 19 Sep 2024 22:33:32 +0200 Subject: [PATCH] Apply suggestions from code review Co-authored-by: sheepishgoat <100518708+sheepishgoat@users.noreply.github.com> --- GainStation13/code/modules/clothing/under/jobs/modcivilian.dm | 3 +++ code/modules/mob/living/carbon/human/species.dm | 2 +- modular_citadel/code/modules/arousal/organs/genitals.dm | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm b/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm index 128985a2..0e080a56 100644 --- a/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm +++ b/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm @@ -99,6 +99,7 @@ var/mob/living/carbon/human/H = O.owner var/size = 0 var/used_icon_location = icon_location + switch(H.fullness) if(0 to FULLNESS_LEVEL_BLOATED) // Normal size = G.size @@ -111,6 +112,7 @@ if(FULLNESS_LEVEL_NOMOREPLZ to INFINITY)// Take the stuffed sprite of size + 2 size = G.size + 2 used_icon_location = icon_stuffed_location + if(!adjusted) //check the style, if it needs to be the adjusted variants if(G.size <= 9+2) //check that the size is within accepted values, NOTE: these need to be removed later, better to cap organ sizes to begin with. Cap is 9 (max fat stage) + 2 (stuffed stages) . += mutable_appearance(used_icon_location, "belly_[size]", GENITALS_UNDER_LAYER) //add, from the clothes' icon file the overlay corresponding to that genital at that size and draw it onto the layer @@ -121,6 +123,7 @@ . += mutable_appearance(used_icon_location, "belly_[size]_d", GENITALS_UNDER_LAYER) else . += mutable_appearance(used_icon_location, "belly_11_d", GENITALS_UNDER_LAYER) + if(istype(O, /obj/item/organ/genital/anus)) //if that organ is the butt G = O if(suit_style == DIGITIGRADE_SUIT_STYLE) //check if the suit needs to use sprites for digitigrade characters diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 669d1517..a47b40e9 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1730,7 +1730,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) // Update here for changing belly to match stuffed-ness var/obj/item/organ/genital/belly/B= H.getorganslot("belly") - if(!isnull(B)) + if(!isnull(B) && istype(B)) B.update() switch(H.fatness) diff --git a/modular_citadel/code/modules/arousal/organs/genitals.dm b/modular_citadel/code/modules/arousal/organs/genitals.dm index be7cbcb0..0a14b36b 100644 --- a/modular_citadel/code/modules/arousal/organs/genitals.dm +++ b/modular_citadel/code/modules/arousal/organs/genitals.dm @@ -477,10 +477,7 @@ // Change belly sprite and size based on current fullness switch(H.fullness) if(0 to FULLNESS_LEVEL_BLOATED) - genital_overlay.icon = 'hyperstation/icons/obj/genitals/belly.dmi' genital_overlay.icon_state = "belly_[size]" - genital_overlay.layer = -UNDER_BACK_LAYER - colourcode = "belly_color" if(FULLNESS_LEVEL_BLOATED to FULLNESS_LEVEL_BEEG) genital_overlay.icon = 'hyperstation/icons/obj/genitals/belly_stuffed.dmi' genital_overlay.icon_state = "belly_[size]"