whoops forgot permaboner

modular_citadel/code/modules/arousal/genitals.dm

@@ -6,7 +6,8 @@
 	var/genital_flags //see citadel_defines.dm
 	var/masturbation_verb = "masturbate"
 	var/orgasm_verb = "cumming" //present continous
-	var/arousal_verb = "feel aroused"
+	var/arousal_verb = "You feel aroused"
+	var/unarousal_verb = "You no longer feel aroused"
 	var/fluid_transfer_factor = 0 //How much would a partner get in them if they climax using this?
 	var/size = 2 //can vary between num or text, just used in icon_state strings
 	var/fluid_id = null
@@ -38,6 +39,11 @@
 		Remove(owner, TRUE)//this should remove references to it, so it can be GCd correctly
 	return ..()
 
+/obj/item/organ/genital/proc/set_aroused_state(new_state)
+	if(!((HAS_TRAIT(owner,TRAIT_PERMABONER) && !new_state) || HAS_TRAIT(owner,TRAIT_NEVERBONER) && new_state))
+		aroused_state = new_state
+	return aroused_state
+
 /obj/item/organ/genital/proc/update(removing = FALSE)
 	if(QDELETED(src))
 		return
@@ -126,8 +132,12 @@
 	var/obj/item/organ/genital/picked_organ
 	picked_organ = input(src, "Choose which genitalia to toggle arousal on", "Set genital arousal", null) in genital_list
 	if(picked_organ)
-		picked_organ.aroused_state = !picked_organ.aroused_state
-		to_chat(src,"<span class='userlove'>You [picked_organ.arousal_verb].")
+		var/original_state = picked_organ.aroused_state
+		picked_organ.set_aroused_state(!picked_organ.aroused_state)
+		if(original_state != picked_organ.aroused_state)
+			to_chat(src,"<span class='userlove'>[picked_organ.aroused_state ? picked_organ.arousal_verb : picked_organ.unarousal_verb].</span>")
+		else
+			to_chat(src,"<span class='userlove'>You can't make that genital [picked_organ.aroused_state ? "unaroused" : "aroused"]!</span>")
 		picked_organ.update_appearance()
 	return
 

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

@@ -11,7 +11,8 @@
 	shape = "pair"
 	genital_flags = CAN_MASTURBATE_WITH|CAN_CLIMAX_WITH|GENITAL_FUID_PRODUCTION
 	masturbation_verb = "massage"
-	arousal_verb = "feel very sensitive in your breasts"
+	arousal_verb = "Your breasts start feeling sensitive"
+	unarousal_verb = "Your breasts no longer feel sensitive"
 	orgasm_verb = "leaking"
 	fluid_transfer_factor = 0.5
 	var/static/list/breast_values = list("a" =  1, "b" = 2, "c" = 3, "d" = 4, "e" = 5, "f" = 6, "g" = 7, "h" = 8, "i" = 9, "j" = 10, "k" = 11, "l" = 12, "m" = 13, "n" = 14, "o" = 15, "huge" = 16, "flat" = 0)

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

@@ -6,7 +6,8 @@
 	zone = BODY_ZONE_PRECISE_GROIN
 	slot = ORGAN_SLOT_PENIS
 	masturbation_verb = "stroke"
-	arousal_verb = "pop a boner"
+	arousal_verb = "You pop a boner"
+	unarousal_verb = "Your boner goes down"
 	genital_flags = CAN_MASTURBATE_WITH|CAN_CLIMAX_WITH
 	linked_organ_slot = ORGAN_SLOT_TESTICLES
 	fluid_transfer_factor = 0.5

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

@@ -6,6 +6,8 @@
 	zone = BODY_ZONE_PRECISE_GROIN
 	slot = ORGAN_SLOT_TESTICLES
 	size = BALLS_SIZE_MIN
+	arousal_verb = "Your balls ache a little"
+	unarousal_verb = "Your balls finally stop aching, again"
 	linked_organ_slot = ORGAN_SLOT_PENIS
 	genital_flags = CAN_MASTURBATE_WITH|MASTURBATE_LINKED_ORGAN|GENITAL_FUID_PRODUCTION
 	var/size_name = "average"

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

@@ -8,7 +8,8 @@
 	size = 1 //There is only 1 size right now
 	genital_flags = CAN_MASTURBATE_WITH|CAN_CLIMAX_WITH
 	masturbation_verb = "finger"
-	arousal_verb = "feel wet"
+	arousal_verb = "You feel wetness on your crotch."
+	unarousal_verb = "You no longer feel wet."
 	fluid_transfer_factor = 0.1 //Yes, some amount is exposed to you, go get your AIDS
 	layer_index = VAGINA_LAYER_INDEX
 	var/cap_length = 8//D   E   P   T   H (cap = capacity)