Merge branch 'master' into Chitinid

DeltaV-Station · Jan 17, 2025 · f975f1e · f975f1e
2 parents 0a4375a + 90629ee
commit f975f1e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Bellwether
-  changes:
-  - message: Prosecutors can now lock and unlock Security evidence lockers.
-    type: Tweak
-  id: 430
-  time: '2024-07-17T19:01:03.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1422
 - author: deltanedas
   changes:
   - message: Fixed Glacier not being in map votes.
@@ -3854,3 +3847,10 @@
   id: 929
   time: '2025-01-16T23:48:44.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2756
+- author: rosieposieeee
+  changes:
+  - message: Command hour minimums increased across the board.
+    type: Tweak
+  id: 930
+  time: '2025-01-17T02:41:10.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2732
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -16,7 +16,7 @@
       time: 7200 # 2 hours
     - !type:DepartmentTimeRequirement
       department: Logistics # DeltaV - Logistics Department replacing Cargo
-      time: 43200 # DeltaV 12 hours
+      time: 90000 # DeltaV - 25 hours
     - !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
@@ -6,13 +6,13 @@
   requirements:
     - !type:RoleTimeRequirement
       role: JobAtmosphericTechnician
-      time: 36000 # DeltaV - 10 hours
+      time: 72000 # DeltaV - 20 hours
 #    - !type:RoleTimeRequirement # DeltaV - No Station Engineer time requirement
 #      role: JobStationEngineer
 #      time: 21600 #6 hrs
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 90000 # DeltaV - 25 hours, was 10
+      time: 108000 # DeltaV - 30 hours, was 10
 #    - !type:OverallPlaytimeRequirement
 #      time: 144000 # DeltaV - was 40 hours upstream
   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,9 +15,9 @@
 #      time: 21600 #6 hrs
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 43200 # DeltaV - 12 hours
+      time: 90000 # DeltaV - 25 hours
     - !type:OverallPlaytimeRequirement
-      time: 72000 # DeltaV - 20 hours, was 40
+      time: 90000 # DeltaV - 25 hours, was 20
   weight: 10
   startingGear: CMOGear
   icon: "JobIconChiefMedicalOfficer"

diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -5,11 +5,16 @@
   playTimeTracker: JobResearchDirector
   antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff
   requirements:
+    # Start DeltaV additions - Server specific roles
+    - !type:RoleTimeRequirement
+      role: JobForensicMantis
+      time: 7200 # 2 hrs
+    # End DeltaV additions
     - !type:DepartmentTimeRequirement
       department: Epistemics # DeltaV - Epistemics Department replacing Science
-      time: 54000 # DeltaV - 15 hours
+      time: 90000 # DeltaV - 25 hours
     - !type:OverallPlaytimeRequirement
-      time: 72000 # DeltaV - 20 hours, was 40
+      time: 90000 # DeltaV - 25 hours, was 40
   weight: 10
   startingGear: ResearchDirectorGear
   icon: "JobIconResearchDirector"