Merge pull request #7945 from Ghommie/Ghommie-cit2

Fixes a perpetual lack of moisture.

modular_citadel/code/modules/arousal/arousal.dm

@@ -90,6 +90,24 @@
 /mob/living/proc/updatearousal()
 	update_arousal_hud()
 
+/mob/living/carbon/updatearousal()
+	. = ..()
+	for(var/obj/item/organ/genital/G in internal_organs)
+		if(istype(G))
+			var/datum/sprite_accessory/S
+			switch(G.type)
+				if(/obj/item/organ/genital/penis)
+					S = GLOB.cock_shapes_list[G.shape]
+				if(/obj/item/organ/genital/vagina)
+					S = GLOB.vagina_shapes_list[G.shape]
+				if(/obj/item/organ/genital/breasts)
+					S = GLOB.breasts_shapes_list[G.shape]
+			if(S?.alt_aroused)
+				G.aroused_state = isPercentAroused(G.aroused_amount)
+			else
+				G.aroused_state = FALSE
+			G.update_appearance()
+
 /mob/living/proc/update_arousal_hud()
 	return 0
 

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

@@ -311,10 +311,6 @@
 			if(!S || S.icon_state == "none")
 				continue
 			var/mutable_appearance/genital_overlay = mutable_appearance(S.icon, layer = -layer)
-			if(S.alt_aroused)
-				G.aroused_state = H.isPercentAroused(G.aroused_amount)
-			else
-				G.aroused_state = FALSE
 			genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size]_[G.aroused_state]_[layertext]"
 
 			if(S.center)

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

@@ -100,6 +100,7 @@
 /datum/sprite_accessory/breasts/pair
 	icon_state = "pair"
 	name = "Pair"
+	alt_aroused = TRUE
 
 
 //OVIPOSITORS BE HERE