Aviators PT2 Electric Boogaloo (cosmatic-drift-14#32)

* Hey look! My changes are back. Test fails should be fixed too. * Requested Changes (Remove from secdrobe -> Add to bardrobe) * Upped to four
LankLTE · Nov 12, 2023 · 119fc80 · 119fc80
1 parent a1c414d
commit 119fc80
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 2 deletions.
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
@@ -16,4 +16,4 @@
     ClothingOuterVest: 2
     ClothingBeltBandolier: 2
     ClothingEyesGlassesSunglasses: 2
-
+    ClothingEyesGlassesAviator: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/quickthreads.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/quickthreads.yml
@@ -55,3 +55,4 @@
     ClothingHandsGlovesColorWhite: 2
     ClothingNeckTieDet: 2
     ClothingNeckTieRed: 2
+    ClothingEyesGlassesAviator: 4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -20,4 +20,4 @@
     ClothingOuterArmorBasic: 2
     ClothingOuterArmorBasicSlim: 2 
     ClothingEyesBlindfold: 1
-    ClothingShoesBootsCombat: 3
+    ClothingShoesBootsCombat: 3
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -162,6 +162,17 @@
   - type: EyeProtection
     protectionTime: 5
 
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesGlassesAviator
+  name: aviator sunglasses
+  description: A set of glasses designed to be worn under headgear and other equipment.
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/aviators.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/aviators.rsi
+
 #Make a scanner category when these actually function and we get the trayson
 - type: entity
   parent: ClothingEyesBase

diff --git a/Resources/Textures/Clothing/Eyes/Glasses/aviators.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/aviators.rsi/equipped-EYES.png
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/aviators.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/aviators.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/aviators.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/aviators.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/aviators.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/aviators.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/aviators.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/aviators.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites created by MrGreen06 (Discord) ported ingame by PursuitinAshes.",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "equipped-EYES",
+        "directions": 4
+      },
+      {
+        "name": "inhand-left",
+        "directions": 4
+      },
+      {
+        "name": "inhand-right",
+        "directions": 4
+      }
+    ]
+  }