From b753c2c6c8b0526ac76ed40a6b44c325a509a42e Mon Sep 17 00:00:00 2001 From: SimpleStation14 Date: Mon, 22 Apr 2024 05:32:08 -0400 Subject: [PATCH] Cherry-picked commit 2a1d6e0ae0513445e82f683bf323bf65ebe5397a from space-wizards/space-station-14/master --- Resources/Prototypes/Entities/Clothing/Head/hardhats.yml | 3 +++ Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml | 3 +++ .../Prototypes/Entities/Objects/Consumable/Food/skewer.yml | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml index 3e291f5dff2..15cda5a69f7 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml @@ -62,6 +62,9 @@ - type: ContainerContainer containers: cell_slot: !type:ContainerSlot + - type: Tag + tags: + - WhitelistChameleon - type: entity parent: ClothingHeadHatHardhatBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index bd82df57d43..d17fb275c13 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -90,6 +90,9 @@ sprite: Clothing/OuterClothing/Misc/cardborg.rsi - type: TypingIndicatorClothing proto: robot + - type: Tag + tags: + - WhitelistChameleon - type: entity parent: ClothingOuterBaseToggleable diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml index 51bf229f2c1..6c16a541cd9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml @@ -97,7 +97,7 @@ - type: entity name: lizard-tail kebab - parent: FoodSkewerBase + parent: FoodMeatKebab id: FoodMeatLizardtailKebab description: Severed lizard tail on a stick. components: