vibrators and code optimization!

modular_citadel/code/modules/arousal/arousal.dm

@@ -473,12 +473,27 @@
 	for(var/obj/item/organ/genital/G in internal_organs)
 		if(G.can_masturbate_with) //filter out what you can't masturbate with
 			if(G.is_exposed(worn_stuff)) //Nude or through_clothing
-				genitals_list += G
+				if(!G.dontlist)
+					genitals_list += G
 	if(genitals_list.len)
 		ret_organ = input(src, "with what?", "Masturbate", null)  as null|obj in genitals_list
 		return ret_organ
 	return null //error stuff
 
+/mob/living/carbon/human/proc/target_genitals(mob/living/carbon/human/T) //used for targeting others
+	var/obj/item/organ/genital/ret_organ
+	var/list/genitals_list = list()
+	var/list/worn_stuff = get_equipped_items()
+
+	for(var/obj/item/organ/genital/G in T.internal_organs)
+		if(G.can_climax) //filter out what you can't masturbate with
+			if(G.is_exposed(worn_stuff)) //Nude or through_clothing
+				if(!G.dontlist)
+					genitals_list += G
+	if(genitals_list.len)
+		ret_organ = input(src, "", "Gentials", null)  as null|obj in genitals_list
+		return ret_organ
+	return null //error stuff
 
 /mob/living/carbon/human/proc/pick_climax_genitals()
 	var/obj/item/organ/genital/ret_organ
@@ -488,7 +503,8 @@
 	for(var/obj/item/organ/genital/G in internal_organs)
 		if(G.can_climax) //filter out what you can't masturbate with
 			if(G.is_exposed(worn_stuff)) //Nude or through_clothing
-				genitals_list += G
+				if(!G.dontlist)
+					genitals_list += G
 	if(genitals_list.len)
 		ret_organ = input(src, "with what?", "Climax", null)  as null|obj in genitals_list
 		return ret_organ

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

@@ -15,6 +15,7 @@
 	can_climax				= TRUE
 	fluid_transfer_factor 	= 0.5
 	var/sent_full_message	= TRUE //defaults to 1 since they're full to start
+	dontlist = TRUE
 
 /obj/item/organ/genital/belly/on_life()
 	if(QDELETED(src))

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

@@ -23,6 +23,8 @@
 	var/hidden					= FALSE
 	var/colourtint				= ""
 	var/mode					= "clothes"
+	var/obj/item/equipment 		//for fun stuff that goes on the gentials/maybe rings down the line
+	var/dontlist				= FALSE
 
 /obj/item/organ/genital/Initialize()
 	. = ..()

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

@@ -19,6 +19,7 @@
 	masturbation_verb 		= "massage"
 	can_climax				= TRUE
 	var/sent_full_message	= TRUE //defaults to 1 since they're full to start
+	dontlist = TRUE
 
 
 /obj/item/organ/genital/testicles/on_life()