From 70a165f9af71b20935a149f1fc22528c97003794 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+emogarbage404@users.noreply.github.com>
Date: Sat, 30 Dec 2023 23:30:21 +0100
Subject: [PATCH] Fold cosmetic sunglasses into regular sunglasses (#23232)

Fold cosmetic sunglasses into regular sunglasses.

(cherry picked from commit f7a923624a17c72454f0f43bbfd24c80b8c5e007)
---
 Resources/Migrations/migration.yml                  |  3 +++
 .../VendingMachines/Inventories/bardrobe.yml        |  2 +-
 .../VendingMachines/Inventories/clothesmate.yml     |  2 +-
 .../Prototypes/Entities/Clothing/Eyes/glasses.yml   | 13 ++++---------
 .../Prototypes/Roles/Jobs/Civilian/musician.yml     |  2 +-
 RobustToolbox                                       |  2 +-
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index 3e1bc8fc4b..bcd803abe8 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -113,3 +113,6 @@ WarpPointBeaconNeutral: null
 WarpPointBeaconScience: null
 WarpPointBeaconSecurity: null
 WarpPointBeaconService: null
+
+# 2023-12-30
+ClothingEyesGlassesCosmeticSunglasses: ClothingEyesGlassesSunglasses
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
index 23b05838de..16610480f0 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
@@ -14,5 +14,5 @@
     ClothingOuterArmorDuraVest: 2 # DeltaV - ClothingOuterArmorBasicSlim replaced in favour of stabproof vest
     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 82e6fe4246..c95c6aeabb 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -85,7 +85,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 6f7e87ff81..021b302785 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -129,7 +129,7 @@
 
 - type: entity
   parent: ClothingEyesBase
-  id: ClothingEyesGlassesCosmeticSunglasses
+  id: ClothingEyesGlassesSunglasses
   name: sun glasses
   description: A pair of black sunglasses.
   components:
@@ -137,20 +137,15 @@
     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
     - SecDogWearable # DeltaV - let Laika wear sunglasses
 
-- 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 e6c04a0a54..f873ec5fe8 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
@@ -23,7 +23,7 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitMusician
     back: ClothingBackpackMusicianFilled
-    eyes: ClothingEyesGlassesCosmeticSunglasses
+    eyes: ClothingEyesGlassesSunglasses
     shoes: ClothingShoesBootsLaceup
     id: MusicianPDA
     ears: ClothingHeadsetService
diff --git a/RobustToolbox b/RobustToolbox
index baa607532d..a891cacae5 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit baa607532d0e9fc4a7d9212ab332d938d9324fbe
+Subproject commit a891cacae53d704f1d0afa85bd3bc10820c38881