Fold cosmetic sunglasses into regular sunglasses (#23232)

Fold cosmetic sunglasses into regular sunglasses.

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
index 2697f2cfcf5ec01d0e2041ef642714c78be0073a..bd43b174ee2b2f772e984b92132e1da9334d1efc 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
@@ -14,5 +14,5 @@
     ClothingOuterArmorBasicSlim: 2
     ClothingOuterVest: 2
     ClothingBeltBandolier: 2
-    ClothingEyesGlassesCosmeticSunglasses: 2
+    ClothingEyesGlassesSunglasses: 2
 

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
index 330ddeef687a33c7e4f63b19df725695a830439c..686f4df4c818ae27831510a150ae91f442a143c0 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -68,7 +68,7 @@
     ClothingHeadRastaHat: 2
     ClothingBeltStorageWaistbag: 3
     ClothingEyesGlasses: 6
-    ClothingEyesGlassesCosmeticSunglasses: 6
+    ClothingEyesGlassesSunglasses: 2
     ClothingHandsGlovesColorBlack: 4
   contrabandInventory:
     ClothingUniformJumpsuitTacticool: 1

diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
index 70b84b315621d24e640afa29d78db385929d4729..cda7bc2f55084ecb27d89e88518c56890ae74beb 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -79,7 +79,7 @@
     tags:
     - HamsterWearable
     - WhitelistChameleon
-    
+
 - type: entity
   parent: ClothingEyesBase
   id: ClothingEyesGlassesJensen
@@ -125,7 +125,7 @@
 
 - type: entity
   parent: ClothingEyesBase
-  id: ClothingEyesGlassesCosmeticSunglasses
+  id: ClothingEyesGlassesSunglasses
   name: sun glasses
   description: A pair of black sunglasses.
   components:
@@ -133,19 +133,14 @@
     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 5b9ae03dfd1150d3450db730935a9eb34e645029..f50825945a3f995aa57968bb507490278d310126 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: ClothingEyesGlassesCosmeticSunglasses
+    eyes: ClothingEyesGlassesSunglasses
     shoes: ClothingShoesBootsLaceup
     id: MusicianPDA
     ears: ClothingHeadsetService

diff --git a/Resources/migration.yml b/Resources/migration.yml
index e32905c6e1dedf7319d8e58a82cca1e0c44576e8..82fb9789b29c1650c501865394cd4178931a3457 100644 (file)
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -119,3 +119,6 @@ WarpPointBeaconNeutral: null
 WarpPointBeaconScience: null
 WarpPointBeaconSecurity: null
 WarpPointBeaconService: null
+
+# 2023-12-30
+ClothingEyesGlassesCosmeticSunglasses: ClothingEyesGlassesSunglasses