mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-10 09:42:29 +00:00
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.  🆑 Bisar add: Clothing can now hide what you're wearing on your belt. /🆑
This commit is contained in:
@@ -8,3 +8,4 @@
|
|||||||
name = "trenchcoat"
|
name = "trenchcoat"
|
||||||
desc = "A long, black trenchcoat. Makes you feel like you're the one, but you're not."
|
desc = "A long, black trenchcoat. Makes you feel like you're the one, but you're not."
|
||||||
icon_state = "trenchcoat"
|
icon_state = "trenchcoat"
|
||||||
|
flags_inv = HIDEBELT
|
||||||
|
|||||||
@@ -38,7 +38,7 @@
|
|||||||
slowdown = 0.5
|
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)
|
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
|
armor_type = /datum/armor/suit_bio_suit
|
||||||
flags_inv = HIDEGLOVES|HIDEJUMPSUIT
|
flags_inv = HIDEGLOVES|HIDEJUMPSUIT|HIDEBELT
|
||||||
strip_delay = 70
|
strip_delay = 70
|
||||||
equip_delay_other = 70
|
equip_delay_other = 70
|
||||||
resistance_flags = ACID_PROOF
|
resistance_flags = ACID_PROOF
|
||||||
|
|||||||
@@ -121,7 +121,7 @@
|
|||||||
icon_state = "imperium_monk"
|
icon_state = "imperium_monk"
|
||||||
inhand_icon_state = "imperium_monk"
|
inhand_icon_state = "imperium_monk"
|
||||||
body_parts_covered = CHEST|GROIN|LEGS|ARMS
|
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)
|
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
|
/obj/item/clothing/suit/costume/chickensuit
|
||||||
@@ -219,6 +219,7 @@
|
|||||||
icon_state = "classicponcho"
|
icon_state = "classicponcho"
|
||||||
inhand_icon_state = null
|
inhand_icon_state = null
|
||||||
species_exception = list(/datum/species/golem)
|
species_exception = list(/datum/species/golem)
|
||||||
|
flags_inv = HIDEBELT
|
||||||
|
|
||||||
/obj/item/clothing/suit/costume/poncho/green
|
/obj/item/clothing/suit/costume/poncho/green
|
||||||
name = "green poncho"
|
name = "green poncho"
|
||||||
@@ -248,7 +249,7 @@
|
|||||||
icon_state = "white_dress"
|
icon_state = "white_dress"
|
||||||
inhand_icon_state = "w_suit"
|
inhand_icon_state = "w_suit"
|
||||||
body_parts_covered = CHEST|GROIN|LEGS|FEET
|
body_parts_covered = CHEST|GROIN|LEGS|FEET
|
||||||
flags_inv = HIDEJUMPSUIT|HIDESHOES
|
flags_inv = HIDEJUMPSUIT|HIDESHOES|HIDEBELT
|
||||||
|
|
||||||
/obj/item/clothing/suit/hooded/carp_costume
|
/obj/item/clothing/suit/hooded/carp_costume
|
||||||
name = "carp costume"
|
name = "carp costume"
|
||||||
@@ -503,6 +504,7 @@
|
|||||||
desc = "Perfect for those who want to stalk around a corner of a bar."
|
desc = "Perfect for those who want to stalk around a corner of a bar."
|
||||||
icon_state = "gothcoat"
|
icon_state = "gothcoat"
|
||||||
inhand_icon_state = null
|
inhand_icon_state = null
|
||||||
|
flags_inv = HIDEBELT
|
||||||
|
|
||||||
/obj/item/clothing/suit/costume/xenos
|
/obj/item/clothing/suit/costume/xenos
|
||||||
name = "xenos suit"
|
name = "xenos suit"
|
||||||
@@ -510,7 +512,7 @@
|
|||||||
icon_state = "xenos"
|
icon_state = "xenos"
|
||||||
inhand_icon_state = "xenos_suit"
|
inhand_icon_state = "xenos_suit"
|
||||||
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
|
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)
|
allowed = list(/obj/item/clothing/mask/facehugger/toy)
|
||||||
|
|
||||||
/obj/item/clothing/suit/costume/nemes
|
/obj/item/clothing/suit/costume/nemes
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
throw_speed = 1
|
throw_speed = 1
|
||||||
throw_range = 2
|
throw_range = 2
|
||||||
w_class = WEIGHT_CLASS_TINY
|
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
|
alternate_worn_layer = UNDER_HEAD_LAYER
|
||||||
species_exception = list(/datum/species/golem)
|
species_exception = list(/datum/species/golem)
|
||||||
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
|
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
throw_speed = 1
|
throw_speed = 1
|
||||||
throw_range = 2
|
throw_range = 2
|
||||||
w_class = WEIGHT_CLASS_TINY
|
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)
|
species_exception = list(/datum/species/golem)
|
||||||
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
|
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
|
||||||
alternate_worn_layer = ABOVE_BODY_FRONT_LAYER //so the bedsheet goes over everything but fire
|
alternate_worn_layer = ABOVE_BODY_FRONT_LAYER //so the bedsheet goes over everything but fire
|
||||||
|
|||||||
@@ -124,6 +124,7 @@
|
|||||||
armor_type = /datum/armor/jacket_det_suit
|
armor_type = /datum/armor/jacket_det_suit
|
||||||
cold_protection = CHEST|GROIN|ARMS
|
cold_protection = CHEST|GROIN|ARMS
|
||||||
heat_protection = CHEST|GROIN|ARMS
|
heat_protection = CHEST|GROIN|ARMS
|
||||||
|
flags_inv = HIDEBELT
|
||||||
|
|
||||||
/datum/armor/jacket_det_suit
|
/datum/armor/jacket_det_suit
|
||||||
melee = 25
|
melee = 25
|
||||||
|
|||||||
@@ -40,7 +40,7 @@
|
|||||||
icon_state = "holidaypriest"
|
icon_state = "holidaypriest"
|
||||||
inhand_icon_state = "w_suit"
|
inhand_icon_state = "w_suit"
|
||||||
body_parts_covered = CHEST|GROIN|LEGS|ARMS
|
body_parts_covered = CHEST|GROIN|LEGS|ARMS
|
||||||
flags_inv = HIDEJUMPSUIT
|
flags_inv = HIDEJUMPSUIT|HIDEBELT
|
||||||
|
|
||||||
/obj/item/clothing/suit/chaplainsuit/nun
|
/obj/item/clothing/suit/chaplainsuit/nun
|
||||||
name = "nun robe"
|
name = "nun robe"
|
||||||
@@ -48,7 +48,7 @@
|
|||||||
icon_state = "nun"
|
icon_state = "nun"
|
||||||
inhand_icon_state = "nun"
|
inhand_icon_state = "nun"
|
||||||
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
|
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
|
||||||
flags_inv = HIDEJUMPSUIT
|
flags_inv = HIDEJUMPSUIT|HIDEBELT
|
||||||
|
|
||||||
/obj/item/clothing/suit/chaplainsuit/habit
|
/obj/item/clothing/suit/chaplainsuit/habit
|
||||||
name = "religious tunic"
|
name = "religious tunic"
|
||||||
@@ -56,7 +56,7 @@
|
|||||||
icon_state = "habit"
|
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.
|
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
|
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
|
||||||
flags_inv = HIDEJUMPSUIT
|
flags_inv = HIDEJUMPSUIT|HIDEBELT
|
||||||
|
|
||||||
/obj/item/clothing/suit/chaplainsuit/bishoprobe
|
/obj/item/clothing/suit/chaplainsuit/bishoprobe
|
||||||
name = "bishop's robes"
|
name = "bishop's robes"
|
||||||
@@ -64,7 +64,7 @@
|
|||||||
icon_state = "bishoprobe"
|
icon_state = "bishoprobe"
|
||||||
inhand_icon_state = "bishoprobe"
|
inhand_icon_state = "bishoprobe"
|
||||||
body_parts_covered = CHEST|GROIN|LEGS|ARMS
|
body_parts_covered = CHEST|GROIN|LEGS|ARMS
|
||||||
flags_inv = HIDEJUMPSUIT
|
flags_inv = HIDEJUMPSUIT|HIDEBELT
|
||||||
|
|
||||||
/obj/item/clothing/suit/chaplainsuit/armor/studentuni
|
/obj/item/clothing/suit/chaplainsuit/armor/studentuni
|
||||||
name = "student robe"
|
name = "student robe"
|
||||||
@@ -106,7 +106,7 @@
|
|||||||
icon_state = "monkrobeeast"
|
icon_state = "monkrobeeast"
|
||||||
inhand_icon_state = null
|
inhand_icon_state = null
|
||||||
body_parts_covered = GROIN|LEGS
|
body_parts_covered = GROIN|LEGS
|
||||||
flags_inv = HIDEJUMPSUIT
|
flags_inv = HIDEJUMPSUIT|HIDEBELT
|
||||||
|
|
||||||
/obj/item/clothing/suit/chaplainsuit/whiterobe
|
/obj/item/clothing/suit/chaplainsuit/whiterobe
|
||||||
name = "white robe"
|
name = "white robe"
|
||||||
@@ -114,7 +114,7 @@
|
|||||||
icon_state = "whiterobe"
|
icon_state = "whiterobe"
|
||||||
inhand_icon_state = null
|
inhand_icon_state = null
|
||||||
body_parts_covered = CHEST|GROIN|LEGS|ARMS
|
body_parts_covered = CHEST|GROIN|LEGS|ARMS
|
||||||
flags_inv = HIDEJUMPSUIT
|
flags_inv = HIDEJUMPSUIT|HIDEBELT
|
||||||
|
|
||||||
/obj/item/clothing/suit/chaplainsuit/clownpriest
|
/obj/item/clothing/suit/chaplainsuit/clownpriest
|
||||||
name = "Robes of the Honkmother"
|
name = "Robes of the Honkmother"
|
||||||
@@ -122,7 +122,7 @@
|
|||||||
icon_state = "clownpriest"
|
icon_state = "clownpriest"
|
||||||
inhand_icon_state = "clownpriest"
|
inhand_icon_state = "clownpriest"
|
||||||
body_parts_covered = CHEST|GROIN|LEGS|ARMS
|
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)
|
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
|
/obj/item/clothing/head/helmet/chaplain/clock
|
||||||
@@ -287,4 +287,4 @@
|
|||||||
icon_state = "shrinehand"
|
icon_state = "shrinehand"
|
||||||
inhand_icon_state = "shrinehand"
|
inhand_icon_state = "shrinehand"
|
||||||
body_parts_covered = CHEST|GROIN|LEGS|ARMS
|
body_parts_covered = CHEST|GROIN|LEGS|ARMS
|
||||||
flags_inv = HIDEJUMPSUIT
|
flags_inv = HIDEJUMPSUIT|HIDEBELT
|
||||||
|
|||||||
@@ -508,7 +508,7 @@
|
|||||||
var/cables_or_cuffs = istype(handcuffed, /obj/item/restraints/handcuffs/cable) ? "restrained with cable" : "handcuffed"
|
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]!")
|
. += span_warning("[t_He] [t_is] [icon2html(handcuffed, user)] [cables_or_cuffs]!")
|
||||||
//belt
|
//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."
|
. += "[t_He] [t_has] [belt.examine_title_worn(user)] about [t_his] waist."
|
||||||
//shoes
|
//shoes
|
||||||
if(shoes && !(obscured & ITEM_SLOT_FEET) && !(shoes.item_flags & EXAMINE_SKIP))
|
if(shoes && !(obscured & ITEM_SLOT_FEET) && !(shoes.item_flags & EXAMINE_SKIP))
|
||||||
|
|||||||
Reference in New Issue
Block a user