Rearranged rolldown and toggle_jumpsuit_adjust to be sane.

This commit is contained in:
Putnam
2020-12-28 19:02:30 -08:00
parent b1bd28be3c
commit 24b14c40e4
2 changed files with 8 additions and 14 deletions
+6 -7
View File
@@ -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
+2 -7
View File
@@ -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"