From e877d7ca0a31102288e47c43c751df0db4a00f4f Mon Sep 17 00:00:00 2001 From: Emmett Gaines Date: Thu, 5 Mar 2020 10:18:07 -0500 Subject: [PATCH] Allows adjusting jumpsuits through the strip panel (#49710) * adjust jumpsuit through strip menu * robot torso fix --- code/modules/mob/living/carbon/human/human.dm | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 7771c380d27..9d093d22ba5 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -167,9 +167,15 @@ if(ITEM_SLOT_ICLOTHING in obscured) dat += "Uniform:Obscured" else - dat += "Uniform:[(w_uniform && !(w_uniform.item_flags & ABSTRACT)) ? w_uniform : "Empty"]" + dat += "Uniform:[(w_uniform && !(w_uniform.item_flags & ABSTRACT)) ? w_uniform : "Empty"]" + if(w_uniform) + var/obj/item/clothing/under/U = w_uniform + if (U.can_adjust) + dat += " Adjust" + dat += "" - if((w_uniform == null && !(dna && dna.species.nojumpsuit)) || (ITEM_SLOT_ICLOTHING in obscured)) + var/obj/item/bodypart/O = get_bodypart(BODY_ZONE_CHEST) + if((w_uniform == null && !(dna && dna.species.nojumpsuit) && !(O && O.status == BODYPART_ROBOTIC)) || (ITEM_SLOT_ICLOTHING in obscured)) dat += " ↳Pockets:" dat += " ↳ID:" dat += " ↳Belt:" @@ -254,6 +260,16 @@ // Display a warning if the user mocks up to_chat(src, "You feel your [pocket_side] pocket being fumbled with!") + if(href_list["toggle_uniform"] && usr.canUseTopic(src, BE_CLOSE, NO_DEXTERITY)) + var/obj/item/clothing/under/U = get_item_by_slot(ITEM_SLOT_ICLOTHING) + to_chat(src, "[usr.name] is trying to adjust your [U].") + if(do_mob(usr, src, U.strip_delay/2)) + to_chat(src, "[usr.name] successfully adjusted your [U].") + U.toggle_jumpsuit_adjust() + update_inv_w_uniform() + update_body() + + ///////HUDs/////// if(href_list["hud"]) if(!ishuman(usr))