From 07c2085bf1659ce531557807fffebad67e3ef868 Mon Sep 17 00:00:00 2001 From: ppi13 Date: Mon, 11 Dec 2023 18:05:58 +0100 Subject: [PATCH] You can now equip belts and tanks onto naked people (#23468) * You can now equip belts and tanks onto naked people * Forgot to add back something i moved. * Turns majuscules to minuscule in HTML tags --- .../mob/living/carbon/human/human_mob.dm | 94 ++++++++++--------- 1 file changed, 49 insertions(+), 45 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_mob.dm b/code/modules/mob/living/carbon/human/human_mob.dm index 3a9e51f027a..b03ec373bcc 100644 --- a/code/modules/mob/living/carbon/human/human_mob.dm +++ b/code/modules/mob/living/carbon/human/human_mob.dm @@ -302,127 +302,131 @@ var/list/obscured = check_obscured_slots() var/dat = {" - - + + "} - dat += "" - dat += "" + dat += "" var/obj/item/organ/internal/headpocket/C = get_int_organ(/obj/item/organ/internal/headpocket) if(C) if(SLOT_HUD_WEAR_MASK in obscured) - dat += "" + dat += "" else if(C.held_item) - dat += "" + dat += "" else - dat += "" + dat += "" if(SLOT_HUD_WEAR_MASK in obscured) - dat += "" + dat += "" else - dat += "" if(!issmall(src)) if(SLOT_HUD_GLASSES in obscured) - dat += "" + dat += "" else - dat += "" + dat += "" if(SLOT_HUD_LEFT_EAR in obscured) - dat += "" + dat += "" else - dat += "" + dat += "" if(SLOT_HUD_RIGHT_EAR in obscured) - dat += "" + dat += "" else - dat += "" + dat += "" dat += "" - dat += "" + dat += "" if(wear_suit) - dat += "" else - dat += "" + dat += "" if(SLOT_HUD_SHOES in obscured) - dat += "" + dat += "" else - dat += "" + dat += "" if(SLOT_HUD_GLOVES in obscured) - dat += "" + dat += "" else - dat += "" + dat += "" + + if(SLOT_HUD_BELT in obscured) + dat += "" + else + dat += "" if(SLOT_HUD_JUMPSUIT in obscured) - dat += "" + dat += "" else - dat += "" + dat += "" if((w_uniform == null && !(dna && dna.species.nojumpsuit)) || (SLOT_HUD_JUMPSUIT in obscured)) - dat += "" - dat += "" - dat += "" - dat += "" - dat += "" + dat += "" + dat += "" + dat += "" + dat += "" else - dat += "" // Pockets - dat += "" - dat += "" - dat += "" + dat += "" + dat += "" + dat += "" if(istype(w_uniform, /obj/item/clothing/under)) var/obj/item/clothing/under/U = w_uniform - dat += "" + dat += "" if(U.accessories.len) - dat += "" + dat += "" if(handcuffed) - dat += "" + dat += "" if(legcuffed) dat += "" dat += {"
Left Hand:[(l_hand && !(l_hand.flags&ABSTRACT)) ? html_encode(l_hand) : "Empty"]
Right Hand:[(r_hand && !(r_hand.flags&ABSTRACT)) ? html_encode(r_hand) : "Empty"]
Left Hand:[(l_hand && !(l_hand.flags&ABSTRACT)) ? html_encode(l_hand) : "Empty"]
Right Hand:[(r_hand && !(r_hand.flags&ABSTRACT)) ? html_encode(r_hand) : "Empty"]
 
Back:[(back && !(back.flags&ABSTRACT)) ? html_encode(back) : "Empty"]" + dat += "
Back:[(back && !(back.flags&ABSTRACT)) ? html_encode(back) : "Empty"]" if(has_breathable_mask && istype(back, /obj/item/tank)) - dat += " [internal ? "Disable Internals" : "Set Internals"]" + dat += " [internal ? "Disable Internals" : "Set Internals"]" dat += "
 
Head:[(head && !(head.flags&ABSTRACT)) ? html_encode(head) : "Empty"]
Head:[(head && !(head.flags&ABSTRACT)) ? html_encode(head) : "Empty"]
 ↳Headpocket:Obscured
 ↳Headpocket:Obscured
 ↳Headpocket:Dislodge Items
 ↳Headpocket:Dislodge Items
 ↳Headpocket:Empty
 ↳Headpocket:Empty
Mask:Obscured
Mask:Obscured
Mask:[(wear_mask && !(wear_mask.flags&ABSTRACT)) ? html_encode(wear_mask) : "Empty"]" + dat += "
Mask:[(wear_mask && !(wear_mask.flags&ABSTRACT)) ? html_encode(wear_mask) : "Empty"]" if(istype(wear_mask, /obj/item/clothing/mask/muzzle)) var/obj/item/clothing/mask/muzzle/M = wear_mask if(M.security_lock) - dat += " [M.locked ? "Disable Lock" : "Set Lock"]" + dat += " [M.locked ? "Disable Lock" : "Set Lock"]" dat += "
 
Eyes:Obscured
Eyes:Obscured
Eyes:[(glasses && !(glasses.flags&ABSTRACT)) ? html_encode(glasses) : "Empty"]
Eyes:[(glasses && !(glasses.flags&ABSTRACT)) ? html_encode(glasses) : "Empty"]
Left Ear:Obscured
Left Ear:Obscured
Left Ear:[(l_ear && !(l_ear.flags&ABSTRACT)) ? html_encode(l_ear) : "Empty"]
Left Ear:[(l_ear && !(l_ear.flags&ABSTRACT)) ? html_encode(l_ear) : "Empty"]
Right Ear:Obscured
Right Ear:Obscured
Right Ear:[(r_ear && !(r_ear.flags&ABSTRACT)) ? html_encode(r_ear) : "Empty"]
Right Ear:[(r_ear && !(r_ear.flags&ABSTRACT)) ? html_encode(r_ear) : "Empty"]
 
Exosuit:[(wear_suit && !(wear_suit.flags&ABSTRACT)) ? html_encode(wear_suit) : "Empty"]
Exosuit:[(wear_suit && !(wear_suit.flags&ABSTRACT)) ? html_encode(wear_suit) : "Empty"]
 ↳Suit Storage:[(s_store && !(s_store.flags&ABSTRACT)) ? html_encode(s_store) : "Empty"]" + dat += "
 ↳Suit Storage:[(s_store && !(s_store.flags&ABSTRACT)) ? html_encode(s_store) : "Empty"]" if(has_breathable_mask && istype(s_store, /obj/item/tank)) - dat += " [internal ? "Disable Internals" : "Set Internals"]" + dat += " [internal ? "Disable Internals" : "Set Internals"]" dat += "
 ↳Suit Storage:
 ↳Suit Storage:
Shoes:Obscured
Shoes:Obscured
Shoes:[(shoes && !(shoes.flags&ABSTRACT)) ? html_encode(shoes) : "Empty"]
Shoes:[(shoes && !(shoes.flags&ABSTRACT)) ? html_encode(shoes) : "Empty"]
Gloves:Obscured
Gloves:Obscured
Gloves:[(gloves && !(gloves.flags&ABSTRACT)) ? html_encode(gloves) : "Empty"]
Gloves:[(gloves && !(gloves.flags&ABSTRACT)) ? html_encode(gloves) : "Empty"]
Belt:Obscured
Belt:[(belt && !(belt.flags&ABSTRACT)) ? html_encode(belt) : "Empty"]" + + if(has_breathable_mask && istype(belt, /obj/item/tank)) + dat += " [internal ? "Disable Internals" : "Set Internals"]" + dat += "
Uniform:Obscured
Uniform:Obscured
Uniform:[(w_uniform && !(w_uniform.flags&ABSTRACT)) ? html_encode(w_uniform) : "Empty"]
Uniform:[(w_uniform && !(w_uniform.flags&ABSTRACT)) ? html_encode(w_uniform) : "Empty"]
 ↳Pockets:
 ↳ID:
 ↳Belt:
 ↳Suit Sensors:
 ↳PDA:
 ↳Pockets:
 ↳ID:
 ↳Suit Sensors:
 ↳PDA:
 ↳Belt:[(belt && !(belt.flags&ABSTRACT)) ? html_encode(belt) : "Empty"]" - if(has_breathable_mask && istype(belt, /obj/item/tank)) - dat += " [internal ? "Disable Internals" : "Set Internals"]" - dat += "
 ↳Pockets:" + dat += "
 ↳Pockets:" if(l_store && internal && l_store == internal) dat += "[l_store]" else if(l_store && !(l_store.flags&ABSTRACT)) dat += "Left (Full)" else dat += "Left (Empty)" - dat += " " + dat += " " if(r_store && internal && r_store == internal) dat += "[r_store]" else if(r_store && !(r_store.flags&ABSTRACT)) dat += "Right (Full)" else dat += "Right (Empty)" - dat += "
 ↳ID:[(wear_id && !(wear_id.flags&ABSTRACT)) ? html_encode(wear_id) : "Empty"]
 ↳PDA:[(wear_pda && !(wear_pda.flags&ABSTRACT)) ? "Full" : "Empty"]
 ↳ID:[(wear_id && !(wear_id.flags&ABSTRACT)) ? html_encode(wear_id) : "Empty"]
 ↳PDA:[(wear_pda && !(wear_pda.flags&ABSTRACT)) ? "Full" : "Empty"]
 ↳Suit Sensors:[U.has_sensor >= 2 ? "--SENSORS LOCKED--" : "Set Sensors"]
 ↳Suit Sensors:[U.has_sensor >= 2 ? "--SENSORS LOCKED--" : "Set Sensors"]
 ↳Remove Accessory
 ↳Remove Accessory
Handcuffed: Remove
Handcuffed: Remove
Legcuffed: Remove
- Close + Close "} var/datum/browser/popup = new(user, "mob\ref[src]", "[src]", 440, 540)