rtsnaotsr

Simple-Station · Aug 19, 2024 · f60cf14 · f60cf14
1 parent 1489f89
commit f60cf14
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 30 deletions.
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
-  min: 10
+  time: 10
   solids:
     FoodBreadPlainSlice: 2
     FoodCheeseSlice: 1
@@ -12,7 +12,7 @@
   id: RecipeScrambledEggs
   name: scrambled eggs recipe
   result: FoodMealScrambledEggs
-  min: 5
+  time: 5
   reagents:
     TableSalt: 5
   solids:
@@ -24,7 +24,7 @@
   id: RecipePumpkinPie
   name: pumpkin pie
   result: FoodPiePumpkin
-  min: 15
+  time: 15
   solids:
     FoodDoughPie: 1
     FoodPumpkin: 1

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

diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
@@ -5,13 +5,11 @@
   playTimeTracker: JobBrigmedic
   setPreference: false # Parkstation-Playtime
   requirements:
-    - !type:CharacterDepartmentRequirement
-      departments:
-        - Medical
+    - !type:CharacterDepartmentTimeRequirement
+      department: Medical
       min: 21600 # 6 hrs
-    - !type:CharacterDepartmentRequirement
-      departments:
-        - Security
+    - !type:CharacterDepartmentTimeRequirement
+      department: Security
       min: 18000 # 4 hrs
   startingGear: CorpsmanGear
   icon: "JobIconBrigmedic"

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

diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml
@@ -6,9 +6,8 @@
   requirements:
     - !type:CharacterOverallTimeRequirement
       min: 18000
-    - !type:CharacterDepartmentRequirement
-      departments:
-        - Security
+    - !type:CharacterDepartmentTimeRequirement
+      department: Security
       min: 14400
   startingGear: PrisonGuardGear
   alwaysUseSpawner: true

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

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

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,9 +4,8 @@
   description: job-description-css
   playTimeTracker: JobChiefServiceSupervisor
   requirements:
-    - !type:CharacterDepartmentRequirement
-      departments:
-        - Civilian
+    - !type:CharacterDepartmentTimeRequirement
+      department: Civilian
       min: 21600
     - !type:CharacterOverallTimeRequirement
       min: 86400

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
-  min: 15
+  time: 15
   solids:
     FoodAloe: 1
 
 - type: microwaveMealRecipe
   id: RecipeMedicatedSuture
   name: medicated suture recipe
   result: MedicatedSuture
-  min: 10
+  time: 10
   solids:
     FoodPoppy: 1
     Brutepack: 1
@@ -23,7 +23,7 @@
   id: RecipeRegenerativeMesh
   name: regenerative mesh recipe
   result: RegenerativeMesh
-  min: 10
+  time: 10
   solids:
     FoodAloe: 1
     Ointment: 1