diff --git a/modular_citadel/code/modules/arousal/arousal.dm b/modular_citadel/code/modules/arousal/arousal.dm
index 843672877e..44eafc5fc6 100644
--- a/modular_citadel/code/modules/arousal/arousal.dm
+++ b/modular_citadel/code/modules/arousal/arousal.dm
@@ -63,10 +63,12 @@
 	if(!target || !R)
 		return
 	var/turfing = isturf(target)
+	G.generate_fluid()
 	if(spill && R.total_volume >= 5)
 		R.reaction(turfing ? target : target.loc, TOUCH, 1, 0)
 	if(!turfing)
 		R.trans_to(target, R.total_volume * (spill ? G.fluid_transfer_factor : 1))
+	G.time_since_last_orgasm = 0
 	R.clear_reagents()
 
 /mob/living/carbon/human/proc/mob_climax_outside(obj/item/organ/genital/G, mb_time = 30) //This is used for forced orgasms and other hands-free climaxes
diff --git a/modular_citadel/code/modules/arousal/genitals.dm b/modular_citadel/code/modules/arousal/genitals.dm
index a7b39f1706..731c69a457 100644
--- a/modular_citadel/code/modules/arousal/genitals.dm
+++ b/modular_citadel/code/modules/arousal/genitals.dm
@@ -16,6 +16,7 @@
 	var/fluid_efficiency = 1
 	var/fluid_rate = CUM_RATE
 	var/fluid_mult = 1
+	var/time_since_last_orgasm = 500
 	var/aroused_state = FALSE //Boolean used in icon_state strings
 	var/obj/item/organ/genital/linked_organ
 	var/linked_organ_slot //used for linking an apparatus' organ to its other half on update_link().
@@ -156,20 +157,13 @@
 		return
 	reagents.maximum_volume = fluid_max_volume
 	if(fluid_id && CHECK_BITFIELD(genital_flags, GENITAL_FUID_PRODUCTION))
-		generate_fluid()
+		time_since_last_orgasm++
 
 /obj/item/organ/genital/proc/generate_fluid()
-	var/amount = fluid_rate
-	if(!reagents.total_volume && amount < 0.1) // Apparently, 0.015 gets rounded down to zero and no reagents are created if we don't start it with 0.1 in the tank.
-		amount += 0.1
-	var/multiplier = fluid_mult
-	if(reagents.total_volume >= 5)
-		multiplier *= 0.8
-	if(reagents.total_volume < reagents.maximum_volume)
-		reagents.isolate_reagent(fluid_id)//remove old reagents if it changed and just clean up generally
-		reagents.add_reagent(fluid_id, (amount * multiplier))//generate the cum
-		return TRUE
-	return FALSE
+	var/amount = clamp(fluid_rate * time_since_last_orgasm * fluid_mult,0,fluid_max_volume)
+	reagents.clear_reagents()
+	reagents.add_reagent(fluid_id,amount)
+	return TRUE
 
 /obj/item/organ/genital/proc/update_link()
 	if(owner)
diff --git a/modular_citadel/code/modules/arousal/organs/testicles.dm b/modular_citadel/code/modules/arousal/organs/testicles.dm
index a8946294b1..5fb1c75ad0 100644
--- a/modular_citadel/code/modules/arousal/organs/testicles.dm
+++ b/modular_citadel/code/modules/arousal/organs/testicles.dm
@@ -19,9 +19,8 @@
 /obj/item/organ/genital/testicles/generate_fluid()
 	if(!linked_organ && !update_link())
 		return FALSE
-	. = ..()
-	if(. && reagents.holder_full())
-		to_chat(owner, "Your balls finally feel full, again.")
+	return ..()
+	// in memoriam "Your balls finally feel full, again." ??-2020
 
 /obj/item/organ/genital/testicles/upon_link()
 	size = linked_organ.size
@@ -65,4 +64,4 @@
 	fluid_rate = D.features["balls_cum_rate"]
 	fluid_mult = D.features["balls_cum_mult"]
 	fluid_efficiency = D.features["balls_efficiency"]
-	toggle_visibility(D.features["balls_visibility"], FALSE)
\ No newline at end of file
+	toggle_visibility(D.features["balls_visibility"], FALSE)
diff --git a/strings/traumas.json b/strings/traumas.json
index 8d1e9537ef..833c786b75 100644
--- a/strings/traumas.json
+++ b/strings/traumas.json
@@ -129,7 +129,8 @@
 		"@pick(semicolon)*nya",
 		"@pick(semicolon)*awoo",
 		"@pick(semicolon)*merp",
-		"@pick(semicolon)*weh"
+		"@pick(semicolon)*weh",
+		"@pick(semicolon)My balls finally feel full, again."
     ],
 
     "mutations": [