Adds condoms and genital colour tinting commands.

Adds condoms and genital colour tinting commands.

modular_citadel/code/modules/arousal/arousal.dm

@@ -238,7 +238,12 @@
 /mob/living/carbon/human/proc/mob_masturbate(obj/item/organ/genital/G, mb_time = 30) //Masturbation, keep it gender-neutral
 	var/total_fluids = 0
 	var/datum/reagents/fluid_source = null
+	var/condomed = 0
 
+	if(G.name == "penis")//if the select organ is a penis
+		var/obj/item/organ/genital/penis/P = src.getorganslot("penis")
+		if(P.condom) //if the penis is condomed
+			condomed = 1
 	if(G.producing) //Can it produce its own fluids, such as breasts?
 		fluid_source = G.reagents
 	else
@@ -253,12 +258,20 @@
 							"<span class='userlove'>You start to [G.masturbation_verb] your [G.name].</span>")
 
 	if(do_after(src, mb_time, target = src))
-		if(total_fluids > 5)
+		if(total_fluids > 5 &&!condomed)
 			fluid_source.reaction(src.loc, TOUCH, 1, 0)
 			fluid_source.clear_reagents()
-		src.visible_message("<span class='love'>[src] orgasms, cumming[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""]!</span>", \
+		if(!condomed)
+			src.visible_message("<span class='love'>[src] orgasms, cumming[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""]!</span>", \
 							"<span class='userlove'>You cum[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""].</span>", \
 							"<span class='userlove'>You have relieved yourself.</span>")
+		if(condomed) //condomed
+			src.visible_message("<span class='love'>[src] orgasms, climaxing into [p_their()] condom </span>", \
+							"<span class='userlove'>You cum into your condom.</span>", \
+							"<span class='userlove'>You have relieved yourself.</span>")
+		if(total_fluids > 0 &&condomed)
+			src.condomclimax()
+
 		SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm)
 		if(G.can_climax)
 			setArousalLoss(min_arousal)
@@ -331,7 +344,6 @@
 			SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm)
 
 			if(G.can_climax)
-
 				setArousalLoss(min_arousal)
 
 	else //knots and other non-spilling orgasms
@@ -347,13 +359,14 @@
 			if(G.can_climax)
 				setArousalLoss(min_arousal)
 
+
 	if(impreg)
 		//Role them odds, only people with the dicks can send the chance to the person with the settings enabled at the momment.
 		var/obj/item/organ/genital/womb/W = L.getorganslot("womb")
 		if (L.breedable == 1 && W.pregnant == 0) //Dont get pregnant again, if you are pregnant.
 			log_game("Debug: [L] has been impregnated by [src]")
 			to_chat(L, "<span class='userlove'>You feel your hormones change, and a motherly instinct take over.</span>") //leting them know magic has happened.
-			W.pregnant = 1 //self insert fetish
+			W.pregnant = 1
 
 			var/obj/item/organ/genital/breasts/B = L.getorganslot("womb")
 
@@ -366,6 +379,12 @@
 	var/total_fluids = 0
 	var/datum/reagents/fluid_source = null
 
+
+	if(G.name == "penis")//if the select organ is a penis
+		var/obj/item/organ/genital/penis/P = src.getorganslot("penis")
+		if(P.condom) //if the penis is condomed
+			to_chat(src, "<span class='warning'>You cannot fill containers when there is a condom over your [G.name].</span>")
+			return
 	if(G.producing) //Can it produce its own fluids, such as breasts?
 		fluid_source = G.reagents
 	else
@@ -515,9 +534,27 @@
 			return
 
 		//Ok, now we check what they want to do.
-		var/choice = input(src, "Select sexual activity", "Sexual activity:") in list("Masturbate", "Climax alone", "Climax with partner", "Fill container")
+		var/choice = input(src, "Select sexual activity", "Sexual activity:") in list("Masturbate", "Climax alone", "Climax with partner", "Fill container", "Remove condom")
 
 		switch(choice)
+			if("Remove condom")
+				if(restrained(TRUE)) //TRUE ignores grabs
+					to_chat(src, "<span class='warning'>You can't do that while restrained!</span>")
+					return
+				var/free_hands = get_num_arms()
+				if(!free_hands)
+					to_chat(src, "<span class='warning'>You need at least one free arm.</span>")
+					return
+				var/obj/item/organ/genital/penis/P = src.getorganslot("penis")
+				if(!P.condom)
+					to_chat(src, "<span class='warning'>You don't have a condom on!</span>")
+					return
+				if(P.condom)
+					to_chat(src, "<span class='warning'>You tug the condom off the end of your penis!</span>")
+					src.removecondom()
+					return
+				return
+
 			if("Masturbate")
 				if(restrained(TRUE)) //TRUE ignores grabs
 					to_chat(src, "<span class='warning'>You can't do that while restrained!</span>")
@@ -573,7 +610,8 @@
 				if(picked_organ)
 					var/mob/living/partner = pick_partner() //Get someone
 					if(partner)
-						if(partner.breedable == 1 && picked_organ.name == "penis")
+						var/obj/item/organ/genital/penis/P = picked_organ
+						if(partner.breedable == 1 && picked_organ.name == "penis"&&!P.condom == 1)
 							var/impreg = input(src, "Would this action carry the risk of pregnancy?", "Choose a option", "Yes") as anything in list("Yes", "No")
 							if(impreg == "Yes") //If we are impregging
 								var/spillage = input(src, "Would your fluids spill outside?", "Choose overflowing option", "Yes") as anything in list("Yes", "No")

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

@@ -21,6 +21,7 @@
 	var/through_clothes			= FALSE
 	var/internal				= FALSE
 	var/hidden					= FALSE
+	var/colourtint				= ""
 
 /obj/item/organ/genital/Initialize()
 	. = ..()
@@ -355,6 +356,7 @@
 	var/list/standing = list()
 	var/size
 	var/aroused_state
+	var/colourtint
 
 	for(var/L in relevant_layers) //Less hardcode
 		H.remove_overlay(L)
@@ -374,6 +376,7 @@
 			var/datum/sprite_accessory/S
 			size = G.size
 			aroused_state = G.aroused_state
+			colourtint = G.colourtint
 			switch(G.type)
 				if(/obj/item/organ/genital/penis)
 					S = GLOB.cock_shapes_list[G.shape]
@@ -399,10 +402,14 @@
 			if(use_skintones && H.dna.features["genitals_use_skintone"])
 				genital_overlay.color = "#[skintone2hex(H.skin_tone)]"
 				genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size]-s_[aroused_state]_[layertext]"
+				if (colourtint)
+					genital_overlay.color = "#[colourtint]"
 			else
 				switch(S.color_src)
 					if("cock_color")
 						genital_overlay.color = "#[H.dna.features["cock_color"]]"
+						if (colourtint)
+							genital_overlay.color = "#[colourtint]"
 					if("balls_color")
 						genital_overlay.color = "#[H.dna.features["balls_color"]]"
 					if("breasts_color")