Military Jumpsuits (#1454)

* initial commit

* update

* fixes

* loadouts

* name change

* fix

* moved new jumpsuits behind T3 time lock

Resources/Prototypes/_NF/Loadouts/Jobs/MailCarrier/jumpsuit.yml

@@ -17,3 +17,16 @@
   id: MailCarrierClothingUniformJumpskirtMailCarrier
   equipment:
     jumpsuit: ClothingUniformJumpskirtMailCarrier
+
+- type: loadout
+  id: MailCarrierClothingUniformJumpsuitMilitaryMailCarrier
+  equipment: MailCarrierClothingUniformJumpsuitMilitaryMailCarrier
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT3
+  price: 650
+
+- type: startingGear
+  id: MailCarrierClothingUniformJumpsuitMilitaryMailCarrier
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitMilitaryMailCarrier

Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/jumpsuit.yml

@@ -17,3 +17,95 @@
   id: MercenaryClothingUniformJumpskirtMercenary
   equipment:
     jumpsuit: ClothingUniformJumpskirtMercenary
+
+# T3 "Military"
+- type: loadout
+  id: MercenaryClothingUniformJumpsuitMilitaryTurtleneckMercenary
+  equipment: MercenaryClothingUniformJumpsuitMilitaryTurtleneckMercenary
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT3
+  price: 650
+
+- type: startingGear
+  id: MercenaryClothingUniformJumpsuitMilitaryTurtleneckMercenary
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitMilitaryTurtleneckMercenary
+
+- type: loadout
+  id: MercenaryClothingUniformJumpsuitMilitaryTurtleneckMercenaryMedic
+  equipment: MercenaryClothingUniformJumpsuitMilitaryTurtleneckMercenaryMedic
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT3
+  price: 650
+
+- type: startingGear
+  id: MercenaryClothingUniformJumpsuitMilitaryTurtleneckMercenaryMedic
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitMilitaryTurtleneckMercenaryMedic
+
+- type: loadout
+  id: MercenaryClothingUniformJumpsuitMilitaryTurtleneckMercenaryCaptain
+  equipment: MercenaryClothingUniformJumpsuitMilitaryTurtleneckMercenaryCaptain
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT3
+  price: 650
+
+- type: startingGear
+  id: MercenaryClothingUniformJumpsuitMilitaryTurtleneckMercenaryCaptain
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitMilitaryTurtleneckMercenaryCaptain
+
+- type: loadout
+  id: MercenaryClothingUniformJumpsuitMilitaryTurtleneckBlueMercenary
+  equipment: MercenaryClothingUniformJumpsuitMilitaryTurtleneckBlueMercenary
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT3
+  price: 650
+
+- type: startingGear
+  id: MercenaryClothingUniformJumpsuitMilitaryTurtleneckBlueMercenary
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitMilitaryTurtleneckBlueMercenary
+
+- type: loadout
+  id: MercenaryClothingUniformJumpsuitMilitaryTurtleneckBlueMercenaryMedic
+  equipment: MercenaryClothingUniformJumpsuitMilitaryTurtleneckBlueMercenaryMedic
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT3
+  price: 650
+
+- type: startingGear
+  id: MercenaryClothingUniformJumpsuitMilitaryTurtleneckBlueMercenaryMedic
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitMilitaryTurtleneckBlueMercenaryMedic
+
+- type: loadout
+  id: MercenaryClothingUniformJumpsuitMilitaryTurtleneckBlueMercenaryCaptain
+  equipment: MercenaryClothingUniformJumpsuitMilitaryTurtleneckBlueMercenaryCaptain
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT3
+  price: 650
+
+- type: startingGear
+  id: MercenaryClothingUniformJumpsuitMilitaryTurtleneckBlueMercenaryCaptain
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitMilitaryTurtleneckBlueMercenaryCaptain
+
+- type: loadout
+  id: MercenaryClothingUniformJumpsuitMilitaryPilot
+  equipment: MercenaryClothingUniformJumpsuitMilitaryPilot
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT3
+  price: 1250
+
+- type: startingGear
+  id: MercenaryClothingUniformJumpsuitMilitaryPilot
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitMilitaryPilot

Resources/Prototypes/_NF/Loadouts/Jobs/Pilot/jumpsuit.yml

@@ -7,3 +7,43 @@
   id: PilotClothingUniformJumpsuitPilot
   equipment:
     jumpsuit: ClothingUniformJumpsuitPilot
+
+# T3 "Military"
+- type: loadout
+  id: PilotClothingUniformJumpsuitMilitaryPilot
+  equipment: PilotClothingUniformJumpsuitMilitaryPilot
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 675
+
+- type: startingGear
+  id: PilotClothingUniformJumpsuitMilitaryPilot
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitMilitaryPilot
+
+- type: loadout
+  id: PilotClothingUniformJumpsuitMilitaryContractor
+  equipment: PilotClothingUniformJumpsuitMilitaryContractor
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 1250
+
+- type: startingGear
+  id: PilotClothingUniformJumpsuitMilitaryContractor
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitMilitaryContractor
+
+- type: loadout
+  id: PilotClothingUniformJumpsuitMilitaryContractorTac
+  equipment: PilotClothingUniformJumpsuitMilitaryContractorTac
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 1250
+
+- type: startingGear
+  id: PilotClothingUniformJumpsuitMilitaryContractorTac
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitMilitaryContractorTac

Resources/Prototypes/_NF/Loadouts/Jobs/StationRep/jumpsuit.yml

@@ -17,3 +17,16 @@
   id: StationRepClothingUniformJumpskirtSr
   equipment:
     jumpsuit: ClothingUniformJumpskirtSr
+
+- type: loadout
+  id: StationRepClothingUniformJumpsuitMilitarySr
+  equipment: StationRepClothingUniformJumpsuitMilitarySr
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT3
+  price: 0
+
+- type: startingGear
+  id: StationRepClothingUniformJumpsuitMilitarySr
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitMilitarySr

Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml

@@ -4,6 +4,8 @@
   loadouts:
   - ContractorClothingUniformJumpsuitColorGrey
   - ContractorClothingUniformJumpskirtColorGrey
+  - ContractorClothingUniformJumpsuitMilitaryContractor
+  - ContractorClothingUniformJumpsuitMilitaryContractorTac
   - ContractorClothingUniformJumpsuitAtmos
   - ContractorClothingUniformJumpskirtAtmos
   - ContractorClothingUniformJumpsuitBartender
@@ -123,6 +125,37 @@
   - ContractorClothingUniformJumpsuitTshirtJeans
   - ContractorClothingUniformJumpsuitTshirtJeansGray
   - ContractorClothingUniformJumpsuitTshirtJeansPeach
+  - ContractorClothingUniformJumpsuitMilitaryCaptain
+  - ContractorClothingUniformJumpsuitMilitaryAtmospherics
+  - ContractorClothingUniformJumpsuitMilitaryEngineering
+  - ContractorClothingUniformJumpsuitMilitaryEngineeringChief
+  - ContractorClothingUniformJumpsuitMilitarySalvageSpecialist
+  - ContractorClothingUniformJumpsuitMilitaryCargo
+  - ContractorClothingUniformJumpsuitMilitaryQM
+  - ContractorClothingUniformJumpsuitMilitaryMedicalDoctor
+  - ContractorClothingUniformJumpsuitMilitaryParamedic
+  - ContractorClothingUniformJumpsuitMilitaryChemistry
+  - ContractorClothingUniformJumpsuitMilitaryVirology
+  - ContractorClothingUniformJumpsuitMilitaryGenetics
+  - ContractorClothingUniformJumpsuitMilitaryCMO
+  - ContractorClothingUniformJumpsuitMilitaryScientist
+  - ContractorClothingUniformJumpsuitMilitaryResearchDirector
+  - ContractorClothingUniformJumpsuitMilitaryService
+  - ContractorClothingUniformJumpsuitMilitaryHydroponics
+  - ContractorClothingUniformJumpsuitMilitaryColorGrey
+  - ContractorClothingUniformJumpsuitMilitaryColorBlack
+  - ContractorClothingUniformJumpsuitMilitaryColorBlue
+  - ContractorClothingUniformJumpsuitMilitaryColorDarkBlue
+  - ContractorClothingUniformJumpsuitMilitaryColorTeal
+  - ContractorClothingUniformJumpsuitMilitaryColorGreen
+  - ContractorClothingUniformJumpsuitMilitaryColorDarkGreen
+  - ContractorClothingUniformJumpsuitMilitaryColorOrange
+  - ContractorClothingUniformJumpsuitMilitaryColorPink
+  - ContractorClothingUniformJumpsuitMilitaryColorRed
+  - ContractorClothingUniformJumpsuitMilitaryColorYellow
+  - ContractorClothingUniformJumpsuitMilitaryColorPurple
+  - ContractorClothingUniformJumpsuitMilitaryColorLightBrown
+  - ContractorClothingUniformJumpsuitMilitaryColorBrown
 
 - type: loadoutGroup
   id: ContractorBackpack

Resources/Prototypes/_NF/Loadouts/mail_carrier_loadout_groups.yml

@@ -4,6 +4,7 @@
   loadouts:
   - MailCarrierClothingUniformJumpsuitMailCarrier
   - MailCarrierClothingUniformJumpskirtMailCarrier
+  - MailCarrierClothingUniformJumpsuitMilitaryMailCarrier
 
 - type: loadoutGroup
   id: MailCarrierOuterClothing

Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml

@@ -4,6 +4,12 @@
   loadouts: #First Section: Role specific freebies/discounts/rewards
   - MercenaryClothingUniformJumpsuitMercenary
   - MercenaryClothingUniformJumpskirtMercenary
+  - MercenaryClothingUniformJumpsuitMilitaryTurtleneckMercenary
+  - MercenaryClothingUniformJumpsuitMilitaryTurtleneckMercenaryMedic
+  - MercenaryClothingUniformJumpsuitMilitaryTurtleneckMercenaryCaptain
+  - MercenaryClothingUniformJumpsuitMilitaryTurtleneckBlueMercenary
+  - MercenaryClothingUniformJumpsuitMilitaryTurtleneckBlueMercenaryMedic
+  - MercenaryClothingUniformJumpsuitMilitaryTurtleneckBlueMercenaryCaptain
 #Second Section: Contractor list
   - ContractorClothingUniformJumpsuitColorGrey
   - ContractorClothingUniformJumpskirtColorGrey
@@ -127,6 +133,40 @@
   - ContractorClothingUniformJumpsuitTshirtJeans
   - ContractorClothingUniformJumpsuitTshirtJeansGray
   - ContractorClothingUniformJumpsuitTshirtJeansPeach
+  - PilotClothingUniformJumpsuitMilitaryContractor
+  - PilotClothingUniformJumpsuitMilitaryContractorTac
+  - ContractorClothingUniformJumpsuitMilitaryCaptain
+  - ContractorClothingUniformJumpsuitMilitaryAtmospherics
+  - ContractorClothingUniformJumpsuitMilitaryEngineering
+  - ContractorClothingUniformJumpsuitMilitaryEngineeringChief
+  - ContractorClothingUniformJumpsuitMilitarySalvageSpecialist
+  - ContractorClothingUniformJumpsuitMilitaryCargo
+  - ContractorClothingUniformJumpsuitMilitaryQM
+  - ContractorClothingUniformJumpsuitMilitaryMedicalDoctor
+  - ContractorClothingUniformJumpsuitMilitaryParamedic
+  - ContractorClothingUniformJumpsuitMilitaryChemistry
+  - ContractorClothingUniformJumpsuitMilitaryVirology
+  - ContractorClothingUniformJumpsuitMilitaryGenetics
+  - ContractorClothingUniformJumpsuitMilitaryCMO
+  - ContractorClothingUniformJumpsuitMilitaryScientist
+  - ContractorClothingUniformJumpsuitMilitaryResearchDirector
+  - ContractorClothingUniformJumpsuitMilitaryService
+  - ContractorClothingUniformJumpsuitMilitaryHydroponics
+  - MercenaryClothingUniformJumpsuitMilitaryPilot
+  - ContractorClothingUniformJumpsuitMilitaryColorGrey
+  - ContractorClothingUniformJumpsuitMilitaryColorBlack
+  - ContractorClothingUniformJumpsuitMilitaryColorBlue
+  - ContractorClothingUniformJumpsuitMilitaryColorDarkBlue
+  - ContractorClothingUniformJumpsuitMilitaryColorTeal
+  - ContractorClothingUniformJumpsuitMilitaryColorGreen
+  - ContractorClothingUniformJumpsuitMilitaryColorDarkGreen
+  - ContractorClothingUniformJumpsuitMilitaryColorOrange
+  - ContractorClothingUniformJumpsuitMilitaryColorPink
+  - ContractorClothingUniformJumpsuitMilitaryColorRed
+  - ContractorClothingUniformJumpsuitMilitaryColorYellow
+  - ContractorClothingUniformJumpsuitMilitaryColorPurple
+  - ContractorClothingUniformJumpsuitMilitaryColorLightBrown
+  - ContractorClothingUniformJumpsuitMilitaryColorBrown
 
 - type: loadoutGroup
   id: MercenaryBackpack

Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml

@@ -3,6 +3,7 @@
   name: loadout-group-contractor-jumpsuit
   loadouts: #First Section: Role specific freebies/discounts/rewards
   - PilotClothingUniformJumpsuitPilot
+  - PilotClothingUniformJumpsuitMilitaryPilot
 #Second Section: Contractor list
   - ContractorClothingUniformJumpsuitColorGrey
   - ContractorClothingUniformJumpskirtColorGrey
@@ -125,6 +126,39 @@
   - ContractorClothingUniformJumpsuitTshirtJeans
   - ContractorClothingUniformJumpsuitTshirtJeansGray
   - ContractorClothingUniformJumpsuitTshirtJeansPeach
+  - PilotClothingUniformJumpsuitMilitaryContractor
+  - PilotClothingUniformJumpsuitMilitaryContractorTac
+  - ContractorClothingUniformJumpsuitMilitaryCaptain
+  - ContractorClothingUniformJumpsuitMilitaryAtmospherics
+  - ContractorClothingUniformJumpsuitMilitaryEngineering
+  - ContractorClothingUniformJumpsuitMilitaryEngineeringChief
+  - ContractorClothingUniformJumpsuitMilitarySalvageSpecialist
+  - ContractorClothingUniformJumpsuitMilitaryCargo
+  - ContractorClothingUniformJumpsuitMilitaryQM
+  - ContractorClothingUniformJumpsuitMilitaryMedicalDoctor
+  - ContractorClothingUniformJumpsuitMilitaryParamedic
+  - ContractorClothingUniformJumpsuitMilitaryChemistry
+  - ContractorClothingUniformJumpsuitMilitaryVirology
+  - ContractorClothingUniformJumpsuitMilitaryGenetics
+  - ContractorClothingUniformJumpsuitMilitaryCMO
+  - ContractorClothingUniformJumpsuitMilitaryScientist
+  - ContractorClothingUniformJumpsuitMilitaryResearchDirector
+  - ContractorClothingUniformJumpsuitMilitaryService
+  - ContractorClothingUniformJumpsuitMilitaryHydroponics
+  - ContractorClothingUniformJumpsuitMilitaryColorGrey
+  - ContractorClothingUniformJumpsuitMilitaryColorBlack
+  - ContractorClothingUniformJumpsuitMilitaryColorBlue
+  - ContractorClothingUniformJumpsuitMilitaryColorDarkBlue
+  - ContractorClothingUniformJumpsuitMilitaryColorTeal
+  - ContractorClothingUniformJumpsuitMilitaryColorGreen
+  - ContractorClothingUniformJumpsuitMilitaryColorDarkGreen
+  - ContractorClothingUniformJumpsuitMilitaryColorOrange
+  - ContractorClothingUniformJumpsuitMilitaryColorPink
+  - ContractorClothingUniformJumpsuitMilitaryColorRed
+  - ContractorClothingUniformJumpsuitMilitaryColorYellow
+  - ContractorClothingUniformJumpsuitMilitaryColorPurple
+  - ContractorClothingUniformJumpsuitMilitaryColorLightBrown
+  - ContractorClothingUniformJumpsuitMilitaryColorBrown
 
 - type: loadoutGroup
   id: PilotBackpack

Resources/Prototypes/_NF/Loadouts/stationrep_loadout_groups.yml

@@ -4,6 +4,7 @@
   loadouts:
   - StationRepClothingUniformJumpsuitSr
   - StationRepClothingUniformJumpskirtSr
+  - StationRepClothingUniformJumpsuitMilitarySr
 
 - type: loadoutGroup
   id: StationRepBackpack