diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index 51c814a5f9..9eb5400c52 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -170,7 +170,7 @@
"balls_amount" = 2,
"balls_sack_size" = BALLS_SACK_SIZE_DEF,
"balls_size" = BALLS_SIZE_DEF,
- "balls_shape" = "Pair",
+ "balls_shape" = "Single",
"balls_cum_rate" = CUM_RATE,
"balls_cum_mult" = CUM_RATE_MULT,
"balls_efficiency" = CUM_EFFICIENCY,
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 501e9fc7cc..2b7b800111 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -685,48 +685,48 @@ GLOBAL_LIST_EMPTY(preferences_datums)
else
if(pref_species.use_skintones)
dat += "Genitals use skintone:[features["genitals_use_skintone"] == TRUE ? "Yes" : "No"]"
- dat += "Has Penis:"
+ dat += "Penis
"
dat += "[features["has_cock"] == TRUE ? "Yes" : "No"]"
- if(features["has_cock"] == TRUE)
+ if(features["has_cock"])
if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE)
- dat += "Penis Color:"
- dat += " (Skin tone overriding)
"
+ dat += "Penis Color:
"
+ dat += " (Skin tone overriding)
"
else
- dat += "Penis Color:"
+ dat += "Penis Color:
"
dat += " Change
"
dat += "Penis Shape: [features["cock_shape"]]"
dat += "Penis Length: [features["cock_length"]] inch(es)"
dat += "Has Testicles:[features["has_balls"] == TRUE ? "Yes" : "No"]"
- if(features["has_balls"] == TRUE)
+ if(features["has_balls"])
if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE)
- dat += "Testicles Color:"
+ dat += "Testicles Color:
"
dat += " (Skin tone overriding)
"
else
- dat += "Testicles Color:"
+ dat += "Testicles Color:
"
dat += " Change
"
dat += "Testicles showing:[features["balls_shape"]]"
dat += APPEARANCE_CATEGORY_COLUMN
- dat += "Has Vagina:"
+ dat += "Vagina
"
dat += "[features["has_vag"] == TRUE ? "Yes" : "No"]"
if(features["has_vag"])
dat += "Vagina Type: [features["vag_shape"]]"
if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE)
- dat += "Vagina Color:"
+ dat += "Vagina Color:
"
dat += " (Skin tone overriding)
"
else
- dat += "Vagina Color:"
+ dat += "Vagina Color:
"
dat += " Change
"
dat += "Has Womb:[features["has_womb"] == TRUE ? "Yes" : "No"]"
dat += ""
dat += APPEARANCE_CATEGORY_COLUMN
- dat += "Has Breasts:"
+ dat += "Breasts
"
dat += "[features["has_breasts"] == TRUE ? "Yes" : "No"]"
if(features["has_breasts"])
if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE)
- dat += "Color:"
+ dat += "Color:
"
dat += " (Skin tone overriding)
"
else
- dat += "Color:"
+ dat += "Color:
"
dat += " Change
"
dat += "Cup Size:[features["breasts_size"]]"
dat += "Breast Shape:[features["breasts_shape"]]"
@@ -1996,6 +1996,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
arousable = !arousable
if("has_cock")
features["has_cock"] = !features["has_cock"]
+ if(features["has_cock"] == FALSE)
+ features["has_balls"] = FALSE
if("has_balls")
features["has_balls"] = !features["has_balls"]
if("has_ovi")
@@ -2010,6 +2012,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
features["has_breasts"] = !features["has_breasts"]
if("has_vag")
features["has_vag"] = !features["has_vag"]
+ if(features["has_vag"] == FALSE)
+ features["has_womb"] = FALSE
if("has_womb")
features["has_womb"] = !features["has_womb"]
if("exhibitionist")
diff --git a/modular_citadel/code/modules/arousal/organs/testicles.dm b/modular_citadel/code/modules/arousal/organs/testicles.dm
index 0b86d58208..1e6b4d62d4 100644
--- a/modular_citadel/code/modules/arousal/organs/testicles.dm
+++ b/modular_citadel/code/modules/arousal/organs/testicles.dm
@@ -11,7 +11,7 @@
var/sack_size = BALLS_SACK_SIZE_DEF
fluid_id = "semen"
producing = TRUE
- can_masturbate_with = TRUE
+ can_masturbate_with = FALSE
masturbation_verb = "massage"
can_climax = TRUE
var/sent_full_message = TRUE //defaults to 1 since they're full to start