fix reqs

Simple-Station · Aug 19, 2024 · 3e5b44a · 3e5b44a
1 parent 5259dfe
commit 3e5b44a
Show file tree

Hide file tree

Showing 21 changed files with 49 additions and 49 deletions.
diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml
@@ -34,15 +34,15 @@
     requirements: # Worth considering these numbers for the goal of making sure someone willing to MRP takes this.
     - !type:CharacterOverallTimeRequirement
       min: 259200 # 72 hours
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentRequirement
       department: Security
-      time: 40000 # 11.1 hours
-    - !type:DepartmentTimeRequirement
+      min: 40000 # 11.1 hours
+    - !type:CharacterDepartmentRequirement
       department: Civilian
-      time: 40000 # 11.1 hours
-    - !type:DepartmentTimeRequirement
+      min: 40000 # 11.1 hours
+    - !type:CharacterDepartmentRequirement
       department: Command
-      time: 40000 # 11.1 hours
+      min: 40000 # 11.1 hours
   - type: GhostRoleMobSpawner
     prototype: MobHumanSyndicateListener
   - type: Sprite

diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
@@ -106,9 +106,9 @@
     allowMovement: true
     allowSpeech: true
     requirements:
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentRequirement
       department: Epistemics
-      time: 14400 # DeltaV - 4 hours
+      min: 14400 # DeltaV - 4 hours
 
 - type: entity
   parent: WelderExperimental

diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml
@@ -32,9 +32,9 @@
     name: "Laika"
     description: "Security's resident she-dog. Badger the officers for headpats and nip at the heels of violent offenders."
     requirements:
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentRequirement
       department: Security
-      time: 14400 # DeltaV - 4 hours
+      min: 14400 # DeltaV - 4 hours
   - type: GhostTakeoverAvailable
   - type: InteractionPopup
     successChance: 1

diff --git a/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml
@@ -2,7 +2,7 @@
   id: RecipeGrilledCheese
   name: grilled cheese
   result: FoodMealGrilledCheese
-  time: 10
+  min: 10
   solids:
     FoodBreadPlainSlice: 2
     FoodCheeseSlice: 1
@@ -12,7 +12,7 @@
   id: RecipeScrambledEggs
   name: scrambled eggs recipe
   result: FoodMealScrambledEggs
-  time: 5
+  min: 5
   reagents:
     TableSalt: 5
   solids:
@@ -24,7 +24,7 @@
   id: RecipePumpkinPie
   name: pumpkin pie
   result: FoodPiePumpkin
-  time: 15
+  min: 15
   solids:
     FoodDoughPie: 1
     FoodPumpkin: 1

diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml
@@ -15,7 +15,7 @@
       min: 36000 # 10 hours
     - !type:CharacterOverallTimeRequirement
       min: 90000 # 25 hours
-    - !type:WhitelistRequirement # whitelist requirement because I don't want any dingus judges
+    - !type:CharacterWhitelistRequirement # whitelist requirement because I don't want any dingus judges
   weight: 20
   startingGear: CJGear
   icon: "JobIconChiefJustice"

diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/medical_borg.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/medical_borg.yml
@@ -7,7 +7,7 @@
   requirements:
     - !type:CharacterOverallTimeRequirement
       min: 216000 #60 hrs
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentRequirement
       department: Medical
       min: 21600 #6 hrs
   canBeAntag: false

diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
@@ -5,10 +5,10 @@
   playTimeTracker: JobBrigmedic
   setPreference: false # Parkstation-Playtime
   requirements:
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentRequirement
       department: Medical
       min: 21600 # 6 hrs
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentRequirement
       department: Security
       min: 18000 # 4 hrs
   startingGear: CorpsmanGear
@@ -36,7 +36,7 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitBrigmedic
     outerClothing: ClothingOuterArmorPlateCarrier
-    back: ClothingBackpackBrigmedicFilled 
+    back: ClothingBackpackBrigmedicFilled
     shoes: ClothingShoesBootsCombatFilled
     gloves: ClothingHandsGlovesNitrile
     eyes: ClothingEyesHudMedical

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -87,9 +87,9 @@
     requirements:
     - !type:CharacterOverallTimeRequirement
       min: 172800 # DeltaV - 48 hours
-    - !type:DepartmentTimeRequirement # DeltaV - Security dept time requirement
+    - !type:CharacterDepartmentRequirement # DeltaV - Security dept time requirement
       department: Security
-      time: 36000 # DeltaV - 10 hours
+      min: 36000 # DeltaV - 10 hours
   - type: GhostRoleMobSpawner
     prototype: MobHumanLoneNuclearOperative
   - type: Sprite

diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
@@ -7,7 +7,7 @@
   requirements:
     - !type:CharacterOverallTimeRequirement
       min: 18000
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentRequirement
       department: Epistemics # DeltaV - Epistemics Department replacing Science
       min: 3600
   startingGear: ForensicMantisGear

diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:CharacterOverallTimeRequirement
       min: 18000
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentRequirement
       department: Security
       min: 14400
   startingGear: PrisonGuardGear

diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml
@@ -11,7 +11,7 @@
   setPreference: true
 #  whitelistRequired: true
   requirements:
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentRequirement
       department: Security
       min: 21600
   special:

diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
@@ -10,7 +10,7 @@
   icon: "JobIconPrisoner"
   supervisors: job-supervisors-security
   requirements:
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentRequirement
       department: Security
       min: 21600
 

diff --git a/Resources/Prototypes/Parkstation/Roles/Jobs/Service/chief_service_supervisor.yml b/Resources/Prototypes/Parkstation/Roles/Jobs/Service/chief_service_supervisor.yml
@@ -4,12 +4,12 @@
   description: job-description-css
   playTimeTracker: JobChiefServiceSupervisor
   requirements:
-    - !type:DepartmentTimeRequirement
+    - !type:CharacterDepartmentRequirement
       department: Civilian
-      time: 21600
-    - !type:OverallPlaytimeRequirement
-      time: 86400
-    - !type:WhitelistRequirement
+      min: 21600
+    - !type:CharacterOverallTimeRequirement
+      min: 86400
+    - !type:CharacterWhitelistRequirement
   weight: 10
   startingGear: CSSGear
   icon: "JobIconCSS"

diff --git a/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml b/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml
@@ -2,15 +2,15 @@
   id: RecipeAloeCream
   name: aloe cream recipe
   result: AloeCream
-  time: 15
+  min: 15
   solids:
     FoodAloe: 1
 
 - type: microwaveMealRecipe
   id: RecipeMedicatedSuture
   name: medicated suture recipe
   result: MedicatedSuture
-  time: 10
+  min: 10
   solids:
     FoodPoppy: 1
     Brutepack: 1
@@ -23,7 +23,7 @@
   id: RecipeRegenerativeMesh
   name: regenerative mesh recipe
   result: RegenerativeMesh
-  time: 10
+  min: 10
   solids:
     FoodAloe: 1
     Ointment: 1

diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -7,7 +7,7 @@
   requirements:
   #  - !type:RoleTimeRequirement #DeltaV
   #    role: JobCargoTechnician
-  #    time: 21600 #6 hrs
+  #    min: 21600 #6 hrs
     - !type:CharacterPlaytimeRequirement
       tracker: JobSalvageSpecialist
       min: 10800 #3 hrs

diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
@@ -8,8 +8,8 @@
     - !type:CharacterDepartmentTimeRequirement
       department: Logistics # DeltaV - Logistics Department replacing Cargo
       min: 21600 #DeltaV 6 hrs
-  #  - !type:OverallPlaytimeRequirement #DeltaV
-  #    time: 36000 #10 hrs
+  #  - !type:CharacterOverallTimeRequirement #DeltaV
+  #    min: 36000 #10 hrs
   icon: "JobIconShaftMiner"
   startingGear: SalvageSpecialistGear
   supervisors: job-supervisors-qm

diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -8,13 +8,13 @@
     - !type:CharacterPlaytimeRequirement
       tracker: JobAtmosphericTechnician
       min: 21600 # 6 hours
-    - !type:RoleTimeRequirement
-      role: JobSalvageSpecialist
-      time: 7200 # 2 hours
+    - !type:CharacterPlaytimeRequirement
+      tracker: JobSalvageSpecialist
+      min: 7200 # 2 hours
     - !type:CharacterDepartmentTimeRequirement
       department: Engineering
       min: 36000 # 10 hours
-    - !type:OverallPlaytimeRequirement
+    - !type:CharacterOverallTimeRequirement
       min: 86400 # 24 hours
   weight: 10
   startingGear: ChiefEngineerGear

diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
@@ -8,9 +8,9 @@
   requirements:
   - !type:CharacterOverallTimeRequirement # DeltaV - to prevent griefers from taking the role.
       min: 14400 # 4 hours
-    # - !type:DepartmentTimeRequirement # DeltaV - Removes time limit
+    # - !type:CharacterDepartmentRequirement # DeltaV - Removes time limit
     #   department: Engineering
-    #   time: 54000 #15 hrs
+    #   min: 54000 #15 hrs
     #   inverted: true # stop playing intern if you're good at engineering!
   startingGear: TechnicalAssistantGear
   icon: "JobIconTechnicalAssistant"

diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
@@ -5,9 +5,9 @@
   playTimeTracker: JobMedicalIntern
   setPreference: false # Parkstation-Playtime
   requirements:
-    # - !type:DepartmentTimeRequirement # DeltaV - Removes time limit
+    # - !type:CharacterDepartmentRequirement # DeltaV - Removes time limit
     #   department: Medical
-    #   time: 54000 # 15 hrs
+    #   min: 54000 # 15 hrs
     #   inverted: true # stop playing intern if you're good at med!
   startingGear: MedicalInternGear
   icon: "JobIconMedicalIntern"

diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
@@ -8,12 +8,12 @@
   requirements:
     # - !type:RoleTimeRequirement # DeltaV - No Medical Doctor time requirement
     #   role: JobMedicalDoctor
-    #   time: 14400 #4 hrs
+    #   min: 14400 #4 hrs
     - !type:CharacterDepartmentTimeRequirement # DeltaV - Medical dept time requirement
       department: Medical
       min: 28800 # DeltaV - 8 hours
-    # - !type:OverallPlaytimeRequirement # DeltaV - No playtime requirement
-    #   time: 54000 # 15 hrs
+    # - !type:CharacterOverallTimeRequirement # DeltaV - No playtime requirement
+    #   min: 54000 # 15 hrs
   startingGear: ParamedicGear
   icon: "JobIconParamedic"
   supervisors: job-supervisors-cmo

diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
@@ -4,10 +4,10 @@
   description: job-description-research-assistant
   playTimeTracker: JobResearchAssistant
   setPreference: false # Parkstation-Playtime
-  requirements:
-    # - !type:DepartmentTimeRequirement # DeltaV - Removes time limit
+  # requirements:
+    # - !type:CharacterDepartmentRequirement # DeltaV - Removes time limit
     #   department: Science
-    #   time: 54000 #15 hrs
+    #   min: 54000 #15 hrs
     #   inverted: true # stop playing intern if you're good at science!
   startingGear: ResearchAssistantGear
   icon: "JobIconResearchAssistant"