Merge pull request #140 from Gorox221/hotfix_glasses

Фикс очков
ss14-ganimed · Apr 13, 2024 · a1f2029 · a1f2029
2 parents 8abe64b + 1e7a461
commit a1f2029
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 21 deletions.
diff --git a/Resources/Prototypes/Ganimed/Catalog/Loadout/Eyes/glasses.yml b/Resources/Prototypes/Ganimed/Catalog/Loadout/Eyes/glasses.yml
@@ -165,21 +165,3 @@
     - BlueShield
     - BridgeOfficer
   prototype: ClothingEyesGlassesSunglasses
-
-- type: loadout
-  id: LoadoutEyesClothingEyesGlassesSecurity
-  category: loadout-category-eyes
-  cost: 1
-  exclusive: true
-  whitelistJobs:
-    - SecurityCadet
-    - SecurityOfficer
-    - Warden
-    - Detective
-    - HeadOfSecurity
-    - Captain
-    - SeniorOfficer
-    - Captain
-    - Brigmedic
-    - BlueShield
-  prototype: ClothingEyesGlassesSecurity
diff --git a/Resources/Prototypes/Ganimed/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Ganimed/Entities/Clothing/Eyes/glasses.yml
@@ -113,4 +113,25 @@
   - type: ShowHealthBars
     damageContainers:
     - Inorganic
-    - Silicon
+    - Silicon
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesGlassesBlueShield
+  name: blue shield sunglasses
+  description: Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes. Special modifications may prove useful for blue shield officers.
+  components:
+  - type: Sprite
+    sprite: Ganimed/Clothing/Eyes/blueshieldglasses.rsi
+  - type: Clothing
+    sprite: Ganimed/Clothing/Eyes/blueshieldglasses.rsi
+  - type: FlashImmunity
+  - type: EyeProtection
+    protectionTime: 5
+  - type: Tag
+    tags:
+    - HamsterWearable
+    - WhitelistChameleon
+  - type: GuideHelp
+    guides:
+    - Security
diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -47,7 +47,7 @@
     back: ClothingBackpackHOSFilled
     shoes: ClothingShoesBootsJackSecFilled
     outerClothing: ClothingOuterCoatHoSTrench
-    eyes: ClothingEyesHUDGlassesSecurity
+    eyes: ClothingEyesGlassesSecurity
     head: ClothingHeadHatBeretHoS
     id: HoSPDA
     gloves: ClothingHandsGlovesCombat

diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/blueshield.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/blueshield.yml
@@ -43,7 +43,7 @@
     jumpsuit: ClothingUniformJumpsuitBlueShield
     back: ClothingBackpackSecurityBlueShieldFilled
     shoes: ClothingShoesBootsJack
-    eyes: ClothingEyesGlassesBlueShield
+    eyes: ClothingEyesGlassesSunglasses
     head: ClothingHeadHatBeretBlueShield
     outerClothing: ClothingOuterCoatBlueShield
     neck: ClothingNeckTieBlueShield