Merge pull request #22 from Citadel-Station-13/master

YARR

modular_citadel/code/modules/arousal/organs/breasts.dm

@@ -21,10 +21,6 @@
 	can_climax				= TRUE
 	fluid_transfer_factor 	= 0.5
 
-/obj/item/organ/genital/breasts/Initialize()
-	. = ..()
-	reagents.add_reagent(fluid_id, fluid_max_volume)
-
 /obj/item/organ/genital/breasts/on_life()
 	if(QDELETED(src))
 		return
@@ -32,6 +28,14 @@
 		return
 	reagents.maximum_volume = fluid_max_volume
 	if(fluid_id && producing)
+		if(reagents.total_volume == 0) // 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.
+			fluid_rate = 0.1
+		else
+			fluid_rate = CUM_RATE
+		if(reagents.total_volume >= 5)
+			fluid_mult = 0.5
+		else
+			fluid_mult = 1
 		generate_milk()
 
 /obj/item/organ/genital/breasts/proc/generate_milk()

modular_citadel/code/modules/arousal/organs/genitals.dm

@@ -10,7 +10,7 @@
 	var/fluid_transfer_factor	= 0.0 //How much would a partner get in them if they climax using this?
 	var/size					= 2 //can vary between num or text, just used in icon_state strings
 	var/fluid_id				= null
-	var/fluid_max_volume		= 50
+	var/fluid_max_volume		= 15
 	var/fluid_efficiency		= 1
 	var/fluid_rate				= 1
 	var/fluid_mult				= 1

modular_citadel/code/modules/arousal/organs/testicles.dm

@@ -16,14 +16,18 @@
 	can_climax				= TRUE
 	var/sent_full_message	= TRUE //defaults to 1 since they're full to start
 
-/obj/item/organ/genital/testicles/Initialize()
-	. = ..()
-	reagents.add_reagent(fluid_id, fluid_max_volume)
-
 /obj/item/organ/genital/testicles/on_life()
 	if(QDELETED(src))
 		return
 	if(reagents && producing)
+		if(reagents.total_volume == 0) // 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.
+			fluid_rate = 0.1
+		else
+			fluid_rate = CUM_RATE
+		if(reagents.total_volume >= 5)
+			fluid_mult = 0.5
+		else
+			fluid_mult = 1
 		generate_cum()
 
 /obj/item/organ/genital/testicles/proc/generate_cum()

modular_citadel/code/modules/arousal/organs/womb.dm

@@ -9,14 +9,18 @@
 	fluid_id 		= "femcum"
 	producing		= TRUE
 
-/obj/item/organ/genital/womb/Initialize()
-	. = ..()
-	reagents.add_reagent(fluid_id, fluid_max_volume)
-
 /obj/item/organ/genital/womb/on_life()
 	if(QDELETED(src))
 		return
 	if(reagents && producing)
+		if(reagents.total_volume == 0) // 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.
+			fluid_rate = 0.1
+		else
+			fluid_rate = CUM_RATE
+		if(reagents.total_volume >= 5)
+			fluid_mult = 0.5
+		else
+			fluid_mult = 1
 		generate_femcum()
 
 /obj/item/organ/genital/womb/proc/generate_femcum()