Grind is Kill

Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml

@@ -10,6 +10,7 @@
     ClothingUniformJumpskirtAtmosCasual: 3 # DeltaV
     ClothingShoesColorWhite: 3
     ClothingHeadsetEngineering: 2
+    ClothingHeadHatBeretAtmospherics: 3 # DeltaV - Remove Specific Role Timers
     ClothingHeadHelmetFire: 2
     ClothingOuterSuitFire: 2
     ClothingOuterWinterAtmos: 2

Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml

@@ -10,6 +10,7 @@
     ClothingShoesColorBlack: 3
     ClothingOuterVestHazard: 3
     ClothingShoesBootsWork: 3
+    ClothingHeadHatBeretEngineering: 3 # DeltaV - Remove Specific Role Timers
     ClothingHeadHatHardhatYellow: 3
     ClothingHeadHatHardhatOrange: 3
     ClothingHeadsetEngineering: 3

Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml

@@ -15,6 +15,7 @@
     ClothingMaskGas: 3
     ClothingOuterWinterSci: 2
     ClothingNeckScarfStripedPurple: 3
+    ClothingHeadHatBeretRND: 3 # DeltaV - Remove Specific Role Timers
     ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics
     ClothingShoesBootsWinterSci: 2
     ClothingOuterExplorerCoat: 3 # DeltaV

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

@@ -41,11 +41,11 @@
     head: ClothingHeadHatHardhatRed
 
 - type: loadout
-  id: SeniorEngineerBeret
+  id: EngineerBeret # DeltaV - Was SeniorEngineerBeret
   startingGear: EngineeringBeret
-  effects:
+#  effects: # DeltaV - Remove Specific Role Timers
-  - !type:GroupLoadoutEffect
+#  - !type:GroupLoadoutEffect
-    proto: SeniorEngineering
+#    proto: SeniorEngineering
 
 # Jumpsuit
 - type: loadout

Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml

@@ -18,9 +18,9 @@
 - type: loadout
   id: ScientificBeret
   startingGear: ScientificBeret
-  effects:
+#  effects: # DeltaV - Remove Specific Role Timers
-  - !type:GroupLoadoutEffect
+#  - !type:GroupLoadoutEffect
-    proto: SeniorResearcher
+#    proto: SeniorResearcher
 
 - type: loadout
   id: RoboticistCap

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -1122,7 +1122,7 @@
   - StationEngineerHardhatYellow
   - StationEngineerHardhatOrange
   - StationEngineerHardhatRed
-  - SeniorEngineerBeret
+  - EngineerBeret # DeltaV - Was SeniorEngineerBeret
 
 - type: loadoutGroup
   id: StationEngineerJumpsuit

Resources/Prototypes/_DV/Catalog/Fills/Lockers/dressers.yml

@@ -187,6 +187,7 @@
         # Cloak
         - id: ClothingNeckCloakHos
         - id: ClothingNeckMantleHOS
+        - id: ClothingNeckHosRobe
         # Outerwear
         - id: ClothingOuterCoatStasecHoS
         - id: ClothingOuterCoatHoSTrench

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

@@ -44,6 +44,6 @@
     requirement:
       !type:RoleTimeRequirement
       role: JobSalvageSpecialist
-      time: 432000 # 120hr
+      time: 216000 # 60hr
   equipment:
     neck: ClothingNeckMantleSalvage

Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/atmospheric_technician.yml

@@ -22,12 +22,6 @@
 
 - type: loadout
   id: AtmosBeret
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:RoleTimeRequirement
-      role: JobAtmosphericTechnician
-      time: 216000 # 60hr
   equipment:
     head: ClothingHeadHatBeretAtmospherics
 

Resources/Prototypes/_DV/Loadouts/Jobs/Security/head_of_security.yml

@@ -54,11 +54,5 @@
 # Neck
 - type: loadout
   id: HeadOfSecurityRobe
-  effects:
-   - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:RoleTimeRequirement
-      role: JobHeadOfSecurity
-      time: 180000
   equipment:
     neck: ClothingNeckHosRobe