From 4cc7caa32550fdafb25de0de63d235af92b58e0a Mon Sep 17 00:00:00 2001 From: SnappingOpossum Date: Thu, 9 Oct 2025 10:24:11 +1100 Subject: [PATCH 1/2] Revert ronstation time reqs and fix future merge conflicts (inculdes fix from #37774) --- .../Prototypes/Roles/Jobs/Cargo/quartermaster.yml | 7 +++---- Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml | 5 ----- Resources/Prototypes/Roles/Jobs/Command/captain.yml | 10 +++++----- .../Roles/Jobs/Command/head_of_personnel.yml | 10 +++++----- .../Roles/Jobs/Engineering/chief_engineer.yml | 7 +++---- .../Roles/Jobs/Medical/chief_medical_officer.yml | 5 +++-- .../Roles/Jobs/Science/research_director.yml | 5 +---- .../Roles/Jobs/Security/head_of_security.yml | 4 ++-- .../Roles/Jobs/Security/security_officer.yml | 2 +- 9 files changed, 23 insertions(+), 32 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index c9e6ee4c72f85..92b9b93671e98 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -1,4 +1,3 @@ -# Modified by Ronstation contributor(s), therefore this file is licensed as MIT sublicensed with AGPL-v3.0. - type: job id: Quartermaster name: job-name-qm @@ -7,13 +6,13 @@ requirements: - !type:RoleTimeRequirement role: JobCargoTechnician - time: 18000 # Ronstation - modification. 5 hrs + time: 5h - !type:RoleTimeRequirement role: JobSalvageSpecialist - time: 18000 #5 hrs + time: 2.5h - !type:DepartmentTimeRequirement department: Cargo - time: 54000 # Ronstation - modification. 15 hours + time: 10h weight: 10 startingGear: QuartermasterGear icon: "JobIconQuarterMaster" diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index b623b7decceed..8f90affd6fd86 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -7,11 +7,6 @@ requirements: - !type:OverallPlaytimeRequirement time: 9000 # 2.5 hrs - # start of modifications - - !type:DepartmentTimeRequirement - department: Security - time: 9000 # 2.5 hrs - # end of modifications startingGear: LawyerGear icon: "JobIconLawyer" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 76b4308a145ec..7bb4cbb16b2f6 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -7,19 +7,19 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 54000 # Ronstation - modification. 15 hours + time: 4h - !type:DepartmentTimeRequirement department: Medical - time: 54000 # Ronstation - modification. 15 hours + time: 4h - !type:DepartmentTimeRequirement department: Science - time: 54000 # Ronstation - modification. 15 hours + time: 4h - !type:DepartmentTimeRequirement department: Security - time: 54000 # Ronstation - modification. 15 hours + time: 4h - !type:DepartmentTimeRequirement department: Command - time: 54000 # Ronstation - modification. 15 hours + time: 4h 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 index ba0b4956414de..0801ed2d2ebda 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -7,19 +7,19 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 27000 # Ronstation - modification. 7.5 hours + time: 2.5h - !type:DepartmentTimeRequirement department: Medical - time: 27000 # Ronstation - modification. 7.5 hours + time: 2.5h - !type:DepartmentTimeRequirement department: Science - time: 27000 # Ronstation - modification. 7.5 hours + time: 2.5h - !type:DepartmentTimeRequirement department: Security - time: 27000 # Ronstation - modification. 7.5 hours + time: 2.5h - !type:DepartmentTimeRequirement department: Command - time: 27000 # Ronstation - modification. 7.5 hours + time: 2.5h weight: 20 startingGear: HoPGear icon: "JobIconHeadOfPersonnel" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 7aa9da16b23de..561d0260204b0 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -1,4 +1,3 @@ -# Modified by Ronstation contributor(s), therefore this file is licensed as MIT sublicensed with AGPL-v3.0. - type: job id: ChiefEngineer name: job-name-ce @@ -7,13 +6,13 @@ requirements: - !type:RoleTimeRequirement role: JobAtmosphericTechnician - time: 18000 # Ronstation - modification. 5 hrs + time: 2.5h - !type:RoleTimeRequirement role: JobStationEngineer - time: 18000 # 5 hrs + time: 5h - !type:DepartmentTimeRequirement department: Engineering - time: 54000 # Ronstation - modification. 15 hours + time: 10h weight: 10 startingGear: ChiefEngineerGear icon: "JobIconChiefEngineer" diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 55106ddacfa53..b7a879f42ca4c 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -9,13 +9,14 @@ requirements: - !type:RoleTimeRequirement role: JobChemist - time: 18000 #5 hrs + time: 2.5h - !type:RoleTimeRequirement role: JobMedicalDoctor time: 18000 #5 hrs - !type:DepartmentTimeRequirement department: Medical - time: 54000 # Ronstation - modification. 15 hours + time: 10h + weight: 10 startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" supervisors: job-supervisors-captain diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index e41da13be9693..a1f26e5914780 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -1,4 +1,3 @@ -# Modified by Ronstation contributor(s), therefore this file is licensed as MIT sublicensed with AGPL-v3.0. - type: job id: ResearchDirector name: job-name-rd @@ -10,9 +9,7 @@ time: 18000 #5 hrs - !type:DepartmentTimeRequirement department: Science - # start of modifications - time: 54000 # 15 hours - # end of modifications + time: 10h weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 93e8b53e75da0..13af54d176781 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -7,7 +7,7 @@ requirements: - !type:RoleTimeRequirement role: JobWarden - time: 18000 #5 hrs + time: 1h - !type:RoleTimeRequirement role: JobDetective time: 3600 #1 hr, knowing how to use the tools is important @@ -16,7 +16,7 @@ time: 18000 #5 hrs - !type:DepartmentTimeRequirement department: Security - time: 54000 # Ronstation - modification. 15 hours + time: 10h weight: 10 startingGear: HoSGear icon: "JobIconHeadOfSecurity" diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index 2f1b4ee6f9149..c309a7f5bd1e5 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -7,7 +7,7 @@ requirements: - !type:DepartmentTimeRequirement department: Security - time: 18000 # Ronstation - modification. 5 hrs + time: 2.5h startingGear: SecurityOfficerGear icon: "JobIconSecurityOfficer" supervisors: job-supervisors-hos From 3a347c123afc6d28efe9d6ebdc2d7f87b7d2467d Mon Sep 17 00:00:00 2001 From: SnappingOpossum Date: Thu, 9 Oct 2025 10:29:34 +1100 Subject: [PATCH 2/2] Replace ronstation specific timers with bats --- .../Loadouts/Jobs/Command/blueshield_officer.yml | 2 +- .../_Ronstation/Loadouts/Jobs/security.yml | 2 +- .../_Ronstation/Loadouts/Miscellanious/pets.yml | 2 +- .../Loadouts/Trinkets/Plushies/arachind.yml | 4 ++-- .../Loadouts/Trinkets/Plushies/atmosian.yml | 4 ++-- .../_Ronstation/Loadouts/Trinkets/Plushies/bee.yml | 4 ++-- .../Loadouts/Trinkets/Plushies/carp.yml | 4 ++-- .../Loadouts/Trinkets/Plushies/diona.yml | 4 ++-- .../Loadouts/Trinkets/Plushies/hampter.yml | 14 +++++++------- .../Loadouts/Trinkets/Plushies/human.yml | 4 ++-- .../Loadouts/Trinkets/Plushies/lamp.yml | 4 ++-- .../Loadouts/Trinkets/Plushies/magicarp.yml | 4 ++-- .../Loadouts/Trinkets/Plushies/moth.yml | 4 ++-- .../_Ronstation/Loadouts/Trinkets/Plushies/nar.yml | 4 ++-- .../Loadouts/Trinkets/Plushies/nuke.yml | 4 ++-- .../Loadouts/Trinkets/Plushies/penguin.yml | 4 ++-- .../Loadouts/Trinkets/Plushies/ratvar.yml | 4 ++-- .../Loadouts/Trinkets/Plushies/shark_blue.yml | 4 ++-- .../Loadouts/Trinkets/Plushies/shark_grey.yml | 4 ++-- .../Loadouts/Trinkets/Plushies/shark_pink.yml | 4 ++-- .../Loadouts/Trinkets/Plushies/slime.yml | 4 ++-- .../Loadouts/Trinkets/Plushies/snake.yml | 4 ++-- .../_Ronstation/Loadouts/Trinkets/Plushies/vox.yml | 4 ++-- .../_Ronstation/Roles/Antags/vampire.yml | 2 +- .../Roles/Jobs/Command/blueshield_officer.yml | 4 ++-- 25 files changed, 51 insertions(+), 51 deletions(-) diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/_Ronstation/Loadouts/Jobs/Command/blueshield_officer.yml index db4b84db4f2b4..b14393cf6546c 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Jobs/Command/blueshield_officer.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Jobs/Command/blueshield_officer.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobBlueshieldOfficer - time: 72000 #20 hrs + time: 20h # Head - type: loadout diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Jobs/security.yml b/Resources/Prototypes/_Ronstation/Loadouts/Jobs/security.yml index 4df42c0955c47..d375f4cb669eb 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Jobs/security.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Jobs/security.yml @@ -5,6 +5,6 @@ requirement: !type:RoleTimeRequirement role: JobDetective - time: 36000 #10 hrs + time: 10h equipment: eyes: ClothingEyesGlassesNoir diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Miscellanious/pets.yml b/Resources/Prototypes/_Ronstation/Loadouts/Miscellanious/pets.yml index 2424869be5ef9..b5542b0455979 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Miscellanious/pets.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Miscellanious/pets.yml @@ -22,7 +22,7 @@ - !type:JobRequirementLoadoutEffect requirement: !type:OverallPlaytimeRequirement - time: 360000 # 100hr + time: 100h storage: back: - MobPetMothroach diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/arachind.yml b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/arachind.yml index 8217cc66e757f..0893f654ae0cb 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/arachind.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/arachind.yml @@ -5,11 +5,11 @@ requirement: !type:DepartmentTimeRequirement department: Security - time: 18000 # 5 hrs + time: 5h - !type:JobRequirementLoadoutEffect requirement: !type:OverallPlaytimeRequirement - time: 36000 # 10hr + time: 10h - type: loadout id: PlushieArachind diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/atmosian.yml b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/atmosian.yml index f2f06fd4962a6..25e47db7b0be8 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/atmosian.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/atmosian.yml @@ -5,12 +5,12 @@ requirement: !type:RoleTimeRequirement role: JobAtmosphericTechnician - time: 18000 # 5 hrs + time: 5h - !type:JobRequirementLoadoutEffect requirement: !type:DepartmentTimeRequirement department: Cargo - time: 18000 # 5 hrs + time: 5h - type: loadout id: PlushieAtmosian diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/bee.yml b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/bee.yml index fb9040365db36..4e7cead8fec5b 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/bee.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/bee.yml @@ -5,12 +5,12 @@ requirement: !type:RoleTimeRequirement role: JobBotanist - time: 18000 # 5 hrs + time: 5h - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobServiceWorker - time: 18000 # 5 hrs + time: 5h - type: loadout id: PlushieBee diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/carp.yml b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/carp.yml index 74b8884d04727..9dbd56f1098b3 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/carp.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/carp.yml @@ -5,12 +5,12 @@ requirement: !type:RoleTimeRequirement role: AntagDragon - time: 18000 # 5 hrs + time: 5h - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobCargoTechnician - time: 18000 # 5 hrs + time: 5h - type: loadout id: PlushieCarp diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/diona.yml b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/diona.yml index caad9bd408383..204b3e7ba9334 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/diona.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/diona.yml @@ -5,11 +5,11 @@ requirement: !type:DepartmentTimeRequirement department: Civilian - time: 18000 # 5 hrs + time: 5h - !type:JobRequirementLoadoutEffect requirement: !type:OverallPlaytimeRequirement - time: 36000 # 10hr + time: 10h - type: loadout id: PlushieDiona diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/hampter.yml b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/hampter.yml index 246c3d1a8c17f..31d0b1b44881d 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/hampter.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/hampter.yml @@ -5,37 +5,37 @@ requirement: !type:RoleTimeRequirement role: JobCaptain - time: 9000 # 2.5 hrs + time: 2.5h - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobHeadOfPersonnel - time: 9000 # 2.5 hrs + time: 2.5h - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobChiefEngineer - time: 9000 # 2.5 hrs + time: 2.5h - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobHeadOfSecurity - time: 9000 # 2.5 hrs + time: 2.5h - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobQuartermaster - time: 9000 # 2.5 hrs + time: 2.5h - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobResearchDirector - time: 9000 # 2.5 hrs + time: 2.5h - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobChiefMedicalOfficer - time: 9000 # 2.5 hrs + time: 2.5h - type: loadout id: PlushieHampter diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/human.yml b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/human.yml index d4b8888b79628..dd79a46534ff2 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/human.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/human.yml @@ -5,11 +5,11 @@ requirement: !type:DepartmentTimeRequirement department: Cargo - time: 18000 # 5 hrs + time: 5h - !type:JobRequirementLoadoutEffect requirement: !type:OverallPlaytimeRequirement - time: 36000 # 10hr + time: 10h - type: loadout id: PlushieHuman diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/lamp.yml b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/lamp.yml index ad43ee0f38238..eb479a8cdd484 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/lamp.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/lamp.yml @@ -5,12 +5,12 @@ requirement: !type:RoleTimeRequirement role: JobHeadOfPersonnel - time: 18000 # 5 hrs + time: 5h - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobLibrarian - time: 18000 # 5 hrs + time: 5h - type: loadout id: PlushieLamp diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/magicarp.yml b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/magicarp.yml index cc36a0f5abec2..3e278b2fdd431 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/magicarp.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/magicarp.yml @@ -5,12 +5,12 @@ requirement: !type:RoleTimeRequirement role: AntagWizard - time: 18000 # 5 hrs + time: 5h - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobSalvageSpecialist - time: 18000 # 5 hrs + time: 5h - type: loadout id: PlushieMagicarp diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/moth.yml b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/moth.yml index 8741dbab0ae5d..becb93bc6eb52 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/moth.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/moth.yml @@ -5,11 +5,11 @@ requirement: !type:DepartmentTimeRequirement department: Medical - time: 18000 # 5 hrs + time: 5h - !type:JobRequirementLoadoutEffect requirement: !type:OverallPlaytimeRequirement - time: 36000 # 10hr + time: 10h - type: loadout id: PlushieMoth diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/nar.yml b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/nar.yml index cfb8450d34bf2..e6f260bc33105 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/nar.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/nar.yml @@ -5,12 +5,12 @@ requirement: !type:RoleTimeRequirement role: JobChaplain - time: 18000 # 5 hrs + time: 5h - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobChef - time: 18000 # 5 hrs + time: 5h - type: loadout id: PlushieNar diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/nuke.yml b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/nuke.yml index f3e06883e2169..1423712907318 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/nuke.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/nuke.yml @@ -5,12 +5,12 @@ requirement: !type:RoleTimeRequirement role: AntagNukeops - time: 18000 # 5 hrs + time: 5h - !type:JobRequirementLoadoutEffect requirement: !type:DepartmentTimeRequirement department: Security - time: 18000 # 5 hrs + time: 5h - type: loadout id: PlushieNuke diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/penguin.yml b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/penguin.yml index e8874c794cac0..6b7a9a89570cf 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/penguin.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/penguin.yml @@ -5,12 +5,12 @@ requirement: !type:RoleTimeRequirement role: JobMusician - time: 18000 # 5 hrs + time: 5h - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobReporter - time: 18000 # 5 hrs + time: 5h - type: loadout id: PlushiePenguin diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/ratvar.yml b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/ratvar.yml index 2adc3c1aa456a..dfd1cdc6839c5 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/ratvar.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/ratvar.yml @@ -5,12 +5,12 @@ requirement: !type:RoleTimeRequirement role: JobChaplain - time: 18000 # 5 hrs + time: 5h - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobBartender - time: 18000 # 5 hrs + time: 5h - type: loadout id: PlushieRatvar diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/shark_blue.yml b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/shark_blue.yml index 284495a62e1a4..7f28cf9652762 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/shark_blue.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/shark_blue.yml @@ -5,12 +5,12 @@ requirement: !type:RoleTimeRequirement role: JobJanitor - time: 18000 # 5 hrs + time: 5h - !type:JobRequirementLoadoutEffect requirement: !type:DepartmentTimeRequirement department: Medical - time: 18000 # 5 hrs + time: 5h - type: loadout id: PlushieSharkBlue diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/shark_grey.yml b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/shark_grey.yml index 9f0e4d9077af6..f72dd6aec15a7 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/shark_grey.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/shark_grey.yml @@ -5,12 +5,12 @@ requirement: !type:RoleTimeRequirement role: JobJanitor - time: 18000 #5 hrs + time: 5h - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobPassenger - time: 18000 #5 hrs + time: 5h - type: loadout id: PlushieSharkGrey diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/shark_pink.yml b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/shark_pink.yml index 2a0a6d594dd01..1f3c19c47b029 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/shark_pink.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/shark_pink.yml @@ -5,12 +5,12 @@ requirement: !type:RoleTimeRequirement role: JobJanitor - time: 18000 #5 hrs + time: 5h - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobClown - time: 18000 #5 hrs + time: 5h - type: loadout id: PlushieSharkPink diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/slime.yml b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/slime.yml index c56f494c1762e..8137f6dd79a5c 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/slime.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/slime.yml @@ -5,11 +5,11 @@ requirement: !type:DepartmentTimeRequirement department: Science - time: 18000 # 5 hrs + time: 5h - !type:JobRequirementLoadoutEffect requirement: !type:OverallPlaytimeRequirement - time: 36000 # 10hr + time: 5h - type: loadout id: PlushieSlime diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/snake.yml b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/snake.yml index a3f11bb85ac84..578ec4206b192 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/snake.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/snake.yml @@ -5,12 +5,12 @@ requirement: !type:RoleTimeRequirement role: AntagThief - time: 18000 #5 hrs + time: 5h - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobLawyer - time: 18000 #5 hrs + time: 5h - type: loadout id: PlushieSnake diff --git a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/vox.yml b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/vox.yml index 4540887b5d513..5f15b5068020a 100644 --- a/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/vox.yml +++ b/Resources/Prototypes/_Ronstation/Loadouts/Trinkets/Plushies/vox.yml @@ -5,11 +5,11 @@ requirement: !type:DepartmentTimeRequirement department: Engineering - time: 18000 # 5 hrs + time: 5h - !type:JobRequirementLoadoutEffect requirement: !type:OverallPlaytimeRequirement - time: 36000 # 10hr + time: 10h - type: loadout id: PlushieVox diff --git a/Resources/Prototypes/_Ronstation/Roles/Antags/vampire.yml b/Resources/Prototypes/_Ronstation/Roles/Antags/vampire.yml index 56824dd574ba9..8b8ae3688812b 100644 --- a/Resources/Prototypes/_Ronstation/Roles/Antags/vampire.yml +++ b/Resources/Prototypes/_Ronstation/Roles/Antags/vampire.yml @@ -8,4 +8,4 @@ # guides: [ Vampire ] requirements: - !type:OverallPlaytimeRequirement - time: 3600 # 1h + time: 1h diff --git a/Resources/Prototypes/_Ronstation/Roles/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/_Ronstation/Roles/Jobs/Command/blueshield_officer.yml index f9ffe1e32e835..be2a6a7f9bd83 100644 --- a/Resources/Prototypes/_Ronstation/Roles/Jobs/Command/blueshield_officer.yml +++ b/Resources/Prototypes/_Ronstation/Roles/Jobs/Command/blueshield_officer.yml @@ -6,10 +6,10 @@ requirements: - !type:DepartmentTimeRequirement department: Security - time: 36000 # 10 hrs + time: 10h - !type:DepartmentTimeRequirement department: Command - time: 36000 # 10 hours + time: 10h weight: 20 startingGear: BlueshieldOfficerGear icon: "JobIconNanotrasen"