Merge remote-tracking branch 'upstream/master' into ups

2024-08-06 21:28:20 +03:00
parent 25faddc690 4db96dc569
commit 49dbede859
78 changed files with 1154 additions and 57 deletions
--- a/Resources/Prototypes/Loadouts/Jobs/Cargo/common.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/common.yml
@@ -6,7 +6,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobSalvageSpecialist
-      time: 9999999999 # 15 hours 54000
+      time: 54000 # 15 hours

 # Head

--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml
@@ -6,7 +6,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobClown
-      time: 9999999999 # 30 hours as clown required to ascend 108000
+      time: 108000 # 30 hours as clown required to ascend

 - type: loadoutEffectGroup # WD
  id: MedalClownTimer
@@ -15,7 +15,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobClown
-      time: 9999999999 # 10 hours 36000
+      time: 36000 # 10 hours

 # Head
 - type: itemLoadout
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
@@ -6,7 +6,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobJanitor
-      time: 9999999999 # 10 hours 36000
+      time: 36000 # 10 hours

 # Head
 - type: itemLoadout
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
@@ -6,7 +6,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobPassenger
-      time: 9999999999 #10 hrs, silly reward for people who play passenger a lot 36000
+      time: 36000 #10 hrs, silly reward for people who play passenger a lot

 # Face
 - type: itemLoadout
--- a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
@@ -6,7 +6,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobHeadOfPersonnel
-      time: 9999999999 #15 hrs, special reward for HoP mains 54000
+      time: 54000 #15 hrs, special reward for HoP mains

 # Jumpsuit
 - type: itemLoadout
--- a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
@@ -6,17 +6,17 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobAtmosphericTechnician
-      time: 9999999999 #6 hrs 21600
+      time: 21600 #6 hrs
  - !type:JobRequirementLoadoutEffect
    requirement:
      !type:RoleTimeRequirement
      role: JobStationEngineer
-      time: 9999999999 #6 hrs 21600
+      time: 21600 #6 hrs
  - !type:JobRequirementLoadoutEffect
    requirement:
      !type:DepartmentTimeRequirement
      department: Engineering
-      time: 9999999999 # 60 hrs 216000
+      time: 216000 # 60 hrs

 # Head
 - type: itemLoadout
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
@@ -6,17 +6,17 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobChemist
-      time: 9999999999 #6 hrs 21600
+      time: 21600 #6 hrs
  - !type:JobRequirementLoadoutEffect
    requirement:
      !type:RoleTimeRequirement
      role: JobMedicalDoctor
-      time: 9999999999 #6 hrs 21600
+      time: 21600 #6 hrs
  - !type:JobRequirementLoadoutEffect
    requirement:
      !type:DepartmentTimeRequirement
      department: Medical
-      time: 9999999999 # 60 hrs 216000
+      time: 216000 # 60 hrs

 # Head
 - type: itemLoadout
--- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
@@ -6,7 +6,7 @@
    requirement:
      !type:DepartmentTimeRequirement
      department: Science
-      time: 9999999999 #60 hrs 216000
+      time: 216000 #60 hrs

 # Head

--- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
@@ -6,12 +6,12 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobWarden
-      time: 9999999999 #6 hrs 21600
+      time: 21600 #6 hrs
  - !type:JobRequirementLoadoutEffect
    requirement:
      !type:DepartmentTimeRequirement
      department: Security
-      time: 9999999999 # 60 hrs 216000
+      time: 216000 # 60 hrs

 # Head
 - type: itemLoadout
--- a/Resources/Prototypes/Loadouts/Jobs/common.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/common.yml
@@ -7,7 +7,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobPassenger
-      time: 9999999999 # 50 hours 180000
+      time: 180000 # 50 hours

 # Bottom

--- a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
@@ -6,7 +6,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobLibrarian
-      time: 9999999999 # 1 hour of being the biggest nerd on the station 3600
+      time: 3600 # 1 hour of being the biggest nerd on the station

 - type: loadoutEffectGroup
  id: JensenTimer
@@ -15,7 +15,7 @@
    requirement:
      !type:DepartmentTimeRequirement
      department: Cargo
-      time: 9999999999 #5 hours of being a space trucker 18000
+      time: 18000 #5 hours of being a space trucker

 # Basic options
 # Glasses