From 100d718edd358081264186f775980d574b00952f Mon Sep 17 00:00:00 2001 From: crazybrain23 <44417085+crazybrain23@users.noreply.github.com> Date: Fri, 25 Aug 2023 04:20:57 +0100 Subject: [PATCH] Fix CentCom official costume issues (#19256) --- .../Prototypes/Catalog/Fills/Backpacks/duffelbag.yml | 11 ++++++----- .../Entities/Clothing/Ears/headsets_alt.yml | 10 ++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index e6179d9269..59bade855b 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -146,22 +146,23 @@ parent: ClothingBackpackDuffel id: ClothingBackpackDuffelSyndicateCostumeCentcom name: CentCom official costume duffel bag - description: "Contains a full CentCom Official uniform set, headset and clipboard included. The headset comes without an encryption key." + description: "Contains a full CentCom Official uniform set, headset and clipboard included. Encryption keys and ID access are not included." + suffix: DO NOT MAP components: - type: Tag tags: [] # ignore "WhitelistChameleon" tag - type: StorageFill contents: - - id: ClothingHeadHatCaptain + - id: ClothingHeadHatCentcom - id: ClothingEyesGlassesSunglasses - id: ClothingUniformJumpsuitCentcomOfficial - id: ClothingShoesBootsJack - - id: ClothingHandsGlovesColorGray - - id: ClothingHeadsetService + - id: ClothingHandsGlovesColorBlack + - id: ClothingHeadsetAltCentComFake - id: ClothingOuterArmorBasic - id: Paper - id: Pen - - id: CentcomPDA + - id: CentcomPDAFake - type: entity parent: ClothingBackpackDuffelClown diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index eaa0ecaeed..bff46beda2 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -41,6 +41,16 @@ - type: Clothing sprite: Clothing/Ears/Headsets/centcom.rsi +- type: entity + parent: ClothingHeadsetAltCentCom + id: ClothingHeadsetAltCentComFake + suffix: Fake + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyCommon + - type: entity parent: ClothingHeadsetAlt id: ClothingHeadsetAltCommand