Merge branch 'master' into things

Lost-Paradise-Project · Dec 23, 2024 · 6dbe346 · 6dbe346
2 parents f0aa289 + 011da64
commit 6dbe346
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml
@@ -2922,3 +2922,14 @@
   id: 155
   time: '2024-12-22T15:34:20.0000000+00:00'
   url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/345
+- author: Kest
+  changes:
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0434\u043B\u044F \u0438\u0433\
+      \u0440\u044B \u043D\u0430 \u043E\u0444\u0438\u0446\u0435\u0440\u0435 \u0441\u043D\
+      \u043E\u0432\u0430 \u043D\u0443\u0436\u043D\u043E \u043D\u0430\u0438\u0433\u0440\
+      \u0430\u0442\u044C 4 \u0447\u0430\u0441\u0430 \u0432 \u0441\u0431! (\u0431\u044B\
+      \u043B\u043E 0\u0447)"
+    type: Tweak
+  id: 156
+  time: '2024-12-22T22:02:35.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/358
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -8,6 +8,7 @@
       min: 160
     - !type:CharacterDepartmentTimeRequirement
       department: Security
+      min: 14400 # DeltaV - 4 hours
   startingGear: SecurityOfficerGear
   icon: "JobIconSecurityOfficer"
   supervisors: job-supervisors-hos