Driller cape and Gar glasses for/from salvage

Resources/Prototypes/Catalog/Fills/Crates/cargo.yml

@@ -253,6 +253,9 @@
     - id: ToolboxGoldFilled
       prob: 0.001
       orGroup: Swag
+    - id: ClothingEyesGlassesGarMecha
+      prob: 0.01
+      orGroup: Swag
     - id: ClothingEyesGlassesGar
       prob: 0.01
       orGroup: Swag

Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml

@@ -12,7 +12,7 @@
     attackRate: 1.5
     damage:
       types:
-        Blunt: 7
+        Blunt: 10
 
 - type: entity
   parent: ClothingEyesBase
@@ -52,6 +52,25 @@
       types:
         Blunt: 10
 
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesGlassesGarMecha
+  name: mecha gar glasses
+  description: Believe in me! Believe in the me who believes in you!
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/gar.rsi
+    state: icon-mecha
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/gar.rsi
+    equippedPrefix: mecha
+  - type: Item
+    heldPrefix: mecha
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 10
+
 - type: entity
   parent: [ClothingEyesBase, BaseLensSlot, BaseEngineeringContraband]
   id: ClothingEyesGlassesMeson

Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml

@@ -153,6 +153,15 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/miner.rsi
 
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCloakDriller
+  name: driller's cape
+  description: Worn by the bravest salvagers, whose diamond-tipped drills can pierce the very heavens.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Cloaks/driller.rsi
+
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCloakTrans

Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml

@@ -17,6 +17,7 @@
         - id: ClothingEyesGlassesGar
         - id: ClothingEyesGlassesGarOrange
         - id: ClothingEyesGlassesGarGiga
+        - id: ClothingEyesGlassesGarMecha
       - id: Wristwatch
         weight: 0.5
       - id: ClothingHeadHatCake
@@ -349,6 +350,7 @@
       prototypes:
         - Lighter
         - CigCartonBlue
+        - ClothingEyesGlassesGarMecha
         - ClothingEyesGlassesGarGiga
         - ClothingEyesGlassesGarOrange
         - ClothingEyesGlassesGar

Resources/Prototypes/Entities/Objects/Decoration/present.yml

@@ -208,6 +208,8 @@
         orGroup: GiftPool
       - id: Skub
         orGroup: GiftPool
+      - id: ClothingEyesGlassesGarMecha
+        orGroup: GiftPool
       - id: ClothingEyesGlassesGarGiga
         orGroup: GiftPool
       - id: ClothingEyesGlassesGarOrange

Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml

@@ -8,6 +8,17 @@
       role: JobSalvageSpecialist
       time: 187200 #52 hrs (1 hour per week for 1 year)
 
+# Extreme time requirement prestige cape due to how flashy it is
+# They already have a way to show off playing for 52 hours anyway
+- type: loadoutEffectGroup
+  id: DrillerCapeWorthy
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobSalvageSpecialist
+      time: 360000 #100 hrs
+
 # Back
 - type: loadout
   id: SalvageSpecialistBackpack
@@ -45,6 +56,14 @@
   equipment:
     neck: ClothingNeckCloakMiner
 
+- type: loadout
+  id: DrillerCape
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: DrillerCapeWorthy
+  equipment:
+    neck: ClothingNeckCloakDriller
+
 - type: loadout
   id: SaMantle
   equipment:

Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml

@@ -48,3 +48,36 @@
     proto: JensenTimer
   equipment:
     eyes: ClothingEyesGlassesJensen
+
+# Gar glasses from 100h salvage
+- type: loadout
+  id: GlassesGarGreen
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: DrillerCapeWorthy
+  equipment:
+    eyes: ClothingEyesGlassesGar
+
+- type: loadout
+  id: GlassesGarOrange
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: DrillerCapeWorthy
+  equipment:
+    eyes: ClothingEyesGlassesGarOrange
+
+- type: loadout
+  id: GlassesGarRed
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: DrillerCapeWorthy
+  equipment:
+    eyes: ClothingEyesGlassesGarGiga
+
+- type: loadout
+  id: GlassesGarBlack
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: DrillerCapeWorthy
+  equipment:
+    eyes: ClothingEyesGlassesGarMecha

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -45,6 +45,10 @@
   - GlassesCheapSunglasses
   - GlassesJamjar
   - GlassesJensen
+  - GlassesGarGreen
+  - GlassesGarOrange
+  - GlassesGarRed
+  - GlassesGarBlack
 
 # The usual loadouts of the vox harness that spawn in your chest slot for jobs that don't have outerwear in their loadout
 - type: loadoutGroup
@@ -954,6 +958,7 @@
   minLimit: 0
   loadouts:
   - MinerCloak
+  - DrillerCape
   - SaMantle
   - ScarfBrown
 

Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/meta.json

@@ -13,6 +13,9 @@
     {
       "name": "icon-alt"
     },
+    {
+      "name": "icon-mecha"
+    },
     {
       "name": "icon-super"
     },
@@ -24,6 +27,10 @@
       "name": "alt-equipped-EYES",
       "directions": 4
     },
+    {
+      "name": "mecha-equipped-EYES",
+      "directions": 4
+    },
     {
       "name": "super-equipped-EYES",
       "directions": 4
@@ -43,6 +50,22 @@
     {
       "name": "alt-inhand-right",
       "directions": 4
+    },
+    {
+      "name": "mecha-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "mecha-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "super-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "super-inhand-right",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Clothing/Neck/Cloaks/driller.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "A prestige cape for salvagers for Impstation by Sha-Seng (Github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "equipped-NECK-vox",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}