From c6e60fcc76ed70555da3d95a7597a69d4ba7f186 Mon Sep 17 00:00:00 2001
From: Artemiuz28 <artemiuz@meta.ua>
Date: Mon, 22 May 2017 16:11:07 +0300
Subject: [PATCH] Vagina is now valid for masturbation

---
 code/citadel/cit_arousal.dm | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/code/citadel/cit_arousal.dm b/code/citadel/cit_arousal.dm
index f2801d1ede..a69411f32b 100644
--- a/code/citadel/cit_arousal.dm
+++ b/code/citadel/cit_arousal.dm
@@ -25,7 +25,7 @@
 	var/arousal_gain_rate = 1 //Rate at which this species becomes aroused
 	var/arousal_lose_rate = 1 //Multiplier for how easily arousal can be relieved
 	var/list/cum_fluids = list("semen")
-	var/list/milk_fludis = list("milk")
+	var/list/milk_fluids = list("milk")
 	var/list/femcum_fluids = list("femcum")
 
 //Mob procs
@@ -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
@@ -285,4 +303,4 @@
 /mob/living/carbon/proc/force_orgasm(intensity)
 	if(canbearoused && has_dna() && (has_penis() || has_vagina()))
 		return 1
-	return 0
\ No newline at end of file
+	return 0