Merge pull request DeltaV-Station#6 from Tetronamecronicus/Ролевой_лес

Роллы
TypoChel1 · May 4, 2024 · 296aa78 · 296aa78
2 parents ab1b08f + 4bec8ee
commit 296aa78
Show file tree

Hide file tree

Showing 42 changed files with 275 additions and 225 deletions.
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
@@ -3,12 +3,12 @@
   name: job-name-mantis
   description: job-description-mantis
   playTimeTracker: JobForensicMantis
-  requirements:
-    - !type:OverallPlaytimeRequirement
-      time: 18000
-    - !type:DepartmentTimeRequirement
-      department: Epistemics # DeltaV - Epistemics Department replacing Science
-      time: 3600
+  #requirements:
+  #  - !type:OverallPlaytimeRequirement
+  #    time: 18000
+  #  - !type:DepartmentTimeRequirement
+  #    department: Epistemics # DeltaV - Epistemics Department replacing Science
+  #    time: 3600
   startingGear: ForensicMantisGear
   icon: "JobIconForensicMantis"
   supervisors: job-supervisors-rd

diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml
@@ -5,10 +5,13 @@
   playTimeTracker: JobPrisonGuard
   requirements:
     - !type:OverallPlaytimeRequirement
-      time: 18000
-    - !type:DepartmentTimeRequirement
-      department: Security
-      time: 14400
+      time: 1
+  #requirements:
+  #  - !type:OverallPlaytimeRequirement
+  #    time: 18000
+  #  - !type:DepartmentTimeRequirement
+  #    department: Security
+  #    time: 14400
   startingGear: PrisonGuardGear
   alwaysUseSpawner: true
   canBeAntag: false

diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml
@@ -10,10 +10,10 @@
   supervisors: job-supervisors-security
   setPreference: true
 #  whitelistRequired: true
-  requirements:
-    - !type:DepartmentTimeRequirement
-      department: Security
-      time: 21600
+  #requirements:
+  #  - !type:DepartmentTimeRequirement
+  #    department: Security
+  #    time: 21600
   special:
   - !type:AddComponentSpecial
     components:

diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
@@ -12,7 +12,7 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 21600
+      time: 99999999
 
 - type: startingGear
   id: PrisonerGear

diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -5,20 +5,8 @@
   playTimeTracker: JobQuartermaster
   antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff
   requirements:
-  #  - !type:RoleTimeRequirement #DeltaV
-  #    role: JobCargoTechnician
-  #    time: 21600 #6 hrs
-    - !type:RoleTimeRequirement
-      role: JobSalvageSpecialist
-      time: 10800 #3 hrs
-    - !type:RoleTimeRequirement # DeltaV - Courier role time requirement
-      role: JobMailCarrier
-      time: 7200 # 2 hours
-    - !type:DepartmentTimeRequirement
-      department: Logistics # DeltaV - Logistics Department replacing Cargo
-      time: 43200 #DeltaV 12 hours
-    - !type:OverallPlaytimeRequirement
-      time: 144000 #40 hrs
+    - !type:OverallPlaytimeRequirement #DeltaV
+      time: 3600
   weight: 10
   startingGear: QuartermasterGear
   icon: "JobIconQuarterMaster"

diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
@@ -4,10 +4,10 @@
   description: job-description-salvagespec
   playTimeTracker: JobSalvageSpecialist
   antagAdvantage: 3 # DeltaV - Reduced TC: External Access + Free hardsuit and weapons
-  requirements:
-    - !type:DepartmentTimeRequirement
-      department: Logistics # DeltaV - Logistics Department replacing Cargo
-      time: 21600 #DeltaV 6 hrs
+  #requirements:
+  #  - !type:DepartmentTimeRequirement
+  #    department: Logistics # DeltaV - Logistics Department replacing Cargo
+  #    time: 21600 #DeltaV 6 hrs
   #  - !type:OverallPlaytimeRequirement #DeltaV
   #    time: 36000 #10 hrs
   icon: "JobIconShaftMiner"

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
@@ -3,10 +3,10 @@
   name: job-name-bartender
   description: job-description-bartender
   playTimeTracker: JobBartender
-  requirements:
-    - !type:DepartmentTimeRequirement
-      department: Civilian
-      time: 3600 #DeltaV
+  #requirements:
+  #  - !type:DepartmentTimeRequirement
+  #    department: Civilian
+  #    time: 3600 #DeltaV
   startingGear: BartenderGear
   icon: "JobIconBartender"
   supervisors: job-supervisors-hop

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
@@ -3,10 +3,10 @@
   name: job-name-chaplain
   description: job-description-chaplain
   playTimeTracker: JobChaplain
-  requirements:
-    - !type:DepartmentTimeRequirement
-      department: Epistemics # DeltaV - Epistemics Department replacing Science
-      time: 14400 #DeltaV 4 hours
+  #requirements:
+  #  - !type:DepartmentTimeRequirement
+  #    department: Epistemics # DeltaV - Epistemics Department replacing Science
+  #    time: 14400 #DeltaV 4 hours
   startingGear: ChaplainGear
   icon: "JobIconChaplain"
   supervisors: job-supervisors-rd

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
@@ -3,10 +3,10 @@
   name: job-name-chef
   description: job-description-chef
   playTimeTracker: JobChef
-  requirements:
-    - !type:DepartmentTimeRequirement
-      department: Civilian
-      time: 3600 #DeltaV 1 hour
+  #requirements:
+  #  - !type:DepartmentTimeRequirement
+  #    department: Civilian
+  #    time: 3600 #DeltaV 1 hour
   startingGear: ChefGear
   icon: "JobIconChef"
   supervisors: job-supervisors-hop
@@ -17,10 +17,10 @@
   extendedAccess:
   - Hydroponics
   - Bar #Nyano - Summary: After this line, Professional Che is a component to be added. Very important.
-  special: 
+  special:
   - !type:AddComponentSpecial
     components:
-    - type: ProfessionalChef #Nyano - End Summary. 
+    - type: ProfessionalChef #Nyano - End Summary.
 
 - type: startingGear
   id: ChefGear

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
@@ -3,9 +3,9 @@
   name: job-name-clown
   description: job-description-clown
   playTimeTracker: JobClown
-  requirements:
-    - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement
-      time: 7200 #2 hrs
+  #requirements:
+  #  - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement
+  #    time: 7200 #2 hrs
   startingGear: ClownGear
   icon: "JobIconClown"
   supervisors: job-supervisors-hop

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -4,12 +4,12 @@
   description: job-description-lawyer
   playTimeTracker: JobLawyer
   antagAdvantage: 2 # DeltaV - Reduced TC: Security Radio and Access
-  requirements:
-    - !type:OverallPlaytimeRequirement
-      time: 36000 # 10 hrs
-    - !type:DepartmentTimeRequirement # DeltaV - Security dept time requirement
-      department: Security
-      time: 14400 # 4 hours
+  #requirements:
+  #  - !type:OverallPlaytimeRequirement
+  #    time: 36000 # 10 hrs
+  #  - !type:DepartmentTimeRequirement # DeltaV - Security dept time requirement
+  #    department: Security
+  #    time: 14400 # 4 hours
   startingGear: LawyerGear
   icon: "JobIconLawyer"
   supervisors: job-supervisors-hop
@@ -22,7 +22,7 @@
   id: LawyerGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitLawyerBlack  # TODO change jumpsuit to randomiser of the 4 variants # ignoring this since loadouts are gonna be out soon
-    back: ClothingBackpackLawyerFilled 
+    back: ClothingBackpackLawyerFilled
     shoes: ClothingShoesBootsLaceup
     id: LawyerPDA
     ears: ClothingHeadsetSecurity

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
@@ -3,9 +3,9 @@
   name: job-name-librarian
   description: job-description-librarian
   playTimeTracker: JobLibrarian
-  requirements:
-    - !type:OverallPlaytimeRequirement #DeltaV
-      time: 3600 # 1 hr
+  #requirements:
+  #  - !type:OverallPlaytimeRequirement #DeltaV
+  #    time: 3600 # 1 hr
   startingGear: LibrarianGear
   icon: "JobIconLibrarian"
   supervisors: job-supervisors-hop

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
@@ -3,9 +3,9 @@
   name: job-name-mime
   description: job-description-mime
   playTimeTracker: JobMime
-  requirements:
-    - !type:OverallPlaytimeRequirement
-      time: 7200 # DeltaV - 2 hours
+  #requirements:
+  #  - !type:OverallPlaytimeRequirement
+  #    time: 7200 # DeltaV - 2 hours
   startingGear: MimeGear
   icon: "JobIconMime"
   supervisors: job-supervisors-hop

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
@@ -3,9 +3,9 @@
   name: job-name-musician
   description: job-description-musician
   playTimeTracker: JobMusician
-  requirements:
-    - !type:OverallPlaytimeRequirement
-      time: 7200 # DeltaV - 2 hours
+  #requirements:
+  #  - !type:OverallPlaytimeRequirement
+  #    time: 7200 # DeltaV - 2 hours
   startingGear: MusicianGear
   icon: "JobIconMusician"
   supervisors: job-supervisors-hire

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
@@ -3,9 +3,9 @@
   name: job-name-serviceworker
   description: job-description-serviceworker
   playTimeTracker: JobServiceWorker
-  requirements:
-    - !type:OverallPlaytimeRequirement
-      time: 7200 # DeltaV - 2 hours
+  #requirements:
+  #  - !type:OverallPlaytimeRequirement
+  #    time: 7200 # DeltaV - 2 hours
   startingGear: ServiceWorkerGear
   icon: "JobIconServiceWorker"
   supervisors: job-supervisors-service

diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -3,28 +3,31 @@
   name: job-name-captain
   description: job-description-captain
   playTimeTracker: JobCaptain
+  #requirements:
+  #  - !type:DepartmentTimeRequirement
+  #    department: Logistics # DeltaV - Logistics Department replacing Cargo
+  #    time: 18000 # DeltaV - 5 hours
+  #  - !type:DepartmentTimeRequirement
+  #    department: Engineering
+  #    time: 18000 # DeltaV - 5 hours
+  #  - !type:DepartmentTimeRequirement
+  #    department: Medical
+  #    time: 18000 # DeltaV - 5 hours
+  #  - !type:DepartmentTimeRequirement
+  #    department: Security
+  #    time: 18000 # DeltaV - 5 hours
+  #  - !type:DepartmentTimeRequirement # DeltaV - Epistemics dept time requirement
+  #    department: Epistemics # DeltaV - Epistemics Department replacing Science
+  #    time: 18000 # 5 hours
+  #  - !type:DepartmentTimeRequirement
+  #    department: Command
+  #    time: 108000 # DeltaV - 30 hours
+  #  - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement
+  #    time: 108000 # 30 hours
+  #  - !type:WhitelistRequirement # DeltaV - Whitelist requirement
   requirements:
-    - !type:DepartmentTimeRequirement
-      department: Logistics # DeltaV - Logistics Department replacing Cargo
-      time: 18000 # DeltaV - 5 hours
-    - !type:DepartmentTimeRequirement
-      department: Engineering
-      time: 18000 # DeltaV - 5 hours
-    - !type:DepartmentTimeRequirement
-      department: Medical
-      time: 18000 # DeltaV - 5 hours
-    - !type:DepartmentTimeRequirement
-      department: Security
-      time: 18000 # DeltaV - 5 hours
-    - !type:DepartmentTimeRequirement # DeltaV - Epistemics dept time requirement
-      department: Epistemics # DeltaV - Epistemics Department replacing Science
-      time: 18000 # 5 hours
-    - !type:DepartmentTimeRequirement
-      department: Command
-      time: 108000 # DeltaV - 30 hours
-    - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement
-      time: 108000 # 30 hours
-    - !type:WhitelistRequirement # DeltaV - Whitelist requirement
+    - !type:OverallPlaytimeRequirement #DeltaV
+      time: 7200
   weight: 20
   startingGear: CaptainGear
   icon: "JobIconCaptain"

diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -4,21 +4,24 @@
   description: job-description-hop
   playTimeTracker: JobHeadOfPersonnel
   antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff
+  #requirements:
+  #  - !type:RoleTimeRequirement
+  #    role: JobChef
+  #    time: 14400 # DeltaV - 4 hours
+  #  - !type:RoleTimeRequirement
+  #    role: JobBartender
+  #    time: 14400 # DeltaV - 4 hours
+  #  - !type:RoleTimeRequirement
+  #    role: JobJanitor
+  #    time: 14400 # DeltaV - 4 hours
+  #  - !type:DepartmentTimeRequirement # DeltaV - Civilian dept time requirement
+  #    department: Civilian
+  #    time: 72000 # 20 hours
+  #  - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement
+  #    time: 90000 # 25 hours
   requirements:
-    - !type:RoleTimeRequirement
-      role: JobChef
-      time: 14400 # DeltaV - 4 hours
-    - !type:RoleTimeRequirement
-      role: JobBartender
-      time: 14400 # DeltaV - 4 hours
-    - !type:RoleTimeRequirement
-      role: JobJanitor
-      time: 14400 # DeltaV - 4 hours
-    - !type:DepartmentTimeRequirement # DeltaV - Civilian dept time requirement
-      department: Civilian
-      time: 72000 # 20 hours
-    - !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement
-      time: 90000 # 25 hours
+  - !type:OverallPlaytimeRequirement #DeltaV
+    time: 3600
   weight: 10 # DeltaV - Changed HoP weight from 20 to 10 due to them not being more important than other Heads
   startingGear: HoPGear
   icon: "JobIconHeadOfPersonnel"

diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
@@ -5,9 +5,11 @@
   playTimeTracker: JobAtmosphericTechnician
   antagAdvantage: 10 # DeltaV - Reduced TC: External Access + Fireaxe + Free Hardsuit
   requirements:
-    - !type:DepartmentTimeRequirement
-      department: Engineering
-      time: 36000 # DeltaV - 10 hours
+  #  - !type:DepartmentTimeRequirement
+  #    department: Engineering
+  #    time: 36000 # DeltaV - 10 hours
+    - !type:OverallPlaytimeRequirement #DeltaV
+      time: 1800
   startingGear: AtmosphericTechnicianGear
   icon: "JobIconAtmosphericTechnician"
   supervisors: job-supervisors-ce

diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -4,17 +4,19 @@
   description: job-description-ce
   playTimeTracker: JobChiefEngineer
   requirements:
-    - !type:RoleTimeRequirement
-      role: JobAtmosphericTechnician
-      time: 36000 # DeltaV - 10 hours
+#    - !type:RoleTimeRequirement
+#      role: JobAtmosphericTechnician
+#      time: 36000 # DeltaV - 10 hours
 #    - !type:RoleTimeRequirement # DeltaV - No Station Engineer time requirement
 #      role: JobStationEngineer
 #      time: 21600 #6 hrs
-    - !type:DepartmentTimeRequirement
-      department: Engineering
-      time: 90000 # DeltaV - 25 hours
+#    - !type:DepartmentTimeRequirement
+#      department: Engineering
+#      time: 90000 # DeltaV - 25 hours
 #    - !type:OverallPlaytimeRequirement
 #      time: 72000 # DeltaV - 20 hours
+    - !type:OverallPlaytimeRequirement #DeltaV
+      time: 3600
   weight: 10
   startingGear: ChiefEngineerGear
   icon: "JobIconChiefEngineer"