From 82c3e3cd9d96d62fca41e32dc390b4b841949208 Mon Sep 17 00:00:00 2001 From: Fermi <> Date: Sun, 24 Nov 2019 02:44:52 +0000 Subject: [PATCH] Revert "Trust your insincts" This reverts commit 7a605b4ba6545ad3f61161feb3936aa125c98781. --- modular_citadel/code/modules/arousal/genitals.dm | 5 +---- modular_citadel/code/modules/arousal/organs/breasts.dm | 7 +++++++ modular_citadel/code/modules/arousal/organs/penis.dm | 1 - modular_citadel/code/modules/client/preferences.dm | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modular_citadel/code/modules/arousal/genitals.dm b/modular_citadel/code/modules/arousal/genitals.dm index 3c0b281cb5..9ecf67e4b0 100644 --- a/modular_citadel/code/modules/arousal/genitals.dm +++ b/modular_citadel/code/modules/arousal/genitals.dm @@ -106,10 +106,6 @@ return /obj/item/organ/genital/proc/modify_size(modifier, min = -INFINITY, max = INFINITY) - fluid_max_volume += modifer*5 - fluid_rate += modifer - if(reagents) - reagents.maximum_volume = fluid_max_volume return /obj/item/organ/genital/proc/update_size() @@ -340,3 +336,4 @@ for(var/L in relevant_layers) H.apply_overlay(L) + diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm index a82d02703d..d7b87dc57a 100644 --- a/modular_citadel/code/modules/arousal/organs/breasts.dm +++ b/modular_citadel/code/modules/arousal/organs/breasts.dm @@ -22,6 +22,13 @@ prev_size = cached_size return ..() +/obj/item/organ/genital/breasts/proc/consider_size() + if(!cached_size || cached_size < 1) + return + fluid_max_volume = cached_size*5 + fluid_rate = cached_size*0.1 + reagents.maximum_volume = fluid_max_volume + /obj/item/organ/genital/breasts/update_appearance() . = ..() var/lowershape = lowertext(shape) diff --git a/modular_citadel/code/modules/arousal/organs/penis.dm b/modular_citadel/code/modules/arousal/organs/penis.dm index 408d6521d0..17cd35c144 100644 --- a/modular_citadel/code/modules/arousal/organs/penis.dm +++ b/modular_citadel/code/modules/arousal/organs/penis.dm @@ -23,7 +23,6 @@ prev_length = length length = CLAMP(length + modifier, min, max) update() - ..() /obj/item/organ/genital/penis/update_size(modified = FALSE) if(length < 0)//I don't actually know what round() does to negative numbers, so to be safe!! diff --git a/modular_citadel/code/modules/client/preferences.dm b/modular_citadel/code/modules/client/preferences.dm index 29f8a113e8..1caa4cfed7 100644 --- a/modular_citadel/code/modules/client/preferences.dm +++ b/modular_citadel/code/modules/client/preferences.dm @@ -15,7 +15,7 @@ var/arousable = TRUE var/widescreenpref = TRUE var/autostand = TRUE - var/lewdchem = FALSE + var/lewdchem = TRUE //vore prefs var/toggleeatingnoise = TRUE