diff --git a/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm index 56d5c63833..f1f0d45e90 100644 --- a/code/__DEFINES/citadel_defines.dm +++ b/code/__DEFINES/citadel_defines.dm @@ -39,9 +39,9 @@ #define COCK_SIZE_MIN 1 #define COCK_SIZE_MAX 20 -#define COCK_GIRTH_RATIO_MAX 1.25 -#define COCK_GIRTH_RATIO_DEF 0.75 -#define COCK_GIRTH_RATIO_MIN 0.5 +#define COCK_DIAMETER_RATIO_MAX 0.42 +#define COCK_DIAMETER_RATIO_DEF 0.25 +#define COCK_DIAMETER_RATIO_MIN 0.15 #define KNOT_GIRTH_RATIO_MAX 3 #define KNOT_GIRTH_RATIO_DEF 2.1 diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index a5924994e7..c61c706a85 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -165,7 +165,7 @@ "has_cock" = FALSE, "cock_shape" = pick(GLOB.cock_shapes_list), "cock_length" = 6, - "cock_girth_ratio" = COCK_GIRTH_RATIO_DEF, + "cock_diameter_ratio" = COCK_DIAMETER_RATIO_DEF, "cock_color" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"), "has_sheath" = FALSE, "sheath_color" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"), diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index cdc3fbc5b9..d5f2ae35ed 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -123,7 +123,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) "has_cock" = FALSE, "cock_shape" = "Human", "cock_length" = 6, - "cock_girth_ratio" = COCK_GIRTH_RATIO_DEF, + "cock_diameter_ratio" = COCK_DIAMETER_RATIO_DEF, "cock_color" = "fff", "has_sheath" = FALSE, "sheath_color" = "fff", diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 03c6051c5d..86148ee17c 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -415,7 +415,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["feature_cock_shape"] >> features["cock_shape"] S["feature_cock_color"] >> features["cock_color"] S["feature_cock_length"] >> features["cock_length"] - S["feature_cock_girth"] >> features["cock_girth"] + S["feature_cock_diameter"] >> features["cock_diameter"] S["feature_has_sheath"] >> features["sheath_color"] //balls features S["feature_has_balls"] >> features["has_balls"] diff --git a/modular_citadel/code/modules/arousal/organs/ovipositor.dm b/modular_citadel/code/modules/arousal/organs/ovipositor.dm index c26424d296..07a9e89746 100644 --- a/modular_citadel/code/modules/arousal/organs/ovipositor.dm +++ b/modular_citadel/code/modules/arousal/organs/ovipositor.dm @@ -11,6 +11,6 @@ layer_index = PENIS_LAYER_INDEX var/length = 6 //inches var/girth = 0 - var/girth_ratio = COCK_GIRTH_RATIO_DEF //citadel_defines.dm for these defines + var/girth_ratio = COCK_DIAMETER_RATIO_DEF //citadel_defines.dm for these defines var/knot_girth_ratio = KNOT_GIRTH_RATIO_DEF var/list/oviflags = list() diff --git a/modular_citadel/code/modules/arousal/organs/penis.dm b/modular_citadel/code/modules/arousal/organs/penis.dm index 38f463a97c..c9eb0769cf 100644 --- a/modular_citadel/code/modules/arousal/organs/penis.dm +++ b/modular_citadel/code/modules/arousal/organs/penis.dm @@ -11,12 +11,13 @@ genital_flags = CAN_MASTURBATE_WITH|CAN_CLIMAX_WITH|GENITAL_CAN_AROUSE linked_organ_slot = ORGAN_SLOT_TESTICLES fluid_transfer_factor = 0.5 - size = 2 //arbitrary value derived from length and girth for sprites. + size = 2 //arbitrary value derived from length and diameter for sprites. layer_index = PENIS_LAYER_INDEX var/length = 6 //inches - var/prev_length = 6 - var/girth = 4.38 - var/girth_ratio = COCK_GIRTH_RATIO_DEF //0.73; check citadel_defines.dm + + var/prev_length = 6 //really should be renamed to prev_length + var/diameter = 4.38 + var/diameter_ratio = COCK_DIAMETER_RATIO_DEF //0.25; check citadel_defines.dm /obj/item/organ/genital/penis/modify_size(modifier, min = -INFINITY, max = INFINITY) var/new_value = CLAMP(length + modifier, min, max) @@ -68,7 +69,7 @@ else if ((round(length) < round(prev_length)) && (length > 0.5)) to_chat(owner, "Your [pick(GLOB.gentlemans_organ_names)] [pick("shrinks down to", "decreases into", "diminishes into", "deflates into", "shrivels regretfully into", "contracts into")] a [uppertext(round(length))] inch penis.") icon_state = sanitize_text("penis_[shape]_[size]") - girth = (length * girth_ratio)//Is it just me or is this ludicous, why not make it exponentially decay? + diameter = (length * diameter_ratio)//Is it just me or is this ludicous, why not make it exponentially decay? /obj/item/organ/genital/penis/update_appearance() @@ -77,7 +78,8 @@ var/icon_shape = S ? S.icon_state : "human" icon_state = "penis_[icon_shape]_[size]" var/lowershape = lowertext(shape) - desc = "You see [aroused_state ? "an erect" : "a flaccid"] [lowershape] [name]. You estimate it's about [round(length, 0.25)] inch[round(length, 0.25) != 1 ? "es" : ""] long and [round(girth, 0.25)] inch[round(girth, 0.25) != 1 ? "es" : ""] in girth." + desc = "You see [aroused_state ? "an erect" : "a flaccid"] [lowershape] [name]. You estimate it's about [round(length, 0.25)] inch[round(length, 0.25) != 1 ? "es" : ""] long and [round(diameter, 0.25)] inch[round(diameter, 0.25) != 1 ? "es" : ""] in diameter." + if(owner) if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"]) if(ishuman(owner)) // Check before recasting type, although someone fucked up if you're not human AND have use_skintones somehow... @@ -97,6 +99,6 @@ else color = "#[D.features["cock_color"]]" length = D.features["cock_length"] - girth_ratio = D.features["cock_girth_ratio"] + diameter_ratio = D.features["cock_diameter_ratio"] shape = D.features["cock_shape"] prev_length = length