From 21da7ef6198588111ef043eb05e5cb802929620b Mon Sep 17 00:00:00 2001 From: Putnam Date: Wed, 23 Dec 2020 00:01:59 -0800 Subject: [PATCH 1/5] Actually made it adjustable properly. --- code/modules/clothing/under/miscellaneous.dm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 2a5d6974ef..a9dd19e925 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -171,12 +171,17 @@ can_adjust = TRUE body_parts_covered = CHEST|GROIN -/obj/item/clothing/under/misc/gear_harness/toggle_jumpsuit_adjust() - adjusted = !adjusted - if(adjusted) - body_parts_covered = NONE - else +/obj/item/clothing/under/misc/gear_harness/rolldown() + if(!body_parts_covered) + to_chat(usr, "Your gear harness is now covering your chest and groin.") body_parts_covered = CHEST|GROIN + else + to_chat(usr, "Your gear harness is no longer covering anything.") + body_parts_covered = NONE + if(ishuman(usr)) + var/mob/living/carbon/human/H = usr + H.update_inv_w_uniform() + H.update_body() /obj/item/clothing/under/misc/durathread name = "durathread jumpsuit" From b1bd28be3c5af66063f01d09ec293626a895cd70 Mon Sep 17 00:00:00 2001 From: Putnam Date: Mon, 28 Dec 2020 18:57:48 -0800 Subject: [PATCH 2/5] Makes gear harnesses unusable when unusable --- code/modules/clothing/under/miscellaneous.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index a9dd19e925..6a4672ea12 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -172,6 +172,8 @@ body_parts_covered = CHEST|GROIN /obj/item/clothing/under/misc/gear_harness/rolldown() + if(!can_use(usr)) + return if(!body_parts_covered) to_chat(usr, "Your gear harness is now covering your chest and groin.") body_parts_covered = CHEST|GROIN From 24b14c40e45324945e935e5b156a4366532ed1e8 Mon Sep 17 00:00:00 2001 From: Putnam Date: Mon, 28 Dec 2020 19:02:30 -0800 Subject: [PATCH 3/5] 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, "You cannot wear this suit any differently!") - return - if(toggle_jumpsuit_adjust()) - to_chat(usr, "You adjust the suit to wear it more casually.") - else - to_chat(usr, "You adjust the suit back to normal.") + 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, "You cannot wear this suit any differently!") + return adjusted = !adjusted if(adjusted) + to_chat(usr, "You adjust the suit to wear it more casually.") 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, "You adjust the suit back to normal.") 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, "Your gear harness is now covering your chest and groin.") body_parts_covered = CHEST|GROIN else to_chat(usr, "Your gear harness is no longer covering anything.") 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" From 3a7f360fe995bad96ee650db28de98a605a88404 Mon Sep 17 00:00:00 2001 From: Putnam Date: Mon, 28 Dec 2020 19:06:37 -0800 Subject: [PATCH 4/5] Made the returns make more sense. --- code/modules/clothing/under/_under.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm index 66f9bf15e7..e617d2d57b 100644 --- a/code/modules/clothing/under/_under.dm +++ b/code/modules/clothing/under/_under.dm @@ -244,8 +244,7 @@ /obj/item/clothing/under/proc/rolldown() if(!can_use(usr)) return - toggle_jumpsuit_adjust() - if(ishuman(usr)) + if(toggle_jumpsuit_adjust() && ishuman(usr)) var/mob/living/carbon/human/H = usr H.update_inv_w_uniform() H.update_body() @@ -253,7 +252,7 @@ /obj/item/clothing/under/proc/toggle_jumpsuit_adjust() if(!can_adjust) to_chat(usr, "You cannot wear this suit any differently!") - return + return FALSE adjusted = !adjusted if(adjusted) @@ -271,7 +270,7 @@ if(initial(mutantrace_variation) & USE_TAUR_CLIP_MASK) mutantrace_variation |= USE_TAUR_CLIP_MASK - return adjusted + return TRUE /obj/item/clothing/under/rank dying_key = DYE_REGISTRY_UNDER From f1b7c4aea53828b444703f667b1c40685db0bce1 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sat, 2 Jan 2021 17:30:06 -0800 Subject: [PATCH 5/5] Update miscellaneous.dm --- code/modules/clothing/under/miscellaneous.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 62d17ff8d6..59e0832fef 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -178,7 +178,7 @@ else to_chat(usr, "Your gear harness is no longer covering anything.") body_parts_covered = NONE - return !body_parts_covered + return TRUE /obj/item/clothing/under/misc/durathread name = "durathread jumpsuit"