no comment

modular_citadel/code/modules/arousal/genitals.dm

@@ -1,7 +1,7 @@
 /obj/item/organ/genital
 	color = "#fcccb3"
 	w_class = WEIGHT_CLASS_NORMAL
-	var/shape = "human"
+	var/shape
 	var/sensitivity = 1 // wow if this were ever used that'd be cool but it's not but i'm keeping it for my unshit code
 	var/genital_flags //see citadel_defines.dm
 	var/masturbation_verb = "masturbate"

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

@@ -8,10 +8,10 @@
 	icon = 'modular_citadel/icons/obj/genitals/breasts.dmi'
 	zone = BODY_ZONE_CHEST
 	slot = ORGAN_SLOT_BREASTS
-	size = "c" //refer to the breast_values static list below for the cups associated number values
+	size = BREASTS_SIZE_DEF // "c". Refer to the breast_values static list below for the cups associated number values
 	fluid_id = /datum/reagent/consumable/milk
 	fluid_rate = MILK_RATE
-	shape = "pair"
+	shape = DEF_BREASTS_SHAPE
 	genital_flags = CAN_MASTURBATE_WITH|CAN_CLIMAX_WITH|GENITAL_FUID_PRODUCTION|GENITAL_CAN_AROUSE
 	masturbation_verb = "massage"
 	arousal_verb = "Your breasts start feeling sensitive"

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

@@ -11,6 +11,7 @@
 	genital_flags = CAN_MASTURBATE_WITH|CAN_CLIMAX_WITH|GENITAL_CAN_AROUSE
 	linked_organ_slot = ORGAN_SLOT_TESTICLES
 	fluid_transfer_factor = 0.5
+	shape = DEF_COCK_SHAPE
 	size = 2 //arbitrary value derived from length and diameter for sprites.
 	layer_index = PENIS_LAYER_INDEX
 	var/length = 6 //inches

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

@@ -11,7 +11,7 @@
 	linked_organ_slot = ORGAN_SLOT_PENIS
 	genital_flags = CAN_MASTURBATE_WITH|MASTURBATE_LINKED_ORGAN|GENITAL_FUID_PRODUCTION
 	var/size_name = "average"
-	shape = "Single"
+	shape = DEF_BALLS_SHAPE
 	var/sack_size = BALLS_SACK_SIZE_DEF
 	fluid_id = /datum/reagent/consumable/semen
 	masturbation_verb = "massage"

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

@@ -6,6 +6,7 @@
 	zone = BODY_ZONE_PRECISE_GROIN
 	slot = "vagina"
 	size = 1 //There is only 1 size right now
+	shape = DEF_VAGINA_SHAPE
 	genital_flags = CAN_MASTURBATE_WITH|CAN_CLIMAX_WITH|GENITAL_CAN_AROUSE
 	masturbation_verb = "finger"
 	arousal_verb = "You feel wetness on your crotch"