Adds dedicated salvage specialist role (#6451)

Resources/Prototypes/AccessLevels/cargo.yml

@@ -3,3 +3,6 @@
 
 - type: accessLevel
   id: Cargo
+
+- type: accessLevel
+  id: Salvage

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

@@ -0,0 +1,20 @@
+- type: entity
+  id: LockerSalvageSpecialistFilled
+  suffix: Filled
+  parent: LockerSalvageSpecialist
+  components:
+  - type: StorageFill
+    contents:
+# Should be moved to a suit storage unit when/if they are added.
+      - id: ClothingOuterHardsuitSalvage
+      - id: YellowOxygenTank
+      - id: ClothingShoesBootsMag
+      - id: ClothingHeadHelmetHardsuitSalvage
+      - id: ClothingMaskGas
+# Currently do not function as 'true' mesons, so they're useless for salvagers.
+#      - id: ClothingEyesGlassesMeson
+      - id: ClothingBeltUtilityFilled
+      - id: FlashlightSeclite
+      - id: SurvivalKnife
+
+

Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml

@@ -187,6 +187,19 @@
        - id: ClothingHandsGlovesFingerless
          amount: 1
 
+ - type: entity
+   id: WardrobeSalvageFilled
+   suffix: Filled
+   parent: WardrobeSalvage
+   components:
+   - type: StorageFill
+     contents:
+       - id: ClothingBackpack
+         amount: 1
+       - id: ClothingShoesBootsSalvage
+         amount: 2
+       - id: ClothingUniformJumpsuitSalvageSpecialist
+         amount: 2
 
 # - type: entity
 #   id: WardrobeAtmosphericsFilled

Resources/Prototypes/Entities/Clothing/Shoes/boots.yml

@@ -19,3 +19,15 @@
     sprite: Clothing/Shoes/Boots/jackboots.rsi
   - type: Clothing
     sprite: Clothing/Shoes/Boots/jackboots.rsi
+
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesBootsSalvage
+  name: salvage boots
+  description: Steel-toed salvage boots for salvaging in hazardous environments.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Boots/explorer.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Boots/explorer.rsi
+

Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -53,6 +53,21 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/cargotech.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitSalvageSpecialist
+  name: salvage specialist's jumpsuit
+  description: It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9 # Those overalls ARE sturdy.
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitChiefEngineer

Resources/Prototypes/Entities/Markers/Spawners/jobs.yml

@@ -58,6 +58,18 @@
       - state: green
       - state: cargo_tech
 
+- type: entity
+  id: SpawnPointSalvageSpecialist
+  parent: SpawnPointJobBase
+  name: salvagespecialist
+  components:
+  - type: SpawnPoint
+    job_id: SalvageSpecialist
+  - type: Sprite
+    layers:
+      - state: green
+      - state: miner
+
 # Civilian
 
 - type: entity

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -203,6 +203,21 @@
   - type: Icon
     state: pda-cargo
 
+- type: entity
+  parent: BasePDA
+  id: SalvagePDA
+  name: salvage PDA
+  description: Smells like ash.
+  components:
+  - type: PDA
+    id: SalvageIDCard
+  - type: Appearance
+    visuals:
+      - type: PDAVisualizer
+        state: pda-miner
+  - type: Icon
+    state: pda-miner
+
 - type: entity
   parent: BasePDA
   id: BartenderPDA

Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml

@@ -118,6 +118,18 @@
   - type: PresetIdCard
     job: CargoTechnician
 
+- type: entity
+  parent: IDCardStandard
+  id: SalvageIDCard
+  name: salvage ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: idshaftminer
+  - type: PresetIdCard
+    job: SalvageSpecialist
+
 - type: entity
   parent: IDCardStandard
   id: QuartermasterIDCard

Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml

@@ -88,3 +88,18 @@
     size: 10
     sprite: Objects/Weapons/Melee/combat_knife.rsi
     prefix: inhand
+
+- type: entity
+  name: survival knife
+  parent: CombatKnife
+  id: SurvivalKnife
+  description: Weapon of first and last resort for combatting space carp.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/survival_knife.rsi
+    size: 2
+    state: icon
+  - type: Item
+    size: 10
+    sprite: Objects/Weapons/Melee/survival_knife.rsi
+    prefix: inhand

Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml

@@ -96,6 +96,14 @@
   - type: AccessReader
     access: [["Cargo"]]
 
+- type: entity
+  parent: AirlockCargo
+  id: AirlockSalvageLocked
+  suffix: Salvage, Locked
+  components:
+  - type: AccessReader
+    access: [["Salvage"]]
+    
 - type: entity
   parent: AirlockCargo
   id: AirlockQuartermasterLocked
@@ -297,6 +305,14 @@
   - type: AccessReader
     access: [["Cargo"]]
 
+- type: entity
+  parent: AirlockCargoGlass
+  id: AirlockSalvageGlassLocked
+  suffix: Salvage, Locked
+  components:
+  - type: AccessReader
+    access: [["Salvage"]]
+
 - type: entity
   parent: AirlockCargoGlass
   id: AirlockQuartermasterGlassLocked

Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml

@@ -34,6 +34,21 @@
   - type: AccessReader
     access: [["Quartermaster"]]
 
+- type: entity
+  id: LockerSalvageSpecialist
+  parent: LockerBase
+  name: salvage specialist's equipment
+  description: Nevermind the pickaxe.
+  components:
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer
+      state: mining
+      state_open: mining_open
+      state_closed: mining_door
+  - type: AccessReader
+    access: [["Salvage"]] 
+    
 # Command
 - type: entity
   id: LockerCaptain

Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml

@@ -193,6 +193,12 @@
   parent: WardrobePrison
   name: cargo wardrobe
 
+- type: entity
+  id: WardrobeSalvage
+  parent: WardrobeMixed
+  name: salvage wardrobe
+  description: Notably not salvaged.
+
 - type: entity
   id: WardrobeEngineering
   parent: WardrobeYellow

Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml

@@ -8,6 +8,7 @@
   supervisors: "the head of personnel"
   access:
   - Cargo
+  - Salvage
   - Quartermaster
   - Maintenance
   - External

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

@@ -0,0 +1,24 @@
+- type: job
+  id: SalvageSpecialist
+  name: "salvage spationaut"
+  icon: "ShaftMiner"
+  startingGear: SalvageSpecialistGear
+  departments:
+  - Cargo
+  supervisors: "the quartermaster and head of personnel"
+  access:
+  - Cargo
+  - Salvage
+  - Maintenance
+  - External
+
+- type: startingGear
+  id: SalvageSpecialistGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitSalvageSpecialist
+    back: ClothingBackpackFilled
+    shoes: ClothingShoesBootsSalvage
+    id: SalvagePDA
+    ears: ClothingHeadsetCargo
+  satchel: ClothingBackpackSatchelFilled
+  duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Roles/Jobs/Command/captain.yml

@@ -15,6 +15,7 @@
   # Could probably do with some kind of wildcard or whatever to automate this.
   # HELL FUCKING YEAH WE COULD
   # Guys please don't fight
+  # Seriously though...
   - Captain
   - HeadOfPersonnel
   - ChiefEngineer
@@ -28,6 +29,7 @@
   - Engineering
   - Medical
   - Quartermaster
+  - Salvage
   - Cargo
   - Research
   - Service

Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml

@@ -15,6 +15,7 @@
   - Security # HoPcurity strikes again
   - Service
   - Quartermaster
+  - Salvage
   - Cargo
   - Maintenance
   - Janitor

Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6236a0ddd1bd3c4e5574eb9fdebf4d79ccad2d2f",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-FEET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0a1ae39f0fb7353b0704f27d1599a567891f727c",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/6cdc0503d32e249125151e369edf951e93bccd1a",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    }
+  ]
+}