Merge pull request #1108 from Artemiuz28/Artemiuz28-patch-1

Female masturbation fixes

code/citadel/cit_arousal.dm

@@ -254,16 +254,34 @@
 									"<span class='green'>You cum into [SC].</span>", \
 									"<span class='green'>You have relieved yourself.</span>")
 								finished = 1
-
+								
+					if(/obj/item/organ/genital/vagina)
+						var/obj/item/organ/genital/vagina/V = SG
+						if(!V.linked_womb)
+							src << "<span class='warning'>No womb!</span>"
+							return
+						fluid_source = V.linked_womb.reagents
+						total_cum = fluid_source.total_volume
+						if(into_container)//into a glass or beaker or whatever
+							src.visible_message("<span class='danger'>[src] starts fingering their vagina over [SC].</span>", \
+								"<span class='userdanger'>You start fingering over [SC.name].</span>", \
+								"<span class='userdanger'>You start masturbating.</span>")
+							if(do_after(src, mb_time, target = src) && in_range(src, SC))
+								fluid_source.trans_to(SC, total_cum)
+								src.visible_message("<span class='danger'>[src] orgasms, [pick("cumming into", "emptying themself into")] [SC]!</span>", \
+									"<span class='green'>You cum into [SC].</span>", \
+									"<span class='green'>You have relieved yourself.</span>")
+								finished = 1
+								
 						else//not into a container
-							src.visible_message("<span class='danger'>[src] starts [pick("jerking off","stroking")] their [pick(GLOB.dick_nouns)].</span>", \
-								"<span class='userdanger'>You start jerking off your [pick(GLOB.dick_nouns)].</span>", \
+							src.visible_message("<span class='danger'>[src] starts fingering their vagina.</span>", \
+								"<span class='userdanger'>You start fingering your vagina.</span>", \
 										"<span class='userdanger'>You start masturbating.</span>")
 							if(do_after(src, mb_time, target = src))
 								if(total_cum > 5)
 									fluid_source.reaction(src.loc, TOUCH, 1, 0)
 								fluid_source.clear_reagents()
-								src.visible_message("<span class='danger'>[src] orgasms, [pick("shooting cum", "draining their balls")][istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""]!</span>", \
+								src.visible_message("<span class='danger'>[src] orgasms, cumming[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""]!</span>", \
 									"<span class='green'>You cum[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""].</span>", \
 									"<span class='green'>You have relieved yourself.</span>")
 								finished = 1

code/citadel/cit_reagents.dm

@@ -80,7 +80,7 @@
 	var/obj/effect/decal/cleanable/femcum/S = locate() in T
 	if(!S)
 		S = new(T)
-	S.reagents.add_reagent("semen", reac_volume)
+	S.reagents.add_reagent("femcum", reac_volume)
 	if(data["blood_DNA"])
 		S.blood_DNA[data["blood_DNA"]] = data["blood_type"]
 
@@ -219,4 +219,4 @@
 	results = list("anaphro+" = 1)
 	required_reagents = list("anaphro" = 5, "acetone" = 1)
 	required_temp = 300
-	mix_message = "The mixture thickens and heats up slighty..."
+	mix_message = "The mixture thickens and heats up slighty..."

code/citadel/organs/womb.dm

@@ -6,8 +6,28 @@
 	zone 			= "groin"
 	slot 			= "womb"
 	w_class 		= 3
+	var/internal 	= FALSE
 	fluid_id 		= "femcum"
+	producing		= TRUE
 	var/obj/item/organ/genital/vagina/linked_vag
+	
+/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)
+		generate_femcum()
+
+/obj/item/organ/genital/womb/proc/generate_femcum()
+	reagents.maximum_volume = fluid_max_volume
+	update_link()
+	if(!linked_vag)
+		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
 
 /obj/item/organ/genital/womb/update_link()
 	if(owner)
@@ -25,4 +45,4 @@
 		linked_vag = null
 
 /obj/item/organ/genital/womb/Destroy()
-	return ..()
+	return ..()