new-frontiers-14 · dvir001 · Sep 20, 2024 · Sep 17, 2024 · Sep 17, 2024 · Sep 17, 2024
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Civilian/valet.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Civilian/valet.yml
@@ -25,20 +25,15 @@
     holiday: FrontierBirthday # Frontier
     prototype: FrontierBirthdayGift # Frontier
 
+# Frontier: valet loadout
 - type: startingGear
   id: ValetGear
   equipment:
     head: ClothingHeadHatBellhop
-  # jumpsuit: ClothingUniformJumpsuitValet
-    outerClothing: ClothingOuterVestValet
     gloves: ClothingHandsGlovesColorWhite
     id: ValetPDA
-#    ears: ClothingHeadsetService # Frontier
-  # innerClothingSkirt: ClothingUniformJumpskirtValet
-  # satchel: ClothingBackpackSatchelFilled
-  # duffelbag: ClothingBackpackDuffelFilled
-  # messenger: ClothingBackpackMessengerFilled # Frontier
-  storage: # Frontier
-    back: # Frontier
+  storage:
+    back:
     - EncryptionKeyService # Frontier
-    - ShipVoucherFrontierValet # Frontier
+    - ShipVoucherFrontierValet
+# End Frontier
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/outer.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/outer.yml
@@ -1,3 +1,12 @@
+- type: loadout
+  id: ContractorClothingOuterVestTank
+  price: 0
+  hideEffects:
+  - !type:GroupLoadoutEffect
+    proto: EffectSpeciesVox
+  equipment:
+    outerClothing: ClothingOuterVestTank
+
 - type: loadout
   id: ContractorClothingOuterSuitEmergency
   price: 800

diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/outer.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/outer.yml
@@ -0,0 +1,11 @@
+- type: loadout
+  id: PirateFirstMateClothingOuterCoatGentle
+  price: 0
+  equipment:
+    outerClothing: ClothingOuterCoatGentle
+
+- type: loadout
+  id: PirateCaptainClothingOuterCoatPirate
+  price: 0
+  equipment:
+    outerClothing: ClothingOuterCoatPirate
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Valet/outer.yml
@@ -0,0 +1,5 @@
+- type: loadout
+  id: ValetClothingOuterVestValet
+  price: 0
+  equipment:
+    outerClothing: ClothingOuterVestValet
diff --git a/Resources/Prototypes/_NF/Loadouts/bailiff_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/bailiff_loadout_groups.yml
@@ -13,7 +13,10 @@
   name: loadout-group-contractor-outerclothing
   minLimit: 0
   loadouts:
+  - ContractorClothingOuterVestTank
   - BailiffOuterClothing
+  fallbacks:
+  - ContractorClothingOuterVestTank
 
 - type: loadoutGroup
   id: BailiffHead

diff --git a/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml
@@ -13,7 +13,10 @@
   name: loadout-group-contractor-outerclothing
   minLimit: 0
   loadouts:
+  - ContractorClothingOuterVestTank
   - BrigmedicOuterClothing
+  fallbacks:
+  - ContractorClothingOuterVestTank
 
 - type: loadoutGroup
   id: BrigmedicHead

diff --git a/Resources/Prototypes/_NF/Loadouts/cadet_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/cadet_loadout_groups.yml
@@ -13,7 +13,10 @@
   name: loadout-group-contractor-outerclothing
   minLimit: 0
   loadouts:
+  - ContractorClothingOuterVestTank
   - NfsdOuterClothing
+  fallbacks:
+  - ContractorClothingOuterVestTank
 
 - type: loadoutGroup
   id: CadetHead

diff --git a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml
@@ -257,6 +257,7 @@
   name: loadout-group-contractor-outerclothing
   minLimit: 0
   loadouts:
+  - ContractorClothingOuterVestTank
   - ContractorClothingOuterSuitEmergency
   - ContractorClothingOuterHardsuitEVA
   - ContractorClothingOuterHardsuitBasic
@@ -341,6 +342,8 @@
   - ContractorWetFloorSign
   - ContractorClothingOuterCoatExpensive
   - ContractorClothingOuterCoatSpaceAsshole
+  fallbacks:
+  - ContractorClothingOuterVestTank # Vox-only, default them to have this equipped
 
 - type: loadoutGroup
   id: ContractorBelt

diff --git a/Resources/Prototypes/_NF/Loadouts/deputy_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/deputy_loadout_groups.yml
@@ -13,7 +13,10 @@
   name: loadout-group-contractor-outerclothing
   minLimit: 0
   loadouts:
+  - ContractorClothingOuterVestTank
   - NfsdOuterClothing
+  fallbacks:
+  - ContractorClothingOuterVestTank
 
 - type: loadoutGroup
   id: DeputyHead

diff --git a/Resources/Prototypes/_NF/Loadouts/detectivenf_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/detectivenf_loadout_groups.yml
@@ -13,10 +13,13 @@
   name: loadout-group-contractor-outerclothing
   minLimit: 0
   loadouts:
+  - ContractorClothingOuterVestTank
   - DetectiveNFClothingOuterArmorBasic
   - DetectiveNFClothingOuterCoatDetectiveLoadout
   - DetectiveNFClothingOuterCoatDetectiveLoadoutGrey
   - DetectiveNFClothingOuterCoatTrench
+  fallbacks:
+  - ContractorClothingOuterVestTank
 
 - type: loadoutGroup
   id: DetectiveNFHead

diff --git a/Resources/Prototypes/_NF/Loadouts/janitor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/janitor_loadout_groups.yml
@@ -32,5 +32,8 @@
   name: loadout-group-contractor-outerclothing
   minLimit: 0
   loadouts:
+  - ContractorClothingOuterVestTank
   - JanitorNFClothingOuterWinterJani
   - JanitorNFWetFloorSign
+  fallbacks:
+  - ContractorClothingOuterVestTank
diff --git a/Resources/Prototypes/_NF/Loadouts/mail_carrier_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/mail_carrier_loadout_groups.yml
@@ -14,8 +14,11 @@
   name: loadout-group-contractor-outerclothing
   minLimit: 0
   loadouts:
+  - ContractorClothingOuterVestTank
   - MailCarrierClothingOuterWinterCoatMail
   - MailCarrierClothingOuterEVASuitMailman
+  fallbacks:
+  - ContractorClothingOuterVestTank
 
 - type: loadoutGroup
   id: MailCarrierBackpack

diff --git a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml
@@ -50,6 +50,8 @@
   subgroups:
   - PilotOuterClothing
   - ContractorOuterClothing
+  fallbacks:
+  - ContractorClothingOuterVestTank # Vox-only, default them to have this equipped
 
 - type: loadoutGroup
   id: MercenaryShoes

diff --git a/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml
@@ -34,6 +34,8 @@
   - PilotClothingOuterHardsuitPilot
   subgroups:
   - ContractorOuterClothing
+  fallbacks:
+  - ContractorClothingOuterVestTank # Vox-only, default them to have this equipped
 
 - type: loadoutGroup
   id: PilotShoes

diff --git a/Resources/Prototypes/_NF/Loadouts/pirates_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/pirates_loadout_groups.yml
@@ -53,15 +53,7 @@
   fallbacks:
   - PirateClothingHeadBandBlack
 
-- type: loadoutGroup
-  id: PirateFirstMateHead
-  name: loadout-group-contractor-head
-  minLimit: 0
-  loadouts:
-  - PirateClothingHeadHatPirateTricord
-  - PirateClothingHeadHatPirateLuffy
-  fallbacks:
-  - PirateClothingHeadHatPirateTricord
+# Pirate Captain loadouts
 
 - type: loadoutGroup
   id: PirateCaptainHead
@@ -73,7 +65,15 @@
   fallbacks:
   - PirateClothingHeadHatPirate
 
-# Pirate Captain loadouts
+- type: loadoutGroup
+  id: PirateCaptainOuterClothing
+  name: loadout-group-contractor-outerclothing
+  loadouts:
+  - ContractorClothingOuterVestTank
+  - PirateCaptainClothingOuterCoatPirate
+  fallbacks:
+  - ContractorClothingOuterVestTank
+  - PirateCaptainClothingOuterCoatPirate
 
 - type: loadoutGroup
   id: PirateCaptainPDA
@@ -86,6 +86,26 @@
 
 # Pirate First Mate loadouts
 
+- type: loadoutGroup
+  id: PirateFirstMateHead
+  name: loadout-group-contractor-head
+  minLimit: 0
+  loadouts:
+  - PirateClothingHeadHatPirateTricord
+  - PirateClothingHeadHatPirateLuffy
+  fallbacks:
+  - PirateClothingHeadHatPirateTricord
+
+- type: loadoutGroup
+  id: PirateFirstMateOuterClothing
+  name: loadout-group-contractor-outerclothing
+  loadouts:
+  - ContractorClothingOuterVestTank
+  - PirateFirstMateClothingOuterCoatGentle
+  fallbacks:
+  - ContractorClothingOuterVestTank
+  - PirateFirstMateClothingOuterCoatGentle
+
 - type: loadoutGroup
   id: PirateFirstMatePDA
   name: loadout-group-contractor-id