diff --git a/GainStation13/code/mechanics/fatness.dm b/GainStation13/code/mechanics/fatness.dm index 0a520dafd6..95cda6e4f3 100644 --- a/GainStation13/code/mechanics/fatness.dm +++ b/GainStation13/code/mechanics/fatness.dm @@ -21,10 +21,8 @@ GLOBAL_LIST_INIT(uncapped_resize_areas, list(/area/command/bridge, /area/mainten var/doorstuck = 0 var/fullness = FULLNESS_LEVEL_HALF_FULL - var/fullness_reduction_timer = 0 var/burpslurring = 0 - - var/fullness_reducion_timer = 0 // When was the last time they emoted to reduce their fullness + var/fullness_reduction_timer = 0 // When was the last time they emoted to reduce their fullness /** * Adjusts the fatness level of the parent mob. diff --git a/GainStation13/code/modules/mob/living/belly.dm b/GainStation13/code/modules/mob/living/belly.dm index 937e7ec047..ee97def474 100644 --- a/GainStation13/code/modules/mob/living/belly.dm +++ b/GainStation13/code/modules/mob/living/belly.dm @@ -9,6 +9,7 @@ size = 0 var/statuscheck = FALSE shape = "belly" + genital_flags = UPDATE_OWNER_APPEARANCE masturbation_verb = "massage" var/sent_full_message = TRUE //defaults to 1 since they're full to start var/inflatable = FALSE //For inflation connoisseurs diff --git a/GainStation13/code/modules/mob/living/fullness.dm b/GainStation13/code/modules/mob/living/fullness.dm index 3a6f4b97ae..c1d0df24b1 100644 --- a/GainStation13/code/modules/mob/living/fullness.dm +++ b/GainStation13/code/modules/mob/living/fullness.dm @@ -2,7 +2,7 @@ if(!ishuman(src)) return - if(fullness >= FULLNESS_LEVEL_BLOATED && fullness_reducion_timer + FULLNESS_REDUCTION_COOLDOWN < world.time) + if(fullness >= FULLNESS_LEVEL_BLOATED && fullness_reduction_timer + FULLNESS_REDUCTION_COOLDOWN < world.time) fullness -= amount // Remove Fullness diff --git a/code/modules/arousal/genitals.dm b/code/modules/arousal/genitals.dm index de892c050f..ed94324ec8 100644 --- a/code/modules/arousal/genitals.dm +++ b/code/modules/arousal/genitals.dm @@ -71,6 +71,8 @@ if(genital_flags & UPDATE_OWNER_APPEARANCE && owner && ishuman(owner)) var/mob/living/carbon/human/H = owner H.update_genitals() + if(owner)//GS13: rebuild overlays on genitals appearance update, for modular clothes + owner.update_inv_w_uniform() if(linked_organ_slot || (linked_organ && !owner)) update_link() @@ -356,7 +358,13 @@ if("belly_color") genital_overlay.color = "#[dna.features["belly_color"]]" - genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size][(dna.species.use_skintones && !dna.skin_tone_override) ? "_s" : ""]_[aroused_state]_[layertext]" + //GS13 Port - Specific check for belly since we need organ values specifically and not sprite_accessories, maybe can rewrite this more generically later? + // In any case I don't want any specific calculations done here + if(G.slot == "belly") + genital_overlay.icon = G.icon + genital_overlay.icon_state = "[G.icon_state]_[aroused_state]_[layertext]" + else + genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size][(dna.species.use_skintones && !dna.skin_tone_override) ? "_s" : ""]_[aroused_state]_[layertext]" if(layers_num[layer] == GENITALS_FRONT_LAYER && G.genital_flags & GENITAL_THROUGH_CLOTHES) genital_overlay.layer = -GENITALS_EXPOSED_LAYER diff --git a/hyperstation/icons/obj/genitals/belly_stuffed.dmi b/hyperstation/icons/obj/genitals/belly_stuffed.dmi index 8105e19ea3..b06ecb3b50 100644 Binary files a/hyperstation/icons/obj/genitals/belly_stuffed.dmi and b/hyperstation/icons/obj/genitals/belly_stuffed.dmi differ