From f8d9eecec5cff0b7687ba79349ff15ebf774a383 Mon Sep 17 00:00:00 2001
From: sarcoph <83266791+sarcoph@users.noreply.github.com>
Date: Wed, 4 May 2022 15:38:46 -0800
Subject: [PATCH] fixing arousal% redundancy + butt sprite

---
 .../code/modules/arousal/arousalhud.dm        |  16 ++---
 hyperstation/icons/obj/genitals/butt.dmi      | Bin 2723 -> 2632 bytes
 .../code/modules/arousal/arousal.dm           |  55 +++++-------------
 3 files changed, 22 insertions(+), 49 deletions(-)

diff --git a/hyperstation/code/modules/arousal/arousalhud.dm b/hyperstation/code/modules/arousal/arousalhud.dm
index 802f43c90..264735710 100644
--- a/hyperstation/code/modules/arousal/arousalhud.dm
+++ b/hyperstation/code/modules/arousal/arousalhud.dm
@@ -140,7 +140,7 @@
 		T.toggle_visibility(picked_visibility)
 
 	if(href_list["masturbate"])
-		if (H.arousalloss >= (H.max_arousal / 100) * 33) //requires 33% arousal.
+		if (H.arousalloss >= H.isPercentAroused(33)) //requires 33% arousal.
 			H.solomasturbate()
 			return
 		else
@@ -148,7 +148,7 @@
 		return
 
 	if(href_list["container"])
-		if (H.arousalloss >= (H.max_arousal / 100) * 33) //requires 33% arousal.
+		if (H.arousalloss >= H.isPercentAroused(33)) //requires 33% arousal.
 			H.cumcontainer()
 			return
 		else
@@ -156,7 +156,7 @@
 		return
 
 	if(href_list["clothesplosion"])
-		if (H.arousalloss >= (H.max_arousal / 100) * 33) //Requires 33% arousal.
+		if (H.arousalloss >= H.isPercentAroused(33)) //Requires 33% arousal.
 			H.clothesplosion()
 			return
 		else
@@ -164,7 +164,7 @@
 		return
 
 	if(href_list["climaxself"])
-		if (H.arousalloss >= (H.max_arousal / 100) * 33) //requires 33% arousal.
+		if (H.arousalloss >= H.isPercentAroused(33)) //requires 33% arousal.
 			H.climaxself()
 			return
 		else
@@ -172,7 +172,7 @@
 		return
 
 	if(href_list["climax"])
-		if (H.arousalloss >= (H.max_arousal / 100) * 33) //requires 33% arousal.
+		if (H.arousalloss >= H.isPercentAroused(33)) //requires 33% arousal.
 			H.climaxalone(FALSE)
 			return
 		else
@@ -180,7 +180,7 @@
 		return
 
 	if(href_list["climaxover"])
-		if (H.arousalloss >= (H.max_arousal / 100) * 33) //requires 33% arousal.
+		if (H.arousalloss >= H.isPercentAroused(33)) //requires 33% arousal.
 			H.climaxover(usr.pulling)
 			return
 		else
@@ -188,7 +188,7 @@
 		return
 
 	if(href_list["climaxwith"])
-		if (H.arousalloss >= (H.max_arousal / 100) * 33) //requires 33% arousal.
+		if (H.arousalloss >= H.isPercentAroused(33)) //requires 33% arousal.
 			H.climaxwith(usr.pulling)
 			return
 		else
@@ -196,7 +196,7 @@
 		return
 
 	if(href_list["impreg"])
-		if (H.arousalloss >= (H.max_arousal / 100) * 33) //requires 33% arousal.
+		if (H.arousalloss >= H.isPercentAroused(33)) //requires 33% arousal.
 			H.impregwith(usr.pulling)
 			return
 		else
diff --git a/hyperstation/icons/obj/genitals/butt.dmi b/hyperstation/icons/obj/genitals/butt.dmi
index 55f746287107b430642fff05e2deb7ac3e4c76b4..186dfffbdb6901e95ddf5a6bf07b4a189f64db8c 100644
GIT binary patch
delta 2502
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
W6q$SlyfzK}=bpKlwP}Shn(#l}Tjr7g

delta 2593
zcmZWoXH=7k77QdH)gUB-0s<1HNCzp>1wopEAOWdT6{SdxlJFU6QU#<(DWWL7!-AA3
zy(_S^EF|=$83Z(h1oC|E>^Zw<-~Dyx&%HBqX8K@7@Dv0m($d`K8VCepcqymKSiw*J
zG==;^Ou@HqScCLdr@elG-qbXCU^+8<V;c#ZtvK{u!w+_1^{$4Ft;u-zUnnYi6p7K9
zPVF}^?DudW4kwV(gL~#RJLDq$TXT9v3*I*PW%p*M;T}Ax8zGWbhVBj5&o~k1r>vZ8
zO5}hVy5QP1`**ZOfmC<H)#pQ}>_uz!JmUIzQ{m??876O>d$Msv4eXi+Ub$cC4aTlB
zk6$P@Ge>4uHtwgaYuW3(gBH42ZT&1h76yUXB}@$UZBVbaUt`_gsKc%)8jLx)NcH7L
z-(fH`DQ$>bgwiN)<+0b{Ef<_P6*Um}KV@xkXQTsggm}?_OpB1tufs0S@Wm~1>zm|6
z#dm`H<I^@s?uerd>W@u;pDV&cS#}k0_c?9XNjjnGJ(%NSN7<hu0@@lh!Q3A~(`ZRQ
z9lyNBeKp^F1<2?OTH0Ux;h)s?91<Cflh<_w(z*Q>$b2|XU8jiZz)G<<J<Y@~<@uc#
zeEDzh?ueIe=4J^*c|UAFMlTea(remW0)?$RNoQQ3m@H^aG2pks$6d)noIxLV$U_ae
za*7)-e-Cq4fDox@YT!y>&qRYV`eZ62u}l#nQOnX2&oW^0Rxu+IA2%fRu&;akx_Y$w
z&_dkM%jaS^dYnEdmM<qu(THB7KX}|F3d!qhO;No|w;-aNLe5k212398mv(j-1)O{=
zLFtY{K@i5kx)w8Uv%Gio0|6gL8PS0AG?v?ZF7fPU2jLQo3z%^geOEBBCWEr>=gHxZ
zMAqrll6)<C!8_5hqRy7u-k$_Fc~Eimd$B=i_}=F!MU(~O)mA|2(qL95OCwqs97*=*
zB{-5UoQ6JB_?5W7XQ$U)Cj&Se16(bPAZq#o#@vk;a~)zo*fMI|3>M5jQn`{hEGK6v
zzQZ<HTUV#iL-)v#igM>bizGu_I)P{u=skv(3TExlC(%J%2A1}1h)qOs_ICt_xf=Uc
zFf#&g8^;oY>hlUos<*Z?%I|^=CgORXs)$`L71qC~;@bwqc-(5Ow4?z;h=2;_Z_!~2
zVb#+oGhuBeW(9Y*m3jVV`qzdp>gTGsS0_6X+U3&tg&XV`ubQfw=cR0Y6S?;|&>!Et
z{37FH(>m9cjh2|)%1c2+n1OYRdDd`sh##Yh{dv>-R{O}Lu$qbb(U6c~R!u1m0T^K2
zeiQJl9w9T}Obe^=dvHm<w2N%N9LMgPz^=pR#1)ztNQio^2Hb8ArlJ+8X=-M{67+li
z3eDywzD~K0ft-328v0~_Nl#Gh+lTv(<Cbwu2f|Dy5B3iIt29IFB-qM2d{en}PTP5b
zY>BDlpvOnRv~TRR>)u#!_ikAFjq{#Lz{LM41)WRmZw|`Z`2Y<Kny{i*4LR(E&C|`_
z2+yH?5N~ldqa?)d<0g&9;XzGuE3^R*<sqqC1w&rfRbmLL{KJ157F=xQS$eE0bD4F<
zWr)&W`}ETRwfi=#utb+j@3?*aV(3-zFCpH{mswxxS(^i{bo!#{5w#n^Cu3Gn-u&B>
z9K4$xe2~EJ6)-@73t}ngh#GN@Cw^6Mh|jGFxlp=|jK7O#t`rfuxa34;(B1eUBNcFn
z^r1X0w(p9dX-HSSYdcv`rz1PImu@<nz-ByoXH7`HAxo?^78l=pw~#(JtJ`7cCEwj$
zgbR!Y8i0rzGv=uc=)Zli%-%u~mzX0w6}_oC*BGb=Ca;&5X)QPS@*XvsQG49N6k0i(
zsZ;4>>wR+i4cstAYVW>S!$fLQ_aRqtz-{;*CjL|!#H(xEhS_O$tj7(*YH=h+Y|<iS
zEn@7M;Y_;xlo2T+(A17H62iVm=X*ioGqkX^#cq(i722dav*49M%6(=ZUi={JL*JSS
zDy7Y&{pP?AcCLkbDdKz1>sQot)eKt9gHCktkj<z%A^0lERT*Ma&tSd6V<}mYx$J~&
zDPofmuuj%`bxhX!w>%K&kN$7g>_BGC<~X!%lBBEsBWQC+nju+M^%HY2=I5O2Boa<6
zWAQo|bX-4Ai!ckHt(+u{NMN01t4B{|*Nv^nHW9XyI~oXCUQJ|e{&wQ#`+$)<8&Wbw
z{t`u&&6r1_&bf_9D1K~5(ThQL2BN4-Gp9zA=JG`USuWr&UMNT;G+Lw{UQcY9<?m^v
zRJHpXul#&>=6!HRZM5u<`O)e7ZDbSg6vC7Uy%5<{rBEcnu`VqaEW1^*=IcLuzd6(s
z?~le{JR>oq-O}7Aj}X;U7H;PRHJIDvNNTOToI=m^e&`n?z@xH$XTrBKj6Z#C(qML&
z13+s(zn?QTyG=9g)Kp{J`du^o#cohh0`f~9BxYXZ<kA9ZN(0m>x9TLAWok4T6wYm1
zuKl#1<c=*9ep;IVZPh9dIg#)Qtmfaa4gNomtNo1fcQG5N+))RAxzC}|->EY+Bso8S
zFsdx3gwYZ<{}`ZIv$UK=oJoI4eu++bbBO&x1p_sod1sz|vfj`wIn+I<L+6*W&L~{U
zGfLO6(QWWIbF<838Iuj8=-QGlRq+e3B4hC5mQ(fq&*3oMKGx1#@|I(_?_jkwmG>~Y
zkp)6`yBwuq+qepsi6kHF*FOTJRqA~;HGf-{oGHC=9t?;axwVgqa0r2$pL|oFl0Oc<
zsSu^D`9}@VtGI?x@&Ts>@}7ZS>v4gHS(dtdj9lEY5-yD39BbIHEXRPMey329ig*TF
zj0$++-wk@&ptRh+aL7O}$$z9xLHd#~N)tPKlH?=hn4LtK_+{Gsd@%}`ClGdrmn<5T
zXn@sIvP(E|)L8kjdU5x3@<JS;TE=xp)?*N2!Y->O**37v@MKb|K18-?r!+r$V=tC+
z<Qqre&m{Wq_{I-+r_Z@X-tG0GFw#Id4%)*=y*BB5)ffu{ba^5kO4W(h>v+q^noRS^
z7%jm!on>-Y4?R?r0XW(Atw@R-`w1*D;=!Q|`ExzJjj!`x)f$y)a3+cg%p~8Xz<H)2
z*x?#>X57k&Pc_42#$_h=ksL<?O;PK+z^wfuVoXJceLv}Q{#(HyT9t+Ryoo@hd+K+I
z*0`&uB@b1OBS7xFcJ~<l(IlJ@7o+O<pD_viA1IJ9-qZ&6#t2JAf_q?-5@DQ@)(gLp
z7vcx*L8=)Fzoopyi$gZldrCIn?|$Vzyf3tr1g&^w3Sn~``0B8V(lTWNIFgsgVLu_j
l*<}6K_o8%voh1n#Ks#r%-kCEEn*H~S$+a7Xl~-M#{RbWj&DH<_

diff --git a/modular_citadel/code/modules/arousal/arousal.dm b/modular_citadel/code/modules/arousal/arousal.dm
index 34e2dbbe9..7bd960a09 100644
--- a/modular_citadel/code/modules/arousal/arousal.dm
+++ b/modular_citadel/code/modules/arousal/arousal.dm
@@ -62,7 +62,6 @@
 
 /mob/living/proc/handle_arousal()
 
-
 /mob/living/carbon/handle_arousal()
 	if(canbearoused && dna)
 		var/datum/species/S
@@ -110,6 +109,9 @@
 	if(updating_arousal)
 		updatearousal()
 
+/**
+	* despite the name of this, it actually returns a number between 0 and 100
+  */
 /mob/living/proc/getPercentAroused()
 	var/percentage = ((100 / max_arousal) * arousalloss)
 	return percentage
@@ -127,7 +129,6 @@
 
 /mob/living/carbon/updatearousal()
 	. = ..()
-
 	for(var/obj/item/organ/genital/G in internal_organs)
 		if(istype(G))
 			var/datum/sprite_accessory/S
@@ -142,7 +143,7 @@
 					S = GLOB.breasts_shapes_list[G.shape]
 			if(S?.alt_aroused)
 				G.aroused_state = isPercentAroused(G.aroused_amount)
-			if(getArousalLoss() >= ((max_arousal / 100) * 33))
+			if(getArousalLoss() >= isPercentAroused(33))
 				G.aroused_state = TRUE
 			else
 				G.aroused_state = FALSE
@@ -166,41 +167,13 @@
 		return FALSE
 	else
 		if(hud_used.arousal)
-			if(stat == DEAD)
-				hud_used.arousal.icon_state = "arousal0"
-				return TRUE
-			if(getArousalLoss() == max_arousal)
-				hud_used.arousal.icon_state = "arousal100"
-				return TRUE
-			if(getArousalLoss() >= (max_arousal / 100) * 90)//M O D U L A R ,   W O W
-				hud_used.arousal.icon_state = "arousal90"
-				return TRUE
-			if(getArousalLoss() >= (max_arousal / 100) * 80)//M O D U L A R ,   W O W
-				hud_used.arousal.icon_state = "arousal80"
-				return TRUE
-			if(getArousalLoss() >= (max_arousal / 100) * 70)//M O D U L A R ,   W O W
-				hud_used.arousal.icon_state = "arousal70"
-				return TRUE
-			if(getArousalLoss() >= (max_arousal / 100) * 60)//M O D U L A R ,   W O W
-				hud_used.arousal.icon_state = "arousal60"
-				return TRUE
-			if(getArousalLoss() >= (max_arousal / 100) * 50)//M O D U L A R ,   W O W
-				hud_used.arousal.icon_state = "arousal50"
-				return TRUE
-			if(getArousalLoss() >= (max_arousal / 100) * 40)//M O D U L A R ,   W O W
-				hud_used.arousal.icon_state = "arousal40"
-				return TRUE
-			if(getArousalLoss() >= (max_arousal / 100) * 30)//M O D U L A R ,   W O W
-				hud_used.arousal.icon_state = "arousal30"
-				return TRUE
-			if(getArousalLoss() >= (max_arousal / 100) * 20)//M O D U L A R ,   W O W
-				hud_used.arousal.icon_state = "arousal10"
-				return TRUE
-			if(getArousalLoss() >= (max_arousal / 100) * 10)//M O D U L A R ,   W O W
-				hud_used.arousal.icon_state = "arousal10"
-				return TRUE
-			else
-				hud_used.arousal.icon_state = "arousal0"
+			var/arousal_state = "arousal0"
+			if(!stat == DEAD)
+				var/arousal_percent = getPercentAroused()
+				var/arousal_rounded = FLOOR(arousal_percent, 10)
+				arousal_state = "arousal[arousal_rounded]"
+			hud_used.arousal.icon_state = arousal_state
+			return TRUE
 
 /obj/screen/arousal
 	name = "arousal"
@@ -227,12 +200,12 @@
 		if(mb_cd_timer <= world.time)
 			//start the cooldown even if it fails
 			mb_cd_timer = world.time + mb_cd_length
-			if(getArousalLoss() >= ((max_arousal / 100) * 33))//33% arousal or greater required
+			if(getArousalLoss() >= isPercentAroused(33))//33% arousal or greater required
 				src.visible_message("<span class='danger'>[src] starts masturbating!</span>", \
-								"<span class='userdanger'>You start masturbating.</span>")
+					"<span class='userdanger'>You start masturbating.</span>")
 				if(do_after(src, 30, target = src))
 					src.visible_message("<span class='danger'>[src] relieves [p_them()]self!</span>", \
-								"<span class='userdanger'>You have relieved yourself.</span>")
+						"<span class='userdanger'>You have relieved yourself.</span>")
 					SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm)
 					setArousalLoss(min_arousal)
 			else