diff --git a/GainStation13/code/modules/mob/living/belly.dm b/GainStation13/code/modules/mob/living/belly.dm index 81f65276c1..c6d539bf1d 100644 --- a/GainStation13/code/modules/mob/living/belly.dm +++ b/GainStation13/code/modules/mob/living/belly.dm @@ -18,7 +18,7 @@ layer_index = BELLY_LAYER_INDEX /obj/item/organ/genital/belly/modify_size(modifier, min = BELLY_SIZE_DEF, max = BELLY_SIZE_MAX) - var/new_value = clamp(size_cached + modifier, min, max) + var/new_value = clamp(size_cached + modifier, starting_size, max) if(new_value == size_cached) return prev_size = size_cached @@ -64,6 +64,7 @@ else color = "#[D.features["belly_color"]]" size = D.features["belly_size"] + starting_size = D.features["belly_size"] shape = D.features["belly_shape"] inflatable = D.features["inflatable_belly"] toggle_visibility(D.features["belly_visibility"], FALSE) diff --git a/code/modules/arousal/genitals.dm b/code/modules/arousal/genitals.dm index ed94324ec8..3e0c85ddb0 100644 --- a/code/modules/arousal/genitals.dm +++ b/code/modules/arousal/genitals.dm @@ -32,6 +32,7 @@ var/obj/item/equipment //for fun stuff that goes on the gentials/maybe rings down the line var/dontlist = FALSE var/nochange = FALSE //stops people changing visablity. + var/starting_size //GS13 EDIT /obj/item/organ/genital/Initialize(mapload, do_update = TRUE) diff --git a/code/modules/arousal/organs/breasts.dm b/code/modules/arousal/organs/breasts.dm index 69020da4f3..fb21d944bd 100644 --- a/code/modules/arousal/organs/breasts.dm +++ b/code/modules/arousal/organs/breasts.dm @@ -75,7 +75,7 @@ //this is far too lewd wah /obj/item/organ/genital/breasts/modify_size(modifier, min = -INFINITY, max = INFINITY) - var/new_value = clamp(cached_size + modifier, min, max) + var/new_value = clamp(cached_size + modifier, starting_size, max) //GS13 EDIT if(new_value == cached_size) return prev_size = cached_size @@ -115,6 +115,7 @@ else color = "#[D.features["breasts_color"]]" size = D.features["breasts_size"] + starting_size = D.features["breasts_size"] shape = D.features["breasts_shape"] if(!D.features["breasts_producing"]) genital_flags &= ~ (GENITAL_FUID_PRODUCTION|CAN_CLIMAX_WITH|CAN_MASTURBATE_WITH) diff --git a/code/modules/arousal/organs/butt.dm b/code/modules/arousal/organs/butt.dm index 6cb32488a5..fd20703168 100644 --- a/code/modules/arousal/organs/butt.dm +++ b/code/modules/arousal/organs/butt.dm @@ -16,7 +16,7 @@ layer_index = BUTT_LAYER_INDEX /obj/item/organ/genital/butt/modify_size(modifier, min = -INFINITY, max = BUTT_SIZE_MAX) - var/new_value = clamp(size_cached + modifier, min, max) + var/new_value = clamp(size_cached + modifier, starting_size, max) //GS13 EDIT if(new_value == size_cached) return prev_size = size_cached @@ -47,6 +47,8 @@ //Reflect the size of dat ass on examine. switch(round(size)) + if(0) + size_name = "nonexistent" // GS13 EDIT if(1) size_name = "average" if(2) @@ -58,7 +60,7 @@ if(5) size_name = pick("massive","extreme","enormous","very generous","humongous","big bubbly","dummy thicc") else - size_name = "nonexistent" + size_name = "oversized" //GS13 edit desc = "You see a [lowershape] of [size_name] asscheeks." @@ -82,5 +84,6 @@ else color = "#[D.features["butt_color"]]" size = D.features["butt_size"] + starting_size = D.features["butt_size"] // GS13 EDIT prev_size = size toggle_visibility(D.features["butt_visibility"], FALSE)