Merge pull request #238 from jbox144/makes-the-cum

Ports previous changes of breasts to the penis

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

@@ -9,6 +9,9 @@
 	var/size_name			= "average"
 	shape					= "single"
 	var/sack_size			= BALLS_SACK_SIZE_DEF
+	var/cached_size			= 6
+	fluid_mult				= 0.133 // Set to a lower value due to production scaling with size (I.E. 6 inches the "normal" amount)
+	fluid_max_volume		= 3
 	fluid_id 				= "semen"
 	producing				= TRUE
 	can_masturbate_with		= FALSE
@@ -19,15 +22,14 @@
 /obj/item/organ/genital/testicles/on_life()
 	if(QDELETED(src))
 		return
-	if(reagents && producing)
+	if(!reagents || !owner)
+		return
+	reagents.maximum_volume = fluid_max_volume * cached_size// fluid amount is also scaled by the size of the organ
+	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
+			fluid_rate = CUM_RATE * cached_size * fluid_mult // fluid rate is scaled by the size of the organ
 		generate_cum()
 
 /obj/item/organ/genital/testicles/proc/generate_cum()
@@ -42,7 +44,7 @@
 	if(!linked_organ)
 		return FALSE
 	reagents.isolate_reagent(fluid_id)//remove old reagents if it changed and just clean up generally
-	reagents.add_reagent(fluid_id, (fluid_mult * fluid_rate))//generate the cum
+	reagents.add_reagent(fluid_id, (fluid_rate))//generate the cum
 
 /obj/item/organ/genital/testicles/update_link()
 	if(owner && !QDELETED(src))
@@ -50,7 +52,8 @@
 		if(linked_organ)
 			linked_organ.linked_organ = src
 			size = linked_organ.size
-
+			var/obj/item/organ/genital/penis/O = linked_organ
+			cached_size = O.length
 	else
 		if(linked_organ)
 			linked_organ.linked_organ = null

modular_citadel/code/modules/crafting/recipes.dm

@@ -10,14 +10,3 @@
 	result = /obj/item/aicard/potato
 	category = CAT_ROBOT
 
-/datum/crafting_recipe/milker
-	name = "Milking Machine"
-	reqs = list(/obj/item/stack/cable_coil = 5, /obj/item/stack/sheet/plastic = 2, /obj/item/stack/rods = 2, /obj/item/stack/sheet/cardboard = 1, /obj/item/reagent_containers/glass/beaker = 2, /obj/item/stock_parts/manipulator = 1)
-	result = /obj/item/milker
-	tools = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
-	category = CAT_MISC
-
-/datum/crafting_recipe/milker/penis
-	name = "Penis Milking Machine"
-	reqs = list(/obj/item/stack/cable_coil = 5, /obj/item/stack/sheet/plastic = 2, /obj/item/stack/rods = 1, /obj/item/stack/sheet/cardboard = 1, /obj/item/reagent_containers/glass/beaker/large = 1, /obj/item/stock_parts/manipulator = 1)
-	result = /obj/item/milker/penis

modular_citadel/code/modules/reagents/reagent container/milking machine.dm

@@ -9,7 +9,7 @@
 
 	var/on = FALSE
 	var/obj/item/reagent_containers/glass/inserted_item = null
-	
+
 	var/transfer_rate = 0.25 // How much we transfer every 2 seconds
 	var/target_organ  = "breasts" // What organ we are transfering from
 
@@ -42,11 +42,11 @@
 		UpdateIcon()
 	else
 		..()
-		
+
 /obj/item/milker/proc/UpdateIcon()
 	icon_state = "[on ? "On" : "Off"][inserted_item ? "Beaker" : ""]"
 	item_state = icon_state
-	
+
 
 /obj/item/milker/AltClick(mob/living/user)
 	add_fingerprint(user)
@@ -75,9 +75,9 @@
 	icon_state = "PenisOff"
 	item_state = "PenisOff"
 	desc = "A pocket sized pump and tubing assembly designed to collect and store products from the penis."
-	
+
 	target_organ  = "testicles" // Since semen is stored in the balls
-		
+
 /obj/item/milker/penis/UpdateIcon()
 	icon_state = "Penis[on ? "On" : "Off"][inserted_item ? "Beaker" : ""]"
 	item_state = icon_state