From 8c60d61428621b6a30a1f2a211fd237d860bbe11 Mon Sep 17 00:00:00 2001
From: QuoteFox <49098813+quotefox@users.noreply.github.com>
Date: Sun, 10 Jan 2021 12:34:36 +0000
Subject: [PATCH] Explode out of clothes contexualized

Explode out of clothes contexualized
---
 .../code/modules/arousal/arousalhud.dm        | 23 +++++++++++++++++--
 .../code/modules/arousal/arousal.dm           |  9 --------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/hyperstation/code/modules/arousal/arousalhud.dm b/hyperstation/code/modules/arousal/arousalhud.dm
index 68a2a19c..15672682 100644
--- a/hyperstation/code/modules/arousal/arousalhud.dm
+++ b/hyperstation/code/modules/arousal/arousalhud.dm
@@ -37,8 +37,10 @@
 	dat	+= "<a href='byond://?src=[REF(src)];container=1'>Fill container</A>"
 	dat	+=	"(Use a container in your hand to collect your seminal fluid.)<BR>"
 
-	dat += "<a href='byond://?src=[REF(src)];clothesplosion=1'>Explode out of clothes</A>"
-	dat	+=	"(Self-explanatory.)<BR>"
+	var/mob/living/carbon/human/C = usr
+	if(C && C.w_uniform || C.wear_suit) //if they are wearing cloths
+		dat += "<a href='byond://?src=[REF(src)];clothesplosion=1'>Explode out of clothes</A>"
+		dat	+=	"(Flex your body to cause your clothes to burst apart.)<BR>"
 
 	if(user.pulling)
 		dat	+= "<a href='byond://?src=[REF(src)];kiss=1'>Kiss [user.pulling]</A>"
@@ -77,6 +79,9 @@
 	popup.open()
 
 
+
+
+
 /obj/screen/arousal/Topic(href, href_list)
 	. = ..() //Sanity checks.
 	if(..())
@@ -350,6 +355,20 @@ obj/screen/arousal/proc/kiss()
 		to_chat(src, "<span class='warning'>You cannot climax without choosing genitals.</span>")
 		return
 
+/mob/living/carbon/human/proc/clothesplosion()
+	if(usr.restrained(TRUE))
+		to_chat(usr, "<span class='warning'>You can't do that while restrained!</span>")
+		return
+	var/mob/living/carbon/human/H = src
+	var/items = H.get_contents()
+	for(var/obj/item/W in items)
+		if(W == H.w_uniform || W == H.wear_suit)
+			H.dropItemToGround(W, TRUE)
+			playsound(H.loc, 'sound/items/poster_ripped.ogg', 50, 1)
+	H.visible_message("<span class='boldnotice'>[H] explodes out of their clothes!'</span>")
+
+
+
 /mob/living/carbon/human/proc/impregwith(mob/living/T)
 
 	var/mob/living/carbon/human/L = pick_partner()
diff --git a/modular_citadel/code/modules/arousal/arousal.dm b/modular_citadel/code/modules/arousal/arousal.dm
index f5406f46..7c995246 100644
--- a/modular_citadel/code/modules/arousal/arousal.dm
+++ b/modular_citadel/code/modules/arousal/arousal.dm
@@ -464,15 +464,6 @@
 		if(G.can_climax)
 			setArousalLoss(min_arousal)
 
-/mob/living/carbon/human/proc/clothesplosion()
-	var/mob/living/carbon/human/that_guy = src
-	var/items = that_guy.get_contents()
-	for(var/obj/item/W in items)
-		if(W == that_guy.w_uniform || W == that_guy.wear_suit)
-			that_guy.dropItemToGround(W, TRUE)
-			playsound(that_guy.loc, 'sound/items/poster_ripped.ogg', 50, 1)
-			that_guy.visible_message("<span class='boldnotice'>[that_guy] explodes out of their clothes!'</span>")
-	
 
 /mob/living/carbon/human/proc/pick_masturbate_genitals()
 	var/obj/item/organ/genital/ret_organ