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 a295c9fc10d1eaf5ba1fe0159860c0c23b98eaad..2697f2cfcf5ec01d0e2041ef642714c78be0073a 100644 (file)
--- 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 e0efb26e64603a3aafd6813009199a4ab915bd87..330ddeef687a33c7e4f63b19df725695a830439c 100644 (file)
--- 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 2323db881e810ab18e153f60c886c4bb616b67d4..887abc3d5facca1056d032b3414e8813b2283850 100644 (file)
--- 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 f50825945a3f995aa57968bb507490278d310126..5b9ae03dfd1150d3450db730935a9eb34e645029 100644 (file)
--- 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