Merge branch 'pr/12'

modular_citadel/code/modules/arousal/arousal.dm

@@ -1,13 +1,13 @@
 //Mob vars
 /mob/living
-	var/arousalloss = 0			//How aroused the mob is.
-	var/min_arousal = 0			//The lowest this mobs arousal will get. default = 0
-	var/max_arousal = 100		//The highest this mobs arousal will get. default = 100
-	var/arousal_rate = 1		//The base rate that arousal will increase in this mob.
-	var/arousal_loss_rate = 1	//How easily arousal can be relieved for this mob.
-	var/canbearoused = FALSE	//Mob-level disabler for arousal. Starts off and can be enabled as features are added for different mob types.
-	var/mb_cd_length = 100		//5 second cooldown for masturbating because fuck spam.
-	var/mb_cd_timer = 0			//The timer itself
+	var/arousalloss = 0									//How aroused the mob is.
+	var/min_arousal = AROUSAL_MINIMUM_DEFAULT			//The lowest this mobs arousal will get. default = 0
+	var/max_arousal = AROUSAL_MAXIMUM_DEFAULT			//The highest this mobs arousal will get. default = 100
+	var/arousal_rate = AROUSAL_START_VALUE				//The base rate that arousal will increase in this mob.
+	var/arousal_loss_rate = AROUSAL_START_VALUE			//How easily arousal can be relieved for this mob.
+	var/canbearoused = FALSE					//Mob-level disabler for arousal. Starts off and can be enabled as features are added for different mob types.
+	var/mb_cd_length = 5 SECONDS						//5 second cooldown for masturbating because fuck spam.
+	var/mb_cd_timer = 0									//The timer itself
 
 /mob/living/carbon/human
 	canbearoused = TRUE
@@ -22,8 +22,8 @@
 
 //Species vars
 /datum/species
-	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/arousal_gain_rate = AROUSAL_START_VALUE //Rate at which this species becomes aroused
+	var/arousal_lose_rate = AROUSAL_START_VALUE //Multiplier for how easily arousal can be relieved
 	var/list/cum_fluids = list("semen")
 	var/list/milk_fluids = list("milk")
 	var/list/femcum_fluids = list("femcum")
@@ -77,7 +77,8 @@
 		updatearousal()
 
 /mob/living/proc/getPercentAroused()
-	return ((100 / max_arousal) * arousalloss)
+	var/percentage = ((100 / max_arousal) * arousalloss)
+	return percentage
 
 /mob/living/proc/isPercentAroused(percentage)//returns true if the mob's arousal (measured in a percent of 100) is greater than the arg percentage.
 	if(!isnum(percentage) || percentage > 100 || percentage < 0)
@@ -104,6 +105,8 @@
 					S = GLOB.breasts_shapes_list[G.shape]
 			if(S?.alt_aroused)
 				G.aroused_state = isPercentAroused(G.aroused_amount)
+			if(getArousalLoss() >= ((max_arousal / 100) * 33))
+				G.aroused_state = TRUE
 			else
 				G.aroused_state = FALSE
 			G.update_appearance()
@@ -219,17 +222,17 @@
 		fluid_source = G.linked_organ.reagents
 	total_fluids = fluid_source.total_volume
 	if(mb_time)
-		src.visible_message("<span class='danger'>[src] starts to [G.masturbation_verb] [p_their()] [G.name].</span>", \
-							"<span class='green'>You start to [G.masturbation_verb] your [G.name].</span>", \
-							"<span class='green'>You start to [G.masturbation_verb] your [G.name].</span>")
+		src.visible_message("<span class='love'>[src] starts to [G.masturbation_verb] [p_their()] [G.name].</span>", \
+							"<span class='userlove'>You start to [G.masturbation_verb] your [G.name].</span>", \
+							"<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)
 			fluid_source.reaction(src.loc, TOUCH, 1, 0)
 			fluid_source.clear_reagents()
-		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>")
+		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>")
 		SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm)
 		if(G.can_climax)
 			setArousalLoss(min_arousal)
@@ -257,16 +260,16 @@
 	else
 		total_fluids = fluid_source.total_volume
 		if(mb_time) //as long as it's not instant, give a warning
-			src.visible_message("<span class='danger'>[src] looks like they're about to cum.</span>", \
-								"<span class='green'>You feel yourself about to orgasm.</span>", \
-								"<span class='green'>You feel yourself about to orgasm.</span>")
+			src.visible_message("<span class='love'>[src] looks like they're about to cum.</span>", \
+								"<span class='userlove'>You feel yourself about to orgasm.</span>", \
+								"<span class='userlove'>You feel yourself about to orgasm.</span>")
 		if(do_after(src, mb_time, target = src))
 			if(total_fluids > 5)
 				fluid_source.reaction(src.loc, TOUCH, 1, 0)
 			fluid_source.clear_reagents()
-			src.visible_message("<span class='danger'>[src] orgasms[istype(src.loc, /turf/open/floor) ? ", spilling onto [src.loc]" : ""], using [p_their()] [G.name]!</span>", \
-								"<span class='green'>You climax[istype(src.loc, /turf/open/floor) ? ", spilling onto [src.loc]" : ""] with your [G.name].</span>", \
-								"<span class='green'>You climax using your [G.name].</span>")
+			src.visible_message("<span class='love'>[src] orgasms[istype(src.loc, /turf/open/floor) ? ", spilling onto [src.loc]" : ""], using [p_their()] [G.name]!</span>", \
+								"<span class='userlove'>You climax[istype(src.loc, /turf/open/floor) ? ", spilling onto [src.loc]" : ""] with your [G.name].</span>", \
+								"<span class='userlove'>You climax using your [G.name].</span>")
 			SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm)
 			if(G.can_climax)
 				setArousalLoss(min_arousal)
@@ -285,9 +288,9 @@
 		fluid_source = G.linked_organ.reagents
 	total_fluids = fluid_source.total_volume
 	if(mb_time) //Skip warning if this is an instant climax.
-		src.visible_message("[src] is about to climax with [L]!", \
-							"You're about to climax with [L]!", \
-							"<span class='danger'>You're preparing to climax with someone!</span>")
+		src.visible_message("<span class='love'>[src] is about to climax with [L]!</span>", \
+							"<span class='userlove'>You're about to climax with [L]!</span>", \
+							"<span class='userlove'>You're preparing to climax with someone!</span>")
 	if(spillage)
 		if(do_after(src, mb_time, target = src) && in_range(src, L))
 			fluid_source.trans_to(L, total_fluids*G.fluid_transfer_factor)
@@ -295,9 +298,9 @@
 			if(total_fluids > 5)
 				fluid_source.reaction(L.loc, TOUCH, 1, 0)
 			fluid_source.clear_reagents()
-			src.visible_message("<span class='danger'>[src] climaxes with [L][spillage ? ", overflowing and spilling":""], using [p_their()] [G.name]!</span>", \
-								"<span class='green'>You orgasm with [L][spillage ? ", spilling out of them":""], using your [G.name].</span>", \
-								"<span class='green'>You have climaxed with someone[spillage ? ", spilling out of them":""], using your [G.name].</span>")
+			src.visible_message("<span class='love'>[src] climaxes with [L][spillage ? ", overflowing and spilling":""], using [p_their()] [G.name]!</span>", \
+								"<span class='userlove'>You orgasm with [L][spillage ? ", spilling out of them":""], using your [G.name].</span>", \
+								"<span class='userlove'>You have climaxed with someone[spillage ? ", spilling out of them":""], using your [G.name].</span>")
 			SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm)
 			SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm)
 			if(G.can_climax)
@@ -306,9 +309,9 @@
 		if(do_after(src, mb_time, target = src) && in_range(src, L))
 			fluid_source.trans_to(L, total_fluids)
 			total_fluids = 0
-			src.visible_message("<span class='danger'>[src] climaxes with [L], [p_their()] [G.name] spilling nothing!</span>", \
-								"<span class='green'>You ejaculate with [L], your [G.name] spilling nothing.</span>", \
-								"<span class='green'>You have climaxed inside someone, your [G.name] spilling nothing.</span>")
+			src.visible_message("<span class='love'>[src] climaxes with [L], [p_their()] [G.name] spilling nothing!</span>", \
+								"<span class='userlove'>You ejaculate with [L], your [G.name] spilling nothing.</span>", \
+								"<span class='userlove'>You have climaxed inside someone, your [G.name] spilling nothing.</span>")
 			SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm)
 			SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm)
 			if(G.can_climax)
@@ -332,14 +335,14 @@
 	//	to_chat(src, "<span class='warning'>You need a container to do this!</span>")
 	//	return
 
-	src.visible_message("<span class='danger'>[src] starts to [G.masturbation_verb] their [G.name] over [container].</span>", \
-						"<span class='userdanger'>You start to [G.masturbation_verb] your [G.name] over [container].</span>", \
-						"<span class='userdanger'>You start to [G.masturbation_verb] your [G.name] over something.</span>")
+	src.visible_message("<span class='love'>[src] starts to [G.masturbation_verb] their [G.name] over [container].</span>", \
+						"<span class='userlove'>You start to [G.masturbation_verb] your [G.name] over [container].</span>", \
+						"<span class='userlove'>You start to [G.masturbation_verb] your [G.name] over something.</span>")
 	if(do_after(src, mb_time, target = src) && in_range(src, container))
 		fluid_source.trans_to(container, total_fluids)
-		src.visible_message("<span class='danger'>[src] uses [p_their()] [G.name] to fill [container]!</span>", \
-							"<span class='green'>You used your [G.name] to fill [container].</span>", \
-							"<span class='green'>You have relieved some pressure.</span>")
+		src.visible_message("<span class='love'>[src] uses [p_their()] [G.name] to fill [container]!</span>", \
+							"<span class='userlove'>You used your [G.name] to fill [container].</span>", \
+							"<span class='userlove'>You have relieved some pressure.</span>")
 		SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm)
 		if(G.can_climax)
 			setArousalLoss(min_arousal)

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

@@ -47,8 +47,6 @@
 	reagents.add_reagent(fluid_id, (fluid_mult * fluid_rate))
 
 /obj/item/organ/genital/breasts/update_appearance()
-	var/string = "breasts_[lowertext(shape)]_[size]"
-	icon_state = sanitize_text(string)
 	var/lowershape = lowertext(shape)
 	switch(lowershape)
 		if("pair")
@@ -66,11 +64,13 @@
 
 	if(producing && aroused_state)
 		desc += " They're leaking [fluid_id]."
+	var/string
 	if(owner)
 		if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"])
 			if(ishuman(owner)) // Check before recasting type, although someone fucked up if you're not human AND have use_skintones somehow...
 				var/mob/living/carbon/human/H = owner // only human mobs have skin_tone, which we need.
 				color = "#[skintone2hex(H.skin_tone)]"
+				string = "breasts_[lowertext(shape)]_[size]-s"
 		else
 			color = "#[owner.dna.features["breasts_color"]]"
 			string = "breasts_[lowertext(shape)]_[size]"

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

@@ -92,7 +92,7 @@
 
 	var/list/genital_list = list()
 	for(var/obj/item/organ/O in internal_organs)
-		if(istype(O, /obj/item/organ/genital))
+		if(isgenital(O))
 			var/obj/item/organ/genital/G = O
 			if(!G.internal)
 				genital_list += G
@@ -110,10 +110,13 @@
 
 
 /obj/item/organ/genital/proc/update_size()
+	return
 
 /obj/item/organ/genital/proc/update_appearance()
+	return
 
 /obj/item/organ/genital/proc/update_link()
+	return
 
 /obj/item/organ/genital/proc/remove_ref()
 	if(linked_organ)
@@ -130,12 +133,12 @@
 
 //proc to give a player their genitals and stuff when they log in
 /mob/living/carbon/human/proc/give_genitals(clean=0)//clean will remove all pre-existing genitals. proc will then give them any genitals that are enabled in their DNA
-	if (NOGENITALS in dna.species.species_traits)
-		return
 	if(clean)
 		var/obj/item/organ/genital/GtoClean
 		for(GtoClean in internal_organs)
 			qdel(GtoClean)
+	if (NOGENITALS in dna.species.species_traits)
+		return
 	//Order should be very important. FIRST vagina, THEN testicles, THEN penis, as this affects the order they are rendered in.
 	if(dna.features["has_breasts"])
 		give_breasts()
@@ -218,6 +221,7 @@
 	return
 /mob/living/carbon/human/proc/give_eggsack()
 	return
+
 /mob/living/carbon/human/proc/give_vagina()
 	if(!dna)
 		return FALSE
@@ -308,12 +312,13 @@
 	var/list/standing = list()
 	var/size
 	var/aroused_state
+
 	for(var/L in relevant_layers) //Less hardcode
 		H.remove_overlay(L)
 	//start scanning for genitals
 	//var/list/worn_stuff = H.get_equipped_items()//cache this list so it's not built again
 	for(var/obj/item/organ/O in H.internal_organs)
-		if(istype(O, /obj/item/organ/genital))
+		if(isgenital(O))
 			var/obj/item/organ/genital/G = O
 			if(G.is_exposed()) //Checks appropriate clothing slot and if it's through_clothes
 				genitals_to_add += H.getorganslot(G.slot)

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

@@ -87,6 +87,13 @@
 	icon_state = "hairy"
 	name = "Hairy"
 
+/datum/sprite_accessory/vagina/spade
+	icon_state = "spade"
+	name = "Spade"
+
+/datum/sprite_accessory/vagina/furred
+	icon_state = "furred"
+	name = "Furred"
 
 //BREASTS BE HERE
 /datum/sprite_accessory/breasts

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

@@ -17,12 +17,11 @@
 	var/clits				= 1
 	var/clit_diam 			= 0.25
 	var/clit_len			= 0.25
-	var/list/vag_types = list("tentacle", "dentata", "hairy")
+	var/list/vag_types = list("tentacle", "dentata", "hairy", "spade", "furred")
 
 
 /obj/item/organ/genital/vagina/update_appearance()
-	var/string = "vagina" //Keeping this code here, so making multiple sprites for the different kinds is easier.
-	icon_state = sanitize_text(string)
+	var/string //Keeping this code here, so making multiple sprites for the different kinds is easier.
 	var/lowershape = lowertext(shape)
 	var/details
 
@@ -37,6 +36,10 @@
 			details = "It is taut with smooth skin, though without much hair and "
 		if("gaping")
 			details = "It is gaping slightly open, though without much hair and "
+		if("spade")
+			details = "It is a plush canine spade, it "
+		if("furred")
+			details = "It has neatly groomed fur around the outer folds, it "
 		else
 			details = "It has an exotic shape and "
 	if(aroused_state)
@@ -51,9 +54,15 @@
 			if(ishuman(owner)) // Check before recasting type, although someone fucked up if you're not human AND have use_skintones somehow...
 				var/mob/living/carbon/human/H = owner // only human mobs have skin_tone, which we need.
 				color = "#[skintone2hex(H.skin_tone)]"
+				string = "vagina-s"
 		else
 			color = "#[owner.dna.features["vag_color"]]"
+			string  = "vagina"
+		if(ishuman(owner))
+			var/mob/living/carbon/human/H = owner
+			H.update_genitals()
 
+	icon_state = sanitize_text(string)
 
 /obj/item/organ/genital/vagina/update_link()
 	if(owner)