Merge pull request #1640 from mqole/adminassist

deploy admin & supply assistant roles
impstation · Feb 11, 2025 · 6b2db53 · 6b2db53
2 parents 82f7950 + c7bfe17
commit 6b2db53
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 8 deletions.
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
@@ -4,11 +4,10 @@
   description: job-description-cargotech
   playTimeTracker: JobCargoTechnician
   # Begin DeltaV modifications - Add time requirement to cargo tech
-  # Uncomment once ready to deploy Supply Assistant
-  #requirements:
-  #- !type:DepartmentTimeRequirement
-  #  department: Cargo
-  #  time: 21600 # 6 hrs ~3 shifts.
+  requirements:
+  - !type:DepartmentTimeRequirement
+    department: Cargo
+    time: 21600 # 6 hrs ~3 shifts.
   # End DeltaV modifications
   startingGear: CargoTechGear
   icon: "JobIconCargoTechnician"

diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -9,10 +9,13 @@
       time: 21600 #6 hrs
     - !type:RoleTimeRequirement
       role: JobSalvageSpecialist
-      time: 10800 #3 hrs (too popular)
+      time: 21600 #6 hrs
     - !type:DepartmentTimeRequirement
       department: Cargo
       time: 72000 #20 hours, imp
+    - !type:DepartmentTimeRequirement
+      department: Command
+      time: 21600 #6 hrs
     - !type:OverallPlaytimeRequirement
       time: 144000 #40 hrs
   weight: 10

diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -13,6 +13,9 @@
     - !type:DepartmentTimeRequirement
       department: Engineering
       time: 72000 #20 hrs, imp
+    - !type:DepartmentTimeRequirement
+      department: Command
+      time: 21600 #6 hrs
     - !type:OverallPlaytimeRequirement
       time: 144000 #40 hrs
   weight: 10

diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -15,6 +15,9 @@
     - !type:DepartmentTimeRequirement
       department: Medical
       time: 72000 #20 hrs, imp
+    - !type:DepartmentTimeRequirement
+      department: Command
+      time: 21600 #6 hrs
     - !type:OverallPlaytimeRequirement
       time: 144000 #40 hrs
   weight: 10

diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -7,6 +7,9 @@
     - !type:DepartmentTimeRequirement
       department: Science
       time: 72000 #20 hrs, imp
+    - !type:DepartmentTimeRequirement
+      department: Command
+      time: 21600 #6 hrs
     - !type:OverallPlaytimeRequirement
       time: 144000 #40 hrs
   weight: 10

diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -13,6 +13,9 @@
     - !type:DepartmentTimeRequirement
       department: Security
       time: 324000 # 90 hrs
+    - !type:DepartmentTimeRequirement
+      department: Command
+      time: 21600 #6 hrs
     - !type:OverallPlaytimeRequirement
       time: 144000 #40 hrs
   weight: 10

diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -8,7 +8,7 @@
   - Courier # Imp
   - Quartermaster
   - SalvageSpecialist
-  #- SupplyAssistant # DeltaV - Uncomment once ready to deploy.
+  - SupplyAssistant # DeltaV
 
 - type: department
   id: Civilian
@@ -75,7 +75,7 @@
   - ERTSecurity
   - ERTEngineer
   - DeathSquad
-  #- AdministrativeAssistant # Delta V - Uncomment once ready to deploy. Administrative Assistant, see Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml
+  - AdministrativeAssistant # Delta V
   primary: false
   weight: 100