diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml b/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml index dc37811fb809be..03c41b43884155 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml @@ -7,3 +7,7 @@ state: icon - type: Clothing slots: [eyes] + - type: Tag + tags: + - Clothing + - WhitelistChameleon diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index ba7823c1fb3fd3..5866eea2a1a397 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -77,6 +77,7 @@ - type: VisionCorrection - type: Tag tags: + - Clothing - HamsterWearable - WhitelistChameleon @@ -108,6 +109,7 @@ protectionTime: 5 - type: Tag tags: + - Clothing - HamsterWearable - WhitelistChameleon @@ -126,6 +128,7 @@ protectionTime: 5 - type: Tag tags: + - Clothing - HamsterWearable - WhitelistChameleon diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml b/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml index c04f3482870123..2ee66384248c51 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml @@ -6,7 +6,8 @@ suffix: Chameleon components: - type: Tag - tags: [] # ignore "WhitelistChameleon" tag + tags: + - Clothing # ignore "WhitelistChameleon" tag - type: Sprite sprite: Clothing/Eyes/Glasses/sunglasses.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml index e7d8bec69ffd22..20ba066fe97ef0 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml @@ -18,5 +18,6 @@ Quantity: 10 - type: Tag tags: + - Clothing - ClothMade - WhitelistChameleon diff --git a/Resources/Prototypes/Entities/Clothing/Hands/specific.yml b/Resources/Prototypes/Entities/Clothing/Hands/specific.yml index 87a0961569ecc2..766ace57b6b054 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/specific.yml @@ -6,7 +6,8 @@ suffix: Chameleon components: - type: Tag - tags: [] # ignore "WhitelistChameleon" tag + tags: + - Clothing # ignore "WhitelistChameleon" tag - type: Sprite sprite: Clothing/Hands/Gloves/Color/black.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml index 0591ec26a174b1..876360d868d01c 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml @@ -20,6 +20,7 @@ - type: Tag tags: - DogWearable + - Clothing - ClothMade - DroneUsable - WhitelistChameleon @@ -36,6 +37,9 @@ amount: 1 - type: Tag tags: + - DogWearable + - Clothing + - ClothMade - WhitelistChameleon - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 2d91dcdaa57df6..e945d25b9dfff5 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -21,6 +21,7 @@ sprite: Clothing/Head/Hats/beret.rsi - type: Tag tags: + - Clothing - ClothMade - HamsterWearable - WhitelistChameleon @@ -48,6 +49,7 @@ sprite: Clothing/Head/Hats/beret_rnd.rsi - type: Tag tags: + - Clothing - ClothMade - HamsterWearable - WhitelistChameleon @@ -64,6 +66,7 @@ sprite: Clothing/Head/Hats/beret_engineering.rsi - type: Tag tags: + - Clothing - ClothMade - HamsterWearable - WhitelistChameleon @@ -80,6 +83,7 @@ sprite: Clothing/Head/Hats/beret_hos.rsi - type: Tag tags: + - Clothing - ClothMade - HamsterWearable - WhitelistChameleon @@ -140,6 +144,7 @@ sprite: Clothing/Head/Hats/captain.rsi - type: Tag tags: + - Clothing - ClothMade - HamsterWearable - WhitelistChameleon @@ -191,6 +196,7 @@ storagebase: !type:Container - type: Tag tags: + - Clothing - ClothMade - HamsterWearable - WhitelistChameleon @@ -207,6 +213,7 @@ sprite: Clothing/Head/Hats/brownfedora.rsi - type: Tag tags: + - Clothing - ClothMade - HamsterWearable - WhitelistChameleon @@ -245,6 +252,7 @@ sprite: Clothing/Head/Hats/hopcap.rsi - type: Tag tags: + - Clothing - ClothMade - HamsterWearable - WhitelistChameleon @@ -261,6 +269,7 @@ sprite: Clothing/Head/Hats/hoshat.rsi - type: Tag tags: + - Clothing - ClothMade - HamsterWearable - WhitelistChameleon @@ -365,6 +374,7 @@ sprite: Clothing/Head/Hats/surgcap_blue.rsi - type: Tag tags: + - Clothing - ClothMade - HamsterWearable - WhitelistChameleon @@ -403,6 +413,7 @@ sprite: Clothing/Head/Hats/tophat.rsi - type: Tag tags: + - Clothing - ClothMade - HamsterWearable - WhitelistChameleon @@ -476,6 +487,7 @@ sprite: Clothing/Head/Hats/wizardhat.rsi - type: Tag tags: + - Clothing - ClothMade - HamsterWearable - WhitelistChameleon @@ -582,6 +594,7 @@ sprite: Clothing/Head/Hats/nursehat.rsi - type: Tag tags: + - Clothing - ClothMade - HamsterWearable - WhitelistChameleon @@ -641,6 +654,7 @@ sprite: Clothing/Head/Hats/beret_cmo.rsi - type: Tag tags: + - Clothing - ClothMade - HamsterWearable - WhitelistChameleon @@ -759,6 +773,7 @@ sprite: Clothing/Head/Hats/capcap.rsi - type: Tag tags: + - Clothing - ClothMade - WhitelistChameleon - HamsterWearable diff --git a/Resources/Prototypes/Entities/Clothing/Head/specific.yml b/Resources/Prototypes/Entities/Clothing/Head/specific.yml index 1dd36bff94935f..db451cdf9241f4 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/specific.yml @@ -6,7 +6,8 @@ suffix: Chameleon components: - type: Tag - tags: [] # ignore "WhitelistChameleon" tag + tags: + - Clothing # ignore "WhitelistChameleon" tag - type: Sprite sprite: Clothing/Head/Hats/beret.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml index bf02642cb7fc86..a87d83d5002e5c 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml @@ -7,6 +7,10 @@ state: icon - type: Clothing slots: [mask] + - type: Tag + tags: + - Clothing + - WhitelistChameleon - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 1015df855738d1..c0c598c922208a 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -13,6 +13,7 @@ - type: IdentityBlocker - type: Tag tags: + - Clothing - HamsterWearable - WhitelistChameleon @@ -113,6 +114,7 @@ - type: IngestionBlocker - type: Tag tags: + - Clothing - PetWearable - WhitelistChameleon @@ -168,8 +170,8 @@ - type: IdentityBlocker - type: Tag tags: + - Clothing - PetWearable - - WhitelistChameleon # for H.O.N.K. construction - ClownMask - WhitelistChameleon @@ -180,6 +182,7 @@ components: - type: Tag tags: + - Clothing - ClownMask - HamsterWearable - WhitelistChameleon @@ -211,6 +214,7 @@ - type: IdentityBlocker - type: Tag tags: + - Clothing - HamsterWearable - WhitelistChameleon @@ -340,6 +344,7 @@ - type: BreathMask - type: Tag tags: + - Clothing - HamsterWearable - WhitelistChameleon - type: IdentityBlocker @@ -435,6 +440,7 @@ - type: IdentityBlocker - type: Tag tags: + - Clothing - WhitelistChameleon - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml index a1ad8126e5ad1c..d89e33ab68afde 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml @@ -6,7 +6,8 @@ suffix: Chameleon components: - type: Tag - tags: [] # ignore "WhitelistChameleon" tag + tags: + - Clothing # ignore "WhitelistChameleon" tag - type: Sprite sprite: Clothing/Mask/gas.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml index 06ec393c78defc..d438ae5184b48c 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml @@ -27,5 +27,6 @@ Quantity: 10 - type: Tag tags: + - Clothing - ClothMade - WhitelistChameleon diff --git a/Resources/Prototypes/Entities/Clothing/Neck/specific.yml b/Resources/Prototypes/Entities/Clothing/Neck/specific.yml index 1f50dc1ef1cd4e..07de9eded9b4b1 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/specific.yml @@ -6,7 +6,8 @@ suffix: Chameleon components: - type: Tag - tags: [] # ignore "WhitelistChameleon" tag + tags: + - Clothing # ignore "WhitelistChameleon" tag - type: Sprite sprite: Clothing/Neck/Scarfs/red.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index fb35f03828bfb4..4cfa56a1a0b4b4 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -42,6 +42,10 @@ type: StorageBoundUserInterface - type: StaticPrice price: 80 + - type: Tag + tags: + - Clothing + - WhitelistChameleon - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml index 9be8c22a0a2295..3ff3b4c7a5fdda 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml @@ -6,7 +6,8 @@ suffix: Chameleon components: - type: Tag - tags: [] # ignore "WhitelistChameleon" tag + tags: + - Clothing # ignore "WhitelistChameleon" tag - type: Sprite sprite: Clothing/OuterClothing/Vests/vest.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 06988c2f1220b6..b1defa0b85a411 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -28,6 +28,7 @@ Quantity: 30 - type: Tag tags: + - Clothing - ClothMade - WhitelistChameleon diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml index c829dc5d44cb67..3867a0d1f825a6 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml @@ -19,6 +19,7 @@ Quantity: 10 - type: Tag tags: + - Clothing - ClothMade - WhitelistChameleon diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml index c341f2ae22c5fa..b4f802fd4f9772 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml @@ -25,6 +25,7 @@ # for H.O.N.K. construction - type: Tag tags: + - Clothing - ClownShoes - WhitelistChameleon @@ -112,7 +113,8 @@ description: Stylish black shoes. components: - type: Tag - tags: [] # ignore "WhitelistChameleon" tag + tags: + - Clothing # ignore "WhitelistChameleon" tag - type: Sprite sprite: Clothing/Shoes/Color/black.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml index 0329f82b5b199b..4dc581a36b1955 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml @@ -25,6 +25,7 @@ Quantity: 30 - type: Tag tags: + - Clothing - ClothMade - WhitelistChameleon diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index f68595936d62a2..47ae13389ffabd 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -427,6 +427,7 @@ mode: SensorCords - type: Tag tags: + - Clothing - ClothMade - PrisonUniform - WhitelistChameleon diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml index 19793f873f7bd8..ae2c4a0bfe4543 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml @@ -6,7 +6,8 @@ suffix: Chameleon components: - type: Tag - tags: [] # ignore "WhitelistChameleon" tag + tags: + - Clothing # ignore "WhitelistChameleon" tag - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/Color/black.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Objects/Misc/garment.yml b/Resources/Prototypes/Entities/Objects/Misc/garment.yml index e5fc9d61c193e4..fb192a13190cad 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/garment.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/garment.yml @@ -10,7 +10,7 @@ capacity: 105 whitelist: tags: - - ClothMade + - Clothing - type: entity name: garment bag diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 814a73417c1bdb..5791e6b3d25edb 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -287,6 +287,9 @@ - type: Tag id: CigPack +- type: Tag + id: Clothing + - type: Tag id: ClothMade