From 0260da55ba4f71eb74fed583e31fc639a6fd3a03 Mon Sep 17 00:00:00 2001 From: Joshua Kidder <49173900+Metekillot@users.noreply.github.com> Date: Thu, 3 Oct 2024 20:55:52 -0400 Subject: [PATCH] Adds hiding what you're wearing on your belt, adds the flag to a bunch of stuff (#86884) We have the HIDEBELT flag but it isn't used anywhere and in fact is not functional, so I added code to examine to enable it. I also threw the flag onto a bunch of stuff -- primarily big billowy things, or stuff like trenchcoats. This would include hiding guns, toolbelts, plant bags, things of that nature. If you steal the Captain's saber and throw a bedsheet on your head, you've pulled off the perfect crime. Adds another way to be sneaky and immensely suspicious, increasing paranoia when some guy wearing a big shapeless suit walks into the room. ![200w](https://github.com/user-attachments/assets/6faf3e9b-1a8a-4dec-ad4f-12792cf7eba0) :cl: Bisar add: Clothing can now hide what you're wearing on your belt. /:cl: --- code/modules/bitrunning/objects/clothing.dm | 1 + code/modules/clothing/suits/bio.dm | 2 +- code/modules/clothing/suits/costume.dm | 8 +++++--- code/modules/clothing/suits/ghostsheet.dm | 4 ++-- code/modules/clothing/suits/jobs.dm | 1 + .../jobs/job_types/chaplain/chaplain_costumes.dm | 16 ++++++++-------- code/modules/mob/living/carbon/examine.dm | 2 +- 7 files changed, 19 insertions(+), 15 deletions(-) diff --git a/code/modules/bitrunning/objects/clothing.dm b/code/modules/bitrunning/objects/clothing.dm index de2b6789d58..731b7dc2cca 100644 --- a/code/modules/bitrunning/objects/clothing.dm +++ b/code/modules/bitrunning/objects/clothing.dm @@ -8,3 +8,4 @@ name = "trenchcoat" desc = "A long, black trenchcoat. Makes you feel like you're the one, but you're not." icon_state = "trenchcoat" + flags_inv = HIDEBELT diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 2ca60450534..20c258d373e 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -38,7 +38,7 @@ slowdown = 0.5 allowed = list(/obj/item/tank/internals, /obj/item/reagent_containers/dropper, /obj/item/flashlight/pen, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/cup/beaker, /obj/item/gun/syringe) armor_type = /datum/armor/suit_bio_suit - flags_inv = HIDEGLOVES|HIDEJUMPSUIT + flags_inv = HIDEGLOVES|HIDEJUMPSUIT|HIDEBELT strip_delay = 70 equip_delay_other = 70 resistance_flags = ACID_PROOF diff --git a/code/modules/clothing/suits/costume.dm b/code/modules/clothing/suits/costume.dm index 4c85ed74222..b7c319d3349 100644 --- a/code/modules/clothing/suits/costume.dm +++ b/code/modules/clothing/suits/costume.dm @@ -121,7 +121,7 @@ icon_state = "imperium_monk" inhand_icon_state = "imperium_monk" body_parts_covered = CHEST|GROIN|LEGS|ARMS - flags_inv = HIDESHOES|HIDEJUMPSUIT + flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDEBELT allowed = list(/obj/item/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/flashlight/flare/candle, /obj/item/tank/internals/emergency_oxygen) /obj/item/clothing/suit/costume/chickensuit @@ -219,6 +219,7 @@ icon_state = "classicponcho" inhand_icon_state = null species_exception = list(/datum/species/golem) + flags_inv = HIDEBELT /obj/item/clothing/suit/costume/poncho/green name = "green poncho" @@ -248,7 +249,7 @@ icon_state = "white_dress" inhand_icon_state = "w_suit" body_parts_covered = CHEST|GROIN|LEGS|FEET - flags_inv = HIDEJUMPSUIT|HIDESHOES + flags_inv = HIDEJUMPSUIT|HIDESHOES|HIDEBELT /obj/item/clothing/suit/hooded/carp_costume name = "carp costume" @@ -503,6 +504,7 @@ desc = "Perfect for those who want to stalk around a corner of a bar." icon_state = "gothcoat" inhand_icon_state = null + flags_inv = HIDEBELT /obj/item/clothing/suit/costume/xenos name = "xenos suit" @@ -510,7 +512,7 @@ icon_state = "xenos" inhand_icon_state = "xenos_suit" body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS - flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDEBELT allowed = list(/obj/item/clothing/mask/facehugger/toy) /obj/item/clothing/suit/costume/nemes diff --git a/code/modules/clothing/suits/ghostsheet.dm b/code/modules/clothing/suits/ghostsheet.dm index 965adc9b7e2..52c19be3bd1 100644 --- a/code/modules/clothing/suits/ghostsheet.dm +++ b/code/modules/clothing/suits/ghostsheet.dm @@ -7,7 +7,7 @@ throw_speed = 1 throw_range = 2 w_class = WEIGHT_CLASS_TINY - flags_inv = HIDEGLOVES|HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT + flags_inv = HIDEGLOVES|HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT|HIDEBELT|HIDEJUMPSUIT alternate_worn_layer = UNDER_HEAD_LAYER species_exception = list(/datum/species/golem) supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON @@ -34,7 +34,7 @@ throw_speed = 1 throw_range = 2 w_class = WEIGHT_CLASS_TINY - flags_inv = HIDEGLOVES|HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT + flags_inv = HIDEGLOVES|HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT|HIDEBELT|HIDEJUMPSUIT species_exception = list(/datum/species/golem) supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON alternate_worn_layer = ABOVE_BODY_FRONT_LAYER //so the bedsheet goes over everything but fire diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 2ba150ab692..50455822963 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -124,6 +124,7 @@ armor_type = /datum/armor/jacket_det_suit cold_protection = CHEST|GROIN|ARMS heat_protection = CHEST|GROIN|ARMS + flags_inv = HIDEBELT /datum/armor/jacket_det_suit melee = 25 diff --git a/code/modules/jobs/job_types/chaplain/chaplain_costumes.dm b/code/modules/jobs/job_types/chaplain/chaplain_costumes.dm index 0968569ae33..6af8c844555 100644 --- a/code/modules/jobs/job_types/chaplain/chaplain_costumes.dm +++ b/code/modules/jobs/job_types/chaplain/chaplain_costumes.dm @@ -40,7 +40,7 @@ icon_state = "holidaypriest" inhand_icon_state = "w_suit" body_parts_covered = CHEST|GROIN|LEGS|ARMS - flags_inv = HIDEJUMPSUIT + flags_inv = HIDEJUMPSUIT|HIDEBELT /obj/item/clothing/suit/chaplainsuit/nun name = "nun robe" @@ -48,7 +48,7 @@ icon_state = "nun" inhand_icon_state = "nun" body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS - flags_inv = HIDEJUMPSUIT + flags_inv = HIDEJUMPSUIT|HIDEBELT /obj/item/clothing/suit/chaplainsuit/habit name = "religious tunic" @@ -56,7 +56,7 @@ icon_state = "habit" alternate_worn_layer = GLOVES_LAYER // since the sleeves cover a part of the hands, this way it looks better while retaining glove overlay correctly. body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS - flags_inv = HIDEJUMPSUIT + flags_inv = HIDEJUMPSUIT|HIDEBELT /obj/item/clothing/suit/chaplainsuit/bishoprobe name = "bishop's robes" @@ -64,7 +64,7 @@ icon_state = "bishoprobe" inhand_icon_state = "bishoprobe" body_parts_covered = CHEST|GROIN|LEGS|ARMS - flags_inv = HIDEJUMPSUIT + flags_inv = HIDEJUMPSUIT|HIDEBELT /obj/item/clothing/suit/chaplainsuit/armor/studentuni name = "student robe" @@ -106,7 +106,7 @@ icon_state = "monkrobeeast" inhand_icon_state = null body_parts_covered = GROIN|LEGS - flags_inv = HIDEJUMPSUIT + flags_inv = HIDEJUMPSUIT|HIDEBELT /obj/item/clothing/suit/chaplainsuit/whiterobe name = "white robe" @@ -114,7 +114,7 @@ icon_state = "whiterobe" inhand_icon_state = null body_parts_covered = CHEST|GROIN|LEGS|ARMS - flags_inv = HIDEJUMPSUIT + flags_inv = HIDEJUMPSUIT|HIDEBELT /obj/item/clothing/suit/chaplainsuit/clownpriest name = "Robes of the Honkmother" @@ -122,7 +122,7 @@ icon_state = "clownpriest" inhand_icon_state = "clownpriest" body_parts_covered = CHEST|GROIN|LEGS|ARMS - flags_inv = HIDEJUMPSUIT + flags_inv = HIDEJUMPSUIT|HIDEBELT allowed = list(/obj/item/megaphone/clown, /obj/item/soap, /obj/item/food/pie/cream, /obj/item/bikehorn, /obj/item/bikehorn/golden, /obj/item/bikehorn/airhorn, /obj/item/instrument/bikehorn, /obj/item/reagent_containers/cup/soda_cans/canned_laughter, /obj/item/toy/crayon, /obj/item/toy/crayon/spraycan, /obj/item/toy/crayon/spraycan/lubecan, /obj/item/grown/bananapeel, /obj/item/food/grown/banana) /obj/item/clothing/head/helmet/chaplain/clock @@ -287,4 +287,4 @@ icon_state = "shrinehand" inhand_icon_state = "shrinehand" body_parts_covered = CHEST|GROIN|LEGS|ARMS - flags_inv = HIDEJUMPSUIT + flags_inv = HIDEJUMPSUIT|HIDEBELT diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index b7664bebf5f..10417b55a94 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -508,7 +508,7 @@ var/cables_or_cuffs = istype(handcuffed, /obj/item/restraints/handcuffs/cable) ? "restrained with cable" : "handcuffed" . += span_warning("[t_He] [t_is] [icon2html(handcuffed, user)] [cables_or_cuffs]!") //belt - if(belt && !(belt.item_flags & EXAMINE_SKIP)) + if(belt && !(obscured & ITEM_SLOT_BELT) && !(belt.item_flags & EXAMINE_SKIP)) . += "[t_He] [t_has] [belt.examine_title_worn(user)] about [t_his] waist." //shoes if(shoes && !(obscured & ITEM_SLOT_FEET) && !(shoes.item_flags & EXAMINE_SKIP))