oh god, oh fuck. why

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

@@ -36,8 +36,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")
@@ -50,10 +48,14 @@
 		desc += " You wouldn't measure them in cup sizes."
 	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]"
+	icon_state = sanitize_text(string)

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

@@ -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)
@@ -318,6 +321,7 @@
 
 			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_[G.aroused_state]_[layertext]"
 			else
 				switch(S.color_src)
 					if("cock_color")

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/penis.dm

@@ -27,7 +27,7 @@
 			size = 1
 		if(5 to 9)
 			size = 2
-		if(9 to INFINITY)
+		if(15 to INFINITY)
 			size = 3//no new sprites for anything larger yet
 /*		if(9 to 15)
 			size = 3
@@ -37,8 +37,7 @@
 	cached_length = length
 
 /obj/item/organ/genital/penis/update_appearance()
-	var/string = "penis_[GLOB.cock_shapes_icons[shape]]_[size]"
-	icon_state = sanitize_text(string)
+	var/string
 	var/lowershape = lowertext(shape)
 	desc = "You see [aroused_state ? "an erect" : "a flaccid"] [lowershape] penis. You estimate it's about [round(length, 0.25)] inch[round(length, 0.25) != 1 ? "es" : ""] long and [round(girth, 0.25)] inch[round(girth, 0.25) != 1 ? "es" : ""] in girth."
 
@@ -47,8 +46,12 @@
 			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 = "penis_[GLOB.cock_shapes_icons[shape]]_[size]-s"
 		else
 			color = "#[owner.dna.features["cock_color"]]"
+			string = "penis_[GLOB.cock_shapes_icons[shape]]_[size]"
+
+	icon_state = sanitize_text(string)
 
 /obj/item/organ/genital/penis/update_link()
 	if(owner)

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,12 @@
 			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"
 
+	icon_state = sanitize_text(string)
 
 /obj/item/organ/genital/vagina/update_link()
 	if(owner)