Security

Detective stays the same
DeltaV-Station · Sep 25, 2023 · 4a57971 · 4a57971
1 parent 8b1ee41
commit 4a57971
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -6,17 +6,17 @@
   requirements:
     - !type:RoleTimeRequirement
       role: JobWarden
-      time: 36000 # DeltaV - 10 hours time requirement
-#    - !type:RoleTimeRequirement # DeltaV - No SecurityOfficer time requirement
+      time: 36000 # DeltaV - 10 hours
+#    - !type:RoleTimeRequirement # DeltaV - No Security Officer time requirement
 #      role: JobSecurityOfficer
 #      time: 36000 #10 hrs
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 36000 # DeltaV - 10 hours time requirement
-    - !type:DepartmentTimeRequirement # DeltaV - Command time requirement
+      time: 36000 # DeltaV - 10 hours
+    - !type:DepartmentTimeRequirement # DeltaV - Command dept time requirement
       department: Command
       time: 36000 #10hrs
-    - !type:RoleTimeRequirement # DeltaV - Lawyer time requirement
+    - !type:RoleTimeRequirement # DeltaV - Lawyer role time requirement
       role: JobLawyer
       time: 14400 #4hrs
     - !type:OverallPlaytimeRequirement

diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
@@ -5,11 +5,11 @@
   playTimeTracker: JobSecurityCadet
   requirements:
     - !type:OverallPlaytimeRequirement
-      time: 36000 #10 hrs
-    - !type:DepartmentTimeRequirement
-      department: Security
-      time: 54000 #15 hrs
-      inverted: true # stop playing intern if you're good at security!
+      time: 18000 # DeltaV - 5 hours
+#    - !type:DepartmentTimeRequirement # DeltaV - Removes time limit
+#      department: Security
+#      time: 54000 #15 hrs
+#      inverted: true # stop playing intern if you're good at security!
   startingGear: SecurityCadetGear
   icon: "JobIconSecurityCadet"
   supervisors: job-supervisors-security

diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -6,7 +6,9 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 36000 #10 hrs
+      time: 18000 # DeltaV - 5 hours
+    - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement
+      time: 18000 # 5 hours
   startingGear: SecurityOfficerGear
   icon: "JobIconSecurityOfficer"
   supervisors: job-supervisors-hos

diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -4,9 +4,15 @@
   description: job-description-warden
   playTimeTracker: JobWarden
   requirements:
-    - !type:RoleTimeRequirement
-      role: JobSecurityOfficer
-      time: 36000 #10 hrs
+#    - !type:RoleTimeRequirement # DeltaV - No SecurityOfficer time requirement
+#      role: JobSecurityOfficer
+#      time: 36000 #10 hrs
+    - !type:DepartmentTimeRequirement # DeltaV - Security time requirement
+      department: Security
+      time: 36000 # 10 hours
+    - !type:RoleTimeRequirement # DeltaV - Prisoner time requirement
+      role: JobPrisoner
+      time: 3600 # 1 hour
   startingGear: WardenGear
   icon: "JobIconWarden"
   supervisors: job-supervisors-hos