From 24b14c40e45324945e935e5b156a4366532ed1e8 Mon Sep 17 00:00:00 2001
From: Putnam <putnam3145@gmail.com>
Date: Mon, 28 Dec 2020 19:02:30 -0800
Subject: [PATCH] Rearranged rolldown and toggle_jumpsuit_adjust to be sane.

---
 code/modules/clothing/under/_under.dm        | 13 ++++++-------
 code/modules/clothing/under/miscellaneous.dm |  9 ++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm
index 23cb2b1c15..66f9bf15e7 100644
--- a/code/modules/clothing/under/_under.dm
+++ b/code/modules/clothing/under/_under.dm
@@ -244,28 +244,27 @@
 /obj/item/clothing/under/proc/rolldown()
 	if(!can_use(usr))
 		return
-	if(!can_adjust)
-		to_chat(usr, "<span class='warning'>You cannot wear this suit any differently!</span>")
-		return
-	if(toggle_jumpsuit_adjust())
-		to_chat(usr, "<span class='notice'>You adjust the suit to wear it more casually.</span>")
-	else
-		to_chat(usr, "<span class='notice'>You adjust the suit back to normal.</span>")
+	toggle_jumpsuit_adjust()
 	if(ishuman(usr))
 		var/mob/living/carbon/human/H = usr
 		H.update_inv_w_uniform()
 		H.update_body()
 
 /obj/item/clothing/under/proc/toggle_jumpsuit_adjust()
+	if(!can_adjust)
+		to_chat(usr, "<span class='warning'>You cannot wear this suit any differently!</span>")
+		return
 	adjusted = !adjusted
 
 	if(adjusted)
+		to_chat(usr, "<span class='notice'>You adjust the suit to wear it more casually.</span>")
 		if(fitted != FEMALE_UNIFORM_TOP)
 			fitted = NO_FEMALE_UNIFORM
 		if(!alt_covers_chest) // for the special snowflake suits that expose the chest when adjusted
 			body_parts_covered &= ~CHEST
 			mutantrace_variation &= ~USE_TAUR_CLIP_MASK //How are we supposed to see the uniform otherwise?
 	else
+		to_chat(usr, "<span class='notice'>You adjust the suit back to normal.</span>")
 		fitted = initial(fitted)
 		if(!alt_covers_chest)
 			body_parts_covered |= CHEST
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 6a4672ea12..62d17ff8d6 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -171,19 +171,14 @@
 	can_adjust = TRUE
 	body_parts_covered = CHEST|GROIN
 
-/obj/item/clothing/under/misc/gear_harness/rolldown()
-	if(!can_use(usr))
-		return
+/obj/item/clothing/under/misc/gear_harness/toggle_jumpsuit_adjust()
 	if(!body_parts_covered)
 		to_chat(usr, "<span class='notice'>Your gear harness is now covering your chest and groin.</span>")
 		body_parts_covered = CHEST|GROIN
 	else
 		to_chat(usr, "<span class='notice'>Your gear harness is no longer covering anything.</span>")
 		body_parts_covered = NONE
-	if(ishuman(usr))
-		var/mob/living/carbon/human/H = usr
-		H.update_inv_w_uniform()
-		H.update_body()
+	return !body_parts_covered
 
 /obj/item/clothing/under/misc/durathread
 	name = "durathread jumpsuit"