More loadout mastery items, starting glasses

Resources/Locale/en-US/preferences/loadout-groups.ftl

@@ -24,12 +24,16 @@ loadout-group-captain-jumpsuit = Captain jumpsuit
 loadout-group-captain-neck = Captain neck
 loadout-group-captain-backpack = Captain backpack
 loadout-group-captain-outerclothing = Captain outer clothing
+loadout-group-captain-ears = Captain headset
+loadout-group-captain-shoes = Captain shoes
 
 loadout-group-hop-head = Head of Personnel head
 loadout-group-hop-jumpsuit = Head of Personnel jumpsuit
 loadout-group-hop-neck = Head of Personnel neck
 loadout-group-hop-backpack = Head of Personnel backpack
 loadout-group-hop-outerclothing = Head of Personnel outer clothing
+loadout-group-hop-ears = Head of Personnel headset
+loadout-group-hop-shoes = Head of Personnel shoes
 
 # Civilian
 loadout-group-passenger-jumpsuit = Passenger jumpsuit
@@ -92,6 +96,7 @@ loadout-group-quartermaster-jumpsuit = Quartermaster jumpsuit
 loadout-group-quartermaster-neck = Quartermaster neck
 loadout-group-quartermaster-outerclothing = Quartermaster outer clothing
 loadout-group-quartermaster-shoes = Quartermaster shoes
+loadout-group-quartermaster-ears = Quartermaster headset
 
 loadout-group-cargo-technician-head = Cargo Technician head
 loadout-group-cargo-technician-jumpsuit = Cargo Technician jumpsuit
@@ -102,13 +107,16 @@ loadout-group-cargo-technician-shoes = Cargo Technician shoes
 loadout-group-salvage-specialist-backpack = Salvage Specialist backpack
 loadout-group-salvage-specialist-outerclothing = Salvage Specialist outer clothing
 loadout-group-salvage-specialist-shoes = Salvage Specialist shoes
+loadout-group-salvage-specialist-ears = Salvage Specialist headset
+loadout-group-salvage-specialist-neck = Salvage Specialist neck
 
 # Engineering
 loadout-group-chief-engineer-head = Chief Engineer head
 loadout-group-chief-engineer-jumpsuit = Chief Engineer jumpsuit
 loadout-group-chief-engineer-outerclothing = Chief Engineer outer clothing
 loadout-group-chief-engineer-neck = Chief Engineer neck
 loadout-group-chief-engineer-shoes = Chief Engineer shoes
+loadout-group-chief-engineer-ears = Chief Engineer headset
 
 loadout-group-technical-assistant-jumpsuit = Technical Assistant jumpsuit
 
@@ -130,6 +138,7 @@ loadout-group-research-director-neck = Research Director neck
 loadout-group-research-director-jumpsuit = Research Director jumpsuit
 loadout-group-research-director-outerclothing = Research Director outer clothing
 loadout-group-research-director-shoes = Research Director shoes
+loadout-group-research-director-ears = Research Director headset
 
 loadout-group-scientist-head = Scientist head
 loadout-group-scientist-neck = Scientist neck
@@ -147,6 +156,7 @@ loadout-group-head-of-security-head = Head of Security head
 loadout-group-head-of-security-jumpsuit = Head of Security jumpsuit
 loadout-group-head-of-security-neck = Head of Security neck
 loadout-group-head-of-security-outerclothing = Head of Security outer clothing
+loadout-group-head-of-security-ears = Head of Security headset
 
 loadout-group-warden-head = Warden head
 loadout-group-warden-jumpsuit = Warden jumpsuit
@@ -177,8 +187,10 @@ loadout-group-chief-medical-officer-jumpsuit = Chief Medical Officer jumpsuit
 loadout-group-chief-medical-officer-outerclothing = Chief Medical Officer outer clothing
 loadout-group-chief-medical-officer-shoes = Chief Medical Officer shoes
 loadout-group-chief-medical-officer-neck = Chief Medical Officer neck
+loadout-group-chief-medical-officer-ears = Chief Medical Officer headset
 
 loadout-group-medical-doctor-head = Medical Doctor head
+loadout-group-medical-doctor-eyes = Medical Doctor HUD
 loadout-group-medical-doctor-jumpsuit = Medical Doctor jumpsuit
 loadout-group-medical-doctor-outerclothing = Medical Doctor outer clothing
 loadout-group-medical-doctor-backpack = Medical Doctor backpack

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

@@ -12,7 +12,7 @@
     - id: SalvageMagnetMachineCircuitboard
     - id: CigPackGreen
       prob: 0.50
-    - id: ClothingHeadsetAltCargo
+    - id: ClothingHeadsetCargo
     - id: DoorRemoteCargo
     - id: RubberStampApproved
     - id: RubberStampDenied
@@ -38,7 +38,7 @@
     - id: CigarGoldCase
       prob: 0.25
     - id: ClothingBeltSheathFilled
-    - id: ClothingHeadsetAltCommand
+    - id: ClothingHeadsetCommand
     - id: ClothingOuterArmorCaptainCarapace
     - id: CommsComputerCircuitboard
     - id: DoorRemoteCommand
@@ -126,6 +126,7 @@
       prob: 0.5
     - id: ClothingHeadsetCommand
     - id: ClothingNeckGoldmedal
+    - id: ClothingHandsGlovesHop
     - id: DoorRemoteService
     - id: HoPIDCard
     - id: IDComputerCircuitboard
@@ -157,7 +158,7 @@
     - id: ClothingBeltChiefEngineerFilled
     - id: ClothingEyesGlassesMeson
     - id: ClothingHandsGlovesColorYellow
-    - id: ClothingHeadsetAltEngineering
+    - id: ClothingHeadsetCE
     - id: DoorRemoteEngineering
     - id: RCD
     - id: RCDAmmo
@@ -211,7 +212,7 @@
     - id: ClothingEyesHudMedical
     - id: ClothingHandsGlovesNitrile
     - id: ClothingHeadHatBeretCmo
-    - id: ClothingHeadsetAltMedical
+    - id: ClothingHeadsetCMO
     - id: ClothingMaskSterile
     - id: DoorRemoteMedical
     - id: HandheldCrewMonitor
@@ -265,7 +266,7 @@
     - id: BoxEncryptionKeyScience
     - id: CircuitImprinterMachineCircuitboard
     - id: ClothingBeltUtilityFilled
-    - id: ClothingHeadsetAltScience
+    - id: ClothingHeadsetRD
     - id: DoorRemoteResearch
     - id: HandTeleporter
     - id: ProtolatheMachineCircuitboard
@@ -319,7 +320,7 @@
       prob: 0.50
     - id: ClothingBeltSecurityFilled
     - id: ClothingEyesGlassesSecurity
-    - id: ClothingHeadsetAltSecurity
+    - id: ClothingHeadsetSecurity
     - id: ClothingMaskNeckGaiter
     - id: ClothingOuterCoatHoSTrench
     - id: ClothingShoesBootsJack

Resources/Prototypes/Entities/Clothing/Ears/headsets.yml

@@ -241,6 +241,19 @@
   - type: Clothing
     sprite: Clothing/Ears/Headsets/security.rsi
 
+- type: entity
+  parent: [ClothingHeadsetSecurity, BaseCommandContraband]
+  id: ClothingHeadsetHoS
+  name: hos headset
+  description: A headset used by the head of security, perfect for arguing with the lawyer and captain during shootouts.
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeySecurity
+      - EncryptionKeyCommand
+      - EncryptionKeyCommon
+
 - type: entity
   parent: [ClothingHeadset, BaseRestrictedContraband]
   id: ClothingHeadsetBrigmedic

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

@@ -1,4 +1,4 @@
-# For mantles
+# For Master Quartermasters; over-ear headset, mantle
 - type: loadoutEffectGroup
   id: MasterQM
   effects:
@@ -53,7 +53,7 @@
 
 - type: loadout
   id: QuartermasterMantle
-  equipment: 
+  equipment:
     neck: ClothingNeckMantleQM
   effects:
   - !type:GroupLoadoutEffect
@@ -69,3 +69,22 @@
   id: QuartermasterWintercoat
   equipment:
     outerClothing: ClothingOuterWinterQM
+
+# Ears
+- type: loadout
+  id: QuartermasterHeadset
+  equipment:
+    ears: ClothingHeadsetQM
+
+- type: loadout
+  id: QuartermasterAltHeadset
+  equipment:
+    ears: ClothingHeadsetAltCargo
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: MasterQM
+
+- type: startingGear
+  id: QuartermasterAltHeadset
+  equipment:
+    ears: ClothingHeadsetAltCargo

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

@@ -1,3 +1,27 @@
+# For Master Salvage Specialists; mining headset, cloak
+- type: loadoutEffectGroup
+  id: MasterSalvageSpecialist
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobSalvageSpecialist
+      time: 180000 # 50 hrs
+
+# Neck
+- type: loadout
+  id: MiningCloak
+  equipment:
+    neck: ClothingNeckCloakMiner
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: MasterSalvageSpecialist
+
+- type: startingGear
+  id: MiningCloak
+  equipment:
+    neck: ClothingNeckCloakMiner
+
 # Back
 - type: loadout
   id: SalvageSpecialistBackpack
@@ -25,3 +49,22 @@
   id: SalvageBoots
   equipment:
     shoes: ClothingShoesBootsSalvage
+
+# Ears
+- type: loadout
+  id: CargoHeadset
+  equipment:
+    ears: ClothingHeadsetCargo
+
+- type: loadout
+  id: SalvageMiningHeadset
+  equipment:
+    neck: ClothingHeadsetMining
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: MasterSalvageSpecialist
+
+- type: startingGear
+  id: SalvageMiningHeadset
+  equipment:
+    ears: ClothingHeadsetMining

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

@@ -1,4 +1,4 @@
-# For mantles
+# For Master Captains; over-ear headset, mantle
 - type: loadoutEffectGroup
   id: MasterCap
   effects:
@@ -80,7 +80,7 @@
   equipment:
     back: ClothingBackpackDuffelCaptain
 
-# Outer clothing
+# OuterClothing
 - type: loadout
   id: CaptainOuterClothing
   equipment:
@@ -90,3 +90,33 @@
   id: CaptainWintercoat
   equipment:
     outerClothing: ClothingOuterWinterCap
+
+# Ears
+- type: loadout
+  id: CommandHeadset
+  equipment:
+    ears: ClothingHeadsetCommand
+
+- type: loadout
+  id: CommandAltHeadset
+  equipment:
+    ears: ClothingHeadsetAltCommand
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: MasterCap
+
+- type: startingGear
+  id: CommandAltHeadset
+  equipment:
+    ears: ClothingHeadsetAltCommand
+
+# Shoes
+- type: loadout
+  id: LaceupShoes
+  equipment:
+    shoes: ClothingShoesBootsLaceup
+
+- type: loadout
+  id: CommandWinterBoots
+  equipment:
+    shoes: ClothingShoesBootsWinter

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

@@ -1,4 +1,4 @@
-# For mantles
+# For Master HoPs; over-ear headset, mantle
 - type: loadoutEffectGroup
   id: MasterHoP
   effects:
@@ -8,7 +8,7 @@
       role: JobHeadOfPersonnel
       time: 72000 #20 hrs
 
-# Professional HoP Time
+# For Professional HoPs; backpack
 - type: loadoutEffectGroup
   id: ProfessionalHoP
   effects:
@@ -63,8 +63,28 @@
   equipment:
     back: ClothingBackpackIan
 
-# Outerclothing
+# OuterClothing
 - type: loadout
   id: HoPWintercoat
   equipment:
     outerClothing: ClothingOuterWinterHoP
+
+# Ears
+- type: loadout
+  id: HoPAltHeadset
+  equipment:
+    ears: ClothingHeadsetAltCommand
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: MasterHoP
+
+- type: startingGear
+  id: HoPAltHeadset
+  equipment:
+    ears: ClothingHeadsetAltCommand
+
+# Shoes
+- type: loadout
+  id: BrownShoes
+  equipment:
+    shoes: ClothingShoesColorBrown

Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml

@@ -1,4 +1,4 @@
-# For mantles
+# For Master CEs; over-ear headset, mantle
 - type: loadoutEffectGroup
   id: MasterCE
   effects:
@@ -64,8 +64,21 @@
   equipment:
     outerClothing: ClothingOuterWinterCE
 
-# Shoes
+# Ears
 - type: loadout
-  id: BrownShoes
+  id: ChiefEngineerHeadset
   equipment:
-    shoes: ClothingShoesColorBrown
+    ears: ClothingHeadsetCE
+
+- type: loadout
+  id: ChiefEngineerAltHeadset
+  equipment:
+    ears: ClothingHeadsetAltEngineering
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: MasterCE
+
+- type: startingGear
+  id: ChiefEngineerAltHeadset
+  equipment:
+    ears: ClothingHeadsetAltEngineering