role chanes

Rxup · Feb 11, 2024 · 3146583 · 3146583
1 parent 05b9f0d
commit 3146583
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 26 deletions.
diff --git a/Resources/Prototypes/Backmen/Roles/Jobs/CentCom/centcom_official.yml b/Resources/Prototypes/Backmen/Roles/Jobs/CentCom/centcom_official.yml
@@ -13,9 +13,9 @@
   joinNotifyCrew: true
   whitelistRequired: true
   requirements:
-    - !type:DepartmentTimeRequirement
-      department: Command
-      time: 216000
+    - !type:RoleTimeRequirement
+      role: JobSAI
+      time: 18000
     - !type:RoleTimeRequirement
       role: JobCentralCommandAssistant
       time: 21600

diff --git a/Resources/Prototypes/Backmen/Roles/Jobs/CentCom/head_of_security.yml b/Resources/Prototypes/Backmen/Roles/Jobs/CentCom/head_of_security.yml
@@ -11,21 +11,19 @@
   weight: 1
   requireAdminNotify: true
   joinNotifyCrew: true
+  whitelistRequired: true
   requirements:
+    - !type:RoleTimeRequirement
+      role: JobCentralCommandAssistant
+      time: 21600
     - !type:DepartmentTimeRequirement
-      department: Security
-      time: 180000
-    - !type:DepartmentTimeRequirement
-      department: Command
-      time: 126000
+      department: CentCom
+      time: 43200
     - !type:RoleTimeRequirement
       role: JobHeadOfSecurity
-      time: 54000
+      time: 18000
     - !type:RoleTimeRequirement
       role: JobCentralCommandSecOfficer
-      time: 36000
-    - !type:RoleTimeRequirement
-      role: JobIAA
       time: 18000
   access:
     - CentralCommand

diff --git a/Resources/Prototypes/Backmen/Roles/Jobs/CentCom/operator.yml b/Resources/Prototypes/Backmen/Roles/Jobs/CentCom/operator.yml
@@ -13,9 +13,9 @@
   joinNotifyCrew: true
   whitelistRequired: true
   requirements:
-    - !type:DepartmentTimeRequirement
-      department: Command
-      time: 216000
+    - !type:RoleTimeRequirement
+      role: JobSAI
+      time: 18000
     - !type:RoleTimeRequirement
       role: JobCentralCommandAssistant
       time: 21600

diff --git a/Resources/Prototypes/Backmen/Roles/Jobs/CentCom/private_officer.yml b/Resources/Prototypes/Backmen/Roles/Jobs/CentCom/private_officer.yml
@@ -15,9 +15,6 @@
     - !type:DepartmentTimeRequirement
       department: Security
       time: 108000
-    - !type:RoleTimeRequirement
-      role: JobHeadOfSecurity
-      time: 3600
     - !type:RoleTimeRequirement
       role: JobCentralCommandAssistant
       time: 3600

diff --git a/Resources/Prototypes/Backmen/Roles/Jobs/Command/stationai.yml b/Resources/Prototypes/Backmen/Roles/Jobs/Command/stationai.yml
@@ -19,6 +19,9 @@
     - !type:DepartmentTimeRequirement
       department: Engineering
       time: 14400
+    - !type:RoleTimeRequirement
+      role: JobBorg
+      time: 21600
     - !type:OverallPlaytimeRequirement
       time: 86400
   weight: 30

diff --git a/Resources/Prototypes/Backmen/Roles/Jobs/Silicons/BPLA.yml b/Resources/Prototypes/Backmen/Roles/Jobs/Silicons/BPLA.yml
@@ -4,10 +4,15 @@
   description: job-description-silicon-BPLATech
   playTimeTracker: BPLATech
   joinNotifyCrew: false
-  whitelistRequired: true
   requirements:
-    - !type:OverallPlaytimeRequirement
-      time: 24000
+  - !type:OverallPlaytimeRequirement
+    time: 24000
+  - !type:DepartmentTimeRequirement
+    department: Engineering
+    time: 14400
+  - !type:RoleTimeRequirement
+    role: JobCentralCommandAssistant
+    time: 18000
   icon: JobIconUnknown
   supervisors: job-supervisors-human
   canBeAntag: false

diff --git a/Resources/Prototypes/Backmen/Roles/Jobs/Silicons/BPLAMED.yml b/Resources/Prototypes/Backmen/Roles/Jobs/Silicons/BPLAMED.yml
@@ -4,10 +4,15 @@
   description: job-description-silicon-BPLAMED
   playTimeTracker: BPLAMED
   joinNotifyCrew: false
-  whitelistRequired: true
   requirements:
-    - !type:OverallPlaytimeRequirement
-      time: 24000
+  - !type:OverallPlaytimeRequirement
+    time: 24000
+  - !type:DepartmentTimeRequirement
+    department: Medical
+    time: 14400
+  - !type:RoleTimeRequirement
+    role: JobCentralCommandAssistant
+    time: 18000
   icon: JobIconUnknown
   supervisors: job-supervisors-human
   canBeAntag: false

diff --git a/Resources/Prototypes/Backmen/Roles/Jobs/departments.yml b/Resources/Prototypes/Backmen/Roles/Jobs/departments.yml
@@ -2,6 +2,8 @@
   id: CentCom
   description: department-CentCom-description
   color: "#13db0f"
+  primary: true
+  weight: -5
   roles:
     - BKCCSecGavna
     - BKCCSecOfficer
@@ -16,6 +18,8 @@
   id: Silicons
   description: department-Silicons-description
   color: "#191e9e"
+  primary: true
+  weight: 10
   roles:
     - BKBPLATech
     - BKBPLAMED

diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -105,6 +105,9 @@
      1. Вы не можете вмешиваться в дела другого существа, даже если такие вопросы противоречат Закону Два или Закону Третьему, если это другое существо не является другим Дроном.
      2. Вы не можете навредить никому, независимо от намерения или обстоятельств.
      3. Ваши цели состоят в том, чтобы строить, поддерживать, ремонтировать, улучшать и увеличивать мощность в меру своих возможностей. Вы никогда не должны активно работать против этих целей.
+    requirements:
+    - !type:OverallPlaytimeRequirement
+      time: 21600
   - type: GhostTakeoverAvailable
   - type: SiliconLawBound
   - type: SiliconLawProvider

diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -50,7 +50,6 @@
   - HeadOfSecurity
   - ResearchDirector
   - Quartermaster
-  - SAI
   accountNumber: 1317 #backmen: currency
   primary: false
   weight: 100
@@ -90,7 +89,6 @@
   - SecurityOfficer
   - Warden
   - Brigmedic #backmen
-  - Prisoner #backmen
   accountNumber: 1320  #backmen: currency
 
 - type: department
@@ -114,5 +112,7 @@
   - Reporter
   - Zookeeper
   - Psychologist
+  - Prisoner #backmen
+  - SAI #backmen
   accountNumber: 1322  #backmen: currency
   primary: false