From 4cefeb9ce20f778fde640104b2e4f9385d32ade2 Mon Sep 17 00:00:00 2001
From: Ghommie <Ghombeat@Gmail.com>
Date: Fri, 18 Jan 2019 06:54:48 +0100
Subject: [PATCH 1/2] 1

---
 .../code/modules/arousal/arousal.dm           |  18 ++++++++++++++++++
 .../code/modules/arousal/organs/genitals.dm   |   4 ----
 .../organs/genitals_sprite_accessories.dm     |   3 ++-
 .../icons/obj/genitals/breasts_onmob.dmi      | Bin 668 -> 753 bytes
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/modular_citadel/code/modules/arousal/arousal.dm b/modular_citadel/code/modules/arousal/arousal.dm
index 7ef696ee91..a625829577 100644
--- a/modular_citadel/code/modules/arousal/arousal.dm
+++ b/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
 
diff --git a/modular_citadel/code/modules/arousal/organs/genitals.dm b/modular_citadel/code/modules/arousal/organs/genitals.dm
index b43f17e58a..c10d444f07 100644
--- a/modular_citadel/code/modules/arousal/organs/genitals.dm
+++ b/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)
diff --git a/modular_citadel/code/modules/arousal/organs/genitals_sprite_accessories.dm b/modular_citadel/code/modules/arousal/organs/genitals_sprite_accessories.dm
index 7c02b1c3a5..890f7da9e6 100644
--- a/modular_citadel/code/modules/arousal/organs/genitals_sprite_accessories.dm
+++ b/modular_citadel/code/modules/arousal/organs/genitals_sprite_accessories.dm
@@ -1,4 +1,4 @@
-/datum/sprite_accessory
+/datum/
 	var/alt_aroused = FALSE //CIT CODE if this is TRUE, then the genitals will use an alternate icon_state when aroused.
 
 
@@ -100,6 +100,7 @@
 /datum/sprite_accessory/breasts/pair
 	icon_state = "pair"
 	name = "Pair"
+	alt_aroused = TRUE
 
 
 //OVIPOSITORS BE HERE
diff --git a/modular_citadel/icons/obj/genitals/breasts_onmob.dmi b/modular_citadel/icons/obj/genitals/breasts_onmob.dmi
index d0597e1a38a32ad8a15943ef75964681fa21dc2f..2a7342553bedc478e6e7c2c14fe23ee8fe80511a 100644
GIT binary patch
literal 753
zcmV<N0uKF&P)<h;3K|Lk000e1NJLTq00961007_w0{{R39&e>%0000LP)t-s{{a8+
z@bJ;m(f|MdzrVlQ+S;<RvSf0b4FCWD0d!JMQvg8b*k%9#0IPabSad{Xb7OL8aCB*J
zZU6vyoSl<B55gc6MQ8XGq}@%ct}YE#8N|f66DUt%@FPI<@7wBZjCZ?txbNf)uNGau
zQCi5I;txtW-mYRLma~SlXY?hEWijV0P&|k7DY@7}W2{^vn@cu#8<Vl7G3&!#A1ls$
zOnJJ(*(uozO}YI#Ymu45Xbz(d7;V649;11j*7aMZ<^MQjN0=R9b_CkdPrF+5TE5@r
z1w#V++%z|r-2eaq(@8`@RCt{2+(B>JKoExE!6rUufpB(+)H8Hx&t5@u4l4BQBn|)n
zCp4C#WXDY=me$2d^*%C|2KgJC<6wJ5008(9Mo*ui@{+BW>#z19`9)mqmc8ah+_^iq
z8%)2))%~j9yeuRu?FRY;BiC;p00000@EM%lyj`W|bKh*HTsP3;b!uL&HcP)L?FM?h
z)(ukgGIr(V%*;zr6a7>lothWf%DA!{><@8u_|b1300000Fu3gLGgMx#n)$vo56Qp9
z)z8*=o|u>LINyiLY~b~Lum6rn&C9iu(cElM-0BAq=5?QWk)sr?Z`yv{#?}0x-+Tub
z`T>O9sq+8;008j6%O2;Z$vekbx8GCqvT5e~%FMUsdp%yK<~z*yXTjGmRpDpq2c_oa
z&Xt#wS}glRbb@i~_Iqkxiet0c4YqN$)eTbf000000Q{wT-VKxI0ssI2004MRzKE+u
zdv(3UeDIR5Dzkx)-yg_)>+$}?e24r0BNx9QaPReEd#QN|?q=ug24T8>sWz*bzJSEM
z{65qV``T(CU*Z)G!sM>ke3u6hvSW0D;#l^Y??f%y5Kf;500000oL2R`8zw*e1vKvh
jytm-szsv&wfK&PdIMr7V0^cM>00000NkvXXu0mjffUj@3

literal 668
zcmV;N0%QG&P)<h;3K|Lk000e1NJLTq006)M005u_0{{R3s0My+0000OP)t-s{{a8+
z@bLft|IyLWzrVlQ+S;<Rvi|`8em!$>00001bW%=J06^y0W&i*HmU>iJbVOxyV{&P5
zbZKvH004NLQ&w<tb@%jBaPjrzDoZUY&dkqKuvIY8GvMMZ&rB)F0CJ3txHvOXGt)Cl
zAe`co#FA7XQz@w^HL<v)IKCh;vnW0>-XPvB$lotSiHkEOv#1zk3KwTuQDSZ?h;4{N
zTM~KNlF8GSLcTU9R}W7=7t-{ll4o5iLF<$iT>V_YaRvaC)P<o*4=3pW00EFmL_t(&
zf$iH(Z-PJ&2H*vhv#aPCx3*_LlAc*Yd)7vJMy>q+pHNAR&VbIUHEA2)CrC2c8HVF*
z7L@`3co^RPcPrmimmnC$qbJ8R`ZQX^Y;l^#CLK%Vx}!UCgYFBB)<d?~(&I@amd{im
zzCiT~H1afG%~UIq>j3}&001u4o}Z6Yu>bvp&l|*Saazs)@^tJ!)952^Ch+l`C)nNm
zZxgYB;q}e!h-DLhmrwieT6qJpLAc@@ltEF?Smrd!-}q{&!bS!6xuVfvD`(%J&o?NG
zyEgy;004kLA=u4*Jx7i--aDn${GW&^wfSE>El|nfw&$Mz+tw7vC^XUhZ0e~78$F)%
zic_fv%bXOn>f^nuL0DFo+#sV-CN}^80002^MgELNv-rAdyW2ku6EVfm^M%03`-f%&
z=l;Rd^Z;RPTwfE_8|e8$%MEOIbd1trbX|k5yx1-aG3Awh!DM@ztDb+!1|=xT3xuWP
zbEsReLm7Mj=K}x$0Kj8P4!8f>pgJqS9|`~f9?3TX?J0F7vv17+0000<MNUMnLSTXf
C#x)55


From 4bd1af0915ca64c3e61c4a6044c8e33f353780a8 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Sat, 19 Jan 2019 00:55:15 +0100
Subject: [PATCH 2/2] purifies /datum from this filth.

---
 .../code/modules/arousal/organs/genitals_sprite_accessories.dm  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modular_citadel/code/modules/arousal/organs/genitals_sprite_accessories.dm b/modular_citadel/code/modules/arousal/organs/genitals_sprite_accessories.dm
index 890f7da9e6..bcfa462789 100644
--- a/modular_citadel/code/modules/arousal/organs/genitals_sprite_accessories.dm
+++ b/modular_citadel/code/modules/arousal/organs/genitals_sprite_accessories.dm
@@ -1,4 +1,4 @@
-/datum/
+/datum/sprite_accessory
 	var/alt_aroused = FALSE //CIT CODE if this is TRUE, then the genitals will use an alternate icon_state when aroused.