From c43b466f100f67ca18f8bcc8299b00e09091ce77 Mon Sep 17 00:00:00 2001 From: quotefox Date: Tue, 3 May 2022 08:54:26 +0100 Subject: [PATCH] Revert "Revert "Merge pull request #1605 from Arctaisia/bellies"" This reverts commit 044e80fcb30864b1f817d70e1bd2479d41f0b646. --- code/modules/client/preferences.dm | 4 ++-- hyperstation/icons/obj/genitals/belly.dmi | Bin 3724 -> 7205 bytes .../code/modules/arousal/organs/genitals.dm | 11 +++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 822d72abe..922c1be3f 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -2430,9 +2430,9 @@ GLOBAL_LIST_EMPTY(preferences_datums) to_chat(user,"Invalid color. Your color is not bright enough.") if("belly_size") - var/new_bellysize = input(user, "Belly size :\n(1-3)", "Character Preference") as num|null + var/new_bellysize = input(user, "Belly size :\n(1-8)", "Character Preference") as num|null if(new_bellysize) - features["belly_size"] = clamp(new_bellysize, 1, 3) + features["belly_size"] = clamp(new_bellysize, 1, 8) if("butt_size") var/new_buttsize = input(user, "Butt size :\n(0-5)", "Character Preference") as num|null diff --git a/hyperstation/icons/obj/genitals/belly.dmi b/hyperstation/icons/obj/genitals/belly.dmi index feac6b40c86df183c3d66fa7daecb6d34ef6433c..8c3bae32f957a4484896d3c936d1b4d1c497b4d8 100644 GIT binary patch literal 7205 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 0) //we have a different size system + genital_overlay.icon = 'hyperstation/icons/obj/genitals/belly.dmi' - genital_overlay.icon_state = "belly_[size]" + genital_overlay.icon_state = "belly_[round(size)]_OTHER" colourcode = "belly_color" + //creates directional layering by rendering twice. + genital_overlay_directional.icon = 'hyperstation/icons/obj/genitals/belly.dmi' //Added directionals for larger bellies! + genital_overlay_directional.icon_state = "belly_[round(size)]_NORTH" + genital_overlay_directional.layer = -GENITALS_BEHIND_LAYER + //sizecheck added to prevent rendering blank icons if(G.slot == "anus" && G.size > 0) //we have a different size system