engineer loadouts

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

@@ -15,7 +15,6 @@ loadout-group-captain-outerclothing = Captain outer clothing
 
 loadout-group-captain-pants = Command pants
 loadout-group-command-outerclothing = Command outer clothing
-
 loadout-group-pilot-shirt = Pilot shirt
 
 # Civilian
@@ -25,25 +24,26 @@ loadout-group-passenger-outerclothing = Passenger outer clothing
 loadout-group-passenger-shoes = Passenger shoes
 
 # Engineering
-loadout-group-station-engineer-head = Station Engineer head
-loadout-group-station-engineer-jumpsuit = Station Engineer jumpsuit
-loadout-group-station-engineer-backpack = Station Engineer backpack
-loadout-group-station-engineer-outerclothing = Station Engineer outer clothing
-loadout-group-station-engineer-shoes = Station Engineer shoes
-loadout-group-station-engineer-id = Station Engineer ID
+loadout-group-station-engineer-head = Ship Engineer head
+loadout-group-station-engineer-jumpsuit = Ship Engineer jumpsuit
+loadout-group-station-engineer-pants = Ship Engineer pants
+loadout-group-station-engineer-backpack = Ship Engineer backpack
+loadout-group-station-engineer-outerclothing = Ship Engineer outer clothing
+loadout-group-station-engineer-shoes = Ship Engineer shoes
+loadout-group-station-engineer-id = Ship Engineer ID
 
 # Security
 loadout-group-security-head = Mercenary hat
 loadout-group-merc-belt = Mercenary belt
 loadout-group-merc-gloves = Mercenary gloves
 loadout-group-merc-mask = Mercenary mask
 loadout-group-merc-weapon = Weapon of choice
-loadout-Kammerer = Kammerer + shells
-loadout-Mosin = Mosin + box
-
 loadout-group-merc-shoes = Mercenary shoes
 loadout-group-security-outerclothing = Mercenary outer clothing
 
+loadout-Kammerer = Kammerer + shells
+loadout-Mosin = Mosin + box
+
 # Medical
 loadout-group-medical-gloves = Medical gloves
 loadout-group-medical-mask = Medical mask

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

@@ -1,23 +1,3 @@
-# Senior times
-- type: loadoutEffectGroup
-  id: SeniorEngineering
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:RoleTimeRequirement
-      role: JobAtmosphericTechnician
-      time: 21600 #6 hrs
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:RoleTimeRequirement
-      role: JobStationEngineer
-      time: 21600 #6 hrs
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:DepartmentTimeRequirement
-      department: Engineering
-      time: 216000 # 60 hrs
-
 # Head
 - type: loadout
   id: StationEngineerHardhatYellow
@@ -49,9 +29,6 @@
 - type: loadout
   id: SeniorEngineerBeret
   equipment: EngineeringBeret
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorEngineering
 
 - type: startingGear
   id: EngineeringBeret
@@ -60,55 +37,23 @@
 
 # Jumpsuit
 - type: loadout
-  id: StationEngineerJumpsuit
-  equipment: StationEngineerJumpsuit
-
-- type: startingGear
-  id: StationEngineerJumpsuit
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitEngineering
-
-- type: loadout
-  id: StationEngineerJumpskirt
-  equipment: StationEngineerJumpskirt
-
-- type: startingGear
-  id: StationEngineerJumpskirt
-  equipment:
-    jumpsuit: ClothingUniformJumpskirtEngineering
-
-- type: loadout
-  id: StationEngineerHazardsuit
-  equipment: StationEngineerHazardsuit
+  id: HazardShirt
+  equipment: HazardShirt
 
 - type: startingGear
-  id: StationEngineerHazardsuit
+  id: HazardShirt
   equipment:
-    jumpsuit: ClothingUniformJumpsuitEngineeringHazard
+    jumpsuit: ClothingShirtEngineeringHazard
 
+# Pants
 - type: loadout
-  id: SeniorEngineerJumpsuit
-  equipment: SeniorEngineerJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorEngineering
+  id: HazardPants
+  equipment: HazardPants
 
 - type: startingGear
-  id: SeniorEngineerJumpsuit
+  id: HazardPants
   equipment:
-    jumpsuit: ClothingUniformJumpsuitSeniorEngineer
-
-- type: loadout
-  id: SeniorEngineerJumpskirt
-  equipment: SeniorEngineerJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorEngineering
-
-- type: startingGear
-  id: SeniorEngineerJumpskirt
-  equipment:
-    jumpsuit: ClothingUniformJumpskirtSeniorEngineer
+    lowerClothing: ClothingPantsEngineeringHazard
 
 # Back
 - type: loadout
@@ -147,7 +92,7 @@
   id: StationEngineerOuterVest
   equipment:
     outerClothing: ClothingOuterVestHazard
-  
+
 - type: loadout
   id: StationEngineerWintercoat
   equipment: StationEngineerWintercoat
@@ -156,7 +101,7 @@
   id: StationEngineerWintercoat
   equipment:
     outerClothing: ClothingOuterWinterEngi
-  
+
 # Shoes
 - type: loadout
   id: WorkBoots
@@ -189,9 +134,6 @@
 - type: loadout
   id: SeniorEngineerPDA
   equipment: SeniorEngineerPDA
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorEngineering
 
 - type: startingGear
   id: SeniorEngineerPDA

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -154,11 +154,13 @@
   id: StationEngineerJumpsuit
   name: loadout-group-station-engineer-jumpsuit
   loadouts:
-  - StationEngineerJumpsuit
-  - StationEngineerJumpskirt
-  - StationEngineerHazardsuit
-  - SeniorEngineerJumpsuit
-  - SeniorEngineerJumpskirt
+  - HazardShirt
+
+- type: loadoutGroup
+  id: StationEngineerPants
+  name: loadout-group-station-engineer-pants
+  loadouts:
+  - HazardPants
 
 - type: loadoutGroup
   id: StationEngineerBackpack

Resources/Prototypes/Loadouts/role_loadouts.yml

@@ -53,6 +53,7 @@
   groups:
   - StationEngineerHead
   - StationEngineerJumpsuit
+  - StationEngineerPants
   - StationEngineerBackpack
   - StationEngineerOuterClothing
   - StationEngineerShoes