From: Whisper <121047731+QuietlyWhisper@users.noreply.github.com> Date: Mon, 11 Dec 2023 09:35:51 +0000 (-0500) Subject: Adds cosmetic sunglasses (#22311) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=0188bbe5819537f73c3d51484de520b2c0ec06c3;p=space-station-14.git Adds cosmetic sunglasses (#22311) * Adds cosmetic sunglasses * oops --- diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml index a295c9fc10..2697f2cfcf 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml @@ -14,6 +14,5 @@ ClothingOuterArmorBasicSlim: 2 ClothingOuterVest: 2 ClothingBeltBandolier: 2 - ClothingEyesGlassesSunglasses: 2 + ClothingEyesGlassesCosmeticSunglasses: 2 - diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index e0efb26e64..330ddeef68 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -68,6 +68,7 @@ ClothingHeadRastaHat: 2 ClothingBeltStorageWaistbag: 3 ClothingEyesGlasses: 6 + ClothingEyesGlassesCosmeticSunglasses: 6 ClothingHandsGlovesColorBlack: 4 contrabandInventory: ClothingUniformJumpsuitTacticool: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 2323db881e..887abc3d5f 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -111,22 +111,27 @@ - type: entity parent: ClothingEyesBase - id: ClothingEyesGlassesSunglasses + id: ClothingEyesGlassesCosmeticSunglasses name: sun glasses - description: Useful both for security and cargonia. + description: A pair of black sunglasses. components: - type: Sprite sprite: Clothing/Eyes/Glasses/sunglasses.rsi - type: Clothing sprite: Clothing/Eyes/Glasses/sunglasses.rsi - - type: FlashImmunity - - type: EyeProtection - protectionTime: 5 - type: Tag tags: - HamsterWearable - WhitelistChameleon +- type: entity + parent: ClothingEyesGlassesCosmeticSunglasses + id: ClothingEyesGlassesSunglasses + components: + - type: FlashImmunity + - type: EyeProtection + protectionTime: 5 + - type: entity parent: ClothingEyesBase id: ClothingEyesGlassesSecurity diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml index f50825945a..5b9ae03dfd 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml @@ -19,7 +19,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitMusician back: ClothingBackpackMusicianFilled - eyes: ClothingEyesGlassesSunglasses + eyes: ClothingEyesGlassesCosmeticSunglasses shoes: ClothingShoesBootsLaceup id: MusicianPDA ears: ClothingHeadsetService