From 729919a6bb9b16ba04e38d4056c161878ce0d725 Mon Sep 17 00:00:00 2001 From: vanx <#vanxxxx> Date: Sun, 1 Sep 2024 01:22:29 +0300 Subject: [PATCH 1/2] changed job prototypes, removed whitelists --- .../Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml | 4 +++- .../Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml | 5 ++++- Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml | 3 +++ Resources/Prototypes/Roles/Jobs/Command/captain.yml | 4 +++- .../Prototypes/Roles/Jobs/Command/head_of_personnel.yml | 3 +++ .../Prototypes/Roles/Jobs/Engineering/chief_engineer.yml | 3 +++ .../Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml | 3 +++ .../Prototypes/Roles/Jobs/Science/research_director.yml | 3 +++ Resources/Prototypes/Roles/Jobs/Security/detective.yml | 3 +++ .../Prototypes/Roles/Jobs/Security/head_of_security.yml | 4 +++- Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml | 3 +++ .../Prototypes/Roles/Jobs/Security/security_officer.yml | 3 +++ Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml | 3 +++ Resources/Prototypes/Roles/Jobs/Security/warden.yml | 4 +++- 14 files changed, 43 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml index 2a879472e8..96d0021f07 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml @@ -15,7 +15,9 @@ min: 36000 # 10 hours - !type:CharacterOverallTimeRequirement min: 90000 # 25 hours - - !type:WhitelistRequirement # whitelist requirement because I don't want any dingus judges + - !type:SpeciesRequirement # WD EDIT + species: + - Human weight: 20 startingGear: CJGear icon: "JobIconChiefJustice" diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml index 681cb95be7..89f8273dbe 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml @@ -10,6 +10,9 @@ - !type:DepartmentTimeRequirement department: Security min: 18000 # 4 hrs + - !type:SpeciesRequirement # WD EDIT + species: + - Human startingGear: CorpsmanGear icon: "JobIconBrigmedic" supervisors: job-supervisors-hos @@ -35,7 +38,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitBrigmedic outerClothing: ClothingOuterArmorPlateCarrier - back: ClothingBackpackBrigmedicFilled + back: ClothingBackpackBrigmedicFilled shoes: ClothingShoesBootsCombatFilled gloves: ClothingHandsGlovesNitrile eyes: ClothingEyesHudMedical diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index ee1a101154..f133907911 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -19,6 +19,9 @@ min: 43200 #DeltaV 12 hours - !type:CharacterOverallTimeRequirement min: 144000 #40 hrs + - !type:SpeciesRequirement # WD EDIT + species: + - Human weight: 10 startingGear: QuartermasterGear icon: "JobIconQuarterMaster" diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index d624b349d5..b976b76692 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -24,7 +24,9 @@ min: 108000 # DeltaV - 30 hours - !type:CharacterOverallTimeRequirement # DeltaV - Playtime requirement min: 108000 # 30 hours - - !type:CharacterWhitelistRequirement + - !type:SpeciesRequirement # WD EDIT + species: + - Human 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 6311eb9fee..2ae007e0ac 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -19,6 +19,9 @@ min: 72000 # 20 hours - !type:CharacterOverallTimeRequirement # DeltaV - Playtime requirement min: 90000 # 25 hours + - !type:SpeciesRequirement # WD EDIT + species: + - Human 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/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index eaa66d6f0c..ba1a716a73 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -13,6 +13,9 @@ - !type:CharacterDepartmentTimeRequirement department: Engineering min: 90000 # DeltaV - 25 hours + - !type:SpeciesRequirement # WD EDIT + species: + - Human # - !type:OverallPlaytimeRequirement # time: 72000 # DeltaV - 20 hours weight: 10 diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 61b1df7784..a9d8dac3ce 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -18,6 +18,9 @@ min: 43200 # DeltaV - 12 hours - !type:CharacterOverallTimeRequirement min: 72000 # DeltaV - 20 hours + - !type:SpeciesRequirement # WD EDIT + species: + - Human weight: 10 startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 747ee41b84..149de809b7 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -10,6 +10,9 @@ min: 54000 # DeltaV - 15 hours - !type:CharacterOverallTimeRequirement min: 72000 # DeltaV - 20 hours + - !type:SpeciesRequirement # WD EDIT + species: + - Human weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 861088b5e5..c654fb0b9c 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -7,6 +7,9 @@ - !type:CharacterDepartmentTimeRequirement department: Security min: 36000 # DeltaV - 10 hours + - !type:SpeciesRequirement # WD EDIT + species: + - Human startingGear: DetectiveGear icon: "JobIconDetective" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 46e018f35a..e5538af563 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -15,7 +15,9 @@ min: 36000 # 10 hours - !type:CharacterOverallTimeRequirement min: 90000 # DeltaV - 25 hours - - !type:CharacterWhitelistRequirement + - !type:SpeciesRequirement # WD EDIT + species: + - Human weight: 10 startingGear: HoSGear icon: "JobIconHeadOfSecurity" diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index 0b28af7850..d70834e920 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -6,6 +6,9 @@ requirements: - !type:CharacterOverallTimeRequirement min: 14400 # DeltaV - 4 hours + - !type:SpeciesRequirement # WD EDIT + species: + - Human # - !type:DepartmentTimeRequirement # DeltaV - Removes time limit # department: Security # time: 54000 #15 hrs diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index b81cef667e..27681cf634 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -7,6 +7,9 @@ - !type:CharacterDepartmentTimeRequirement department: Security min: 14400 # DeltaV - 4 hours + - !type:SpeciesRequirement # WD EDIT + species: + - Human startingGear: SecurityOfficerGear icon: "JobIconSecurityOfficer" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml index 2623adf1fd..9b814b34d2 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml @@ -17,6 +17,9 @@ - !type:CharacterDepartmentTimeRequirement department: Security min: 216000 # 60 hrs + - !type:SpeciesRequirement # WD EDIT + species: + - Human startingGear: SeniorOfficerGear icon: "JobIconSeniorOfficer" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 82101373db..1cca0c21cb 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -10,7 +10,9 @@ - !type:CharacterPlaytimeRequirement # DeltaV - JobDetective time requirement. Give them an understanding of basic forensics. tracker: JobDetective min: 14400 # DeltaV - 4 hours - - !type:CharacterWhitelistRequirement + - !type:SpeciesRequirement # WD EDIT + species: + - Human startingGear: WardenGear icon: "JobIconWarden" supervisors: job-supervisors-hos From 0bc3ab3822cbb42cb15460fac6caa76e8c3bba79 Mon Sep 17 00:00:00 2001 From: vanx <#vanxxxx> Date: Sun, 1 Sep 2024 01:34:39 +0300 Subject: [PATCH 2/2] last one --- .../Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml index fec6ac685e..e78c167cb6 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml @@ -9,6 +9,9 @@ - !type:DepartmentTimeRequirement department: Security min: 14400 + - !type:SpeciesRequirement # WD EDIT + species: + - Human startingGear: PrisonGuardGear alwaysUseSpawner: true canBeAntag: false