From 1ab226fb27d8a2cad94941fffdc4f22dbc5b535d Mon Sep 17 00:00:00 2001 From: AlManiak Date: Thu, 19 Sep 2024 22:42:08 +0200 Subject: [PATCH] Added define for nb stuffed sprite size --- .../modules/clothing/under/jobs/modcivilian.dm | 4 ++-- .../code/modules/arousal/organs/genitals.dm | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm b/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm index 0e080a56..ca1e4c65 100644 --- a/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm +++ b/GainStation13/code/modules/clothing/under/jobs/modcivilian.dm @@ -114,12 +114,12 @@ 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) + if(G.size <= 9+FULLNESS_STUFFED_EXTRA_SPRITE_SIZES) //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 else //if not an expected size value, bigger than the max, default to max size . += mutable_appearance(used_icon_location, "belly_11", GENITALS_UNDER_LAYER) else //use the alternative adjusted sprites - if(G.size <= 9+2) + if(G.size <= 9+FULLNESS_STUFFED_EXTRA_SPRITE_SIZES) . += mutable_appearance(used_icon_location, "belly_[size]_d", GENITALS_UNDER_LAYER) else . += mutable_appearance(used_icon_location, "belly_11_d", GENITALS_UNDER_LAYER) diff --git a/modular_citadel/code/modules/arousal/organs/genitals.dm b/modular_citadel/code/modules/arousal/organs/genitals.dm index 0a14b36b..c01f609b 100644 --- a/modular_citadel/code/modules/arousal/organs/genitals.dm +++ b/modular_citadel/code/modules/arousal/organs/genitals.dm @@ -474,25 +474,24 @@ colourcode = S.color_src if(G.slot == "belly") // GS13 + + // Default settings + genital_overlay.icon_state = "belly_[size]" + genital_overlay.layer = -UNDER_BACK_LAYER + colourcode = "belly_color" + // Change belly sprite and size based on current fullness switch(H.fullness) if(0 to FULLNESS_LEVEL_BLOATED) - genital_overlay.icon_state = "belly_[size]" + genital_overlay.icon = 'hyperstation/icons/obj/genitals/belly.dmi' if(FULLNESS_LEVEL_BLOATED to FULLNESS_LEVEL_BEEG) genital_overlay.icon = 'hyperstation/icons/obj/genitals/belly_stuffed.dmi' - genital_overlay.icon_state = "belly_[size]" - genital_overlay.layer = -UNDER_BACK_LAYER - colourcode = "belly_color" if(FULLNESS_LEVEL_BEEG to FULLNESS_LEVEL_NOMOREPLZ) genital_overlay.icon = 'hyperstation/icons/obj/genitals/belly_stuffed.dmi' genital_overlay.icon_state = "belly_[size+1]" - genital_overlay.layer = -UNDER_BACK_LAYER - colourcode = "belly_color" if(FULLNESS_LEVEL_NOMOREPLZ to INFINITY) genital_overlay.icon = 'hyperstation/icons/obj/genitals/belly_stuffed.dmi' genital_overlay.icon_state = "belly_[size+2]" - genital_overlay.layer = -UNDER_BACK_LAYER - colourcode = "belly_color" //sizecheck added to prevent rendering blank icons if(G.slot == "anus" && G.size > 0) // GS13