From 977ec6e4afed4b020e61069a66d918a20b836a8b Mon Sep 17 00:00:00 2001 From: ReginaeSpence <184731218+ReginaeSpence@users.noreply.github.com> Date: Fri, 1 Nov 2024 06:04:54 -0600 Subject: [PATCH 1/8] Spoke with Z, fixed things requested by Z and mappers. Will explain in notes. --- .../_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml | 6 ++---- .../Roles/Jobs/BrotherhoodMidwest/paladin-commander.yml | 2 +- .../_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin.yml | 2 +- .../_Nuclear14/Roles/Jobs/BrotherhoodMidwest/scribe.yml | 2 +- .../_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml | 3 +++ .../Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_doctor.yml | 1 + Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_mp.yml | 1 + Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_nco.yml | 1 + .../Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_officer.yml | 1 + .../_Nuclear14/Roles/Jobs/NCR/ncr_quartermaster.yml | 1 + .../Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml | 1 + .../_Nuclear14/Roles/Jobs/NCR/republic_ranger.yml | 2 +- .../_Nuclear14/Roles/Jobs/Townsfolk/towndeputy.yml | 2 +- 13 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml index e74a5185f9e..c2b605dcbbf 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml @@ -7,7 +7,7 @@ requirements: - !type:CharacterDepartmentTimeRequirement department: BrotherhoodMidwest - min: 3600 # 1 hour + min: 18000 # 5 hours startingGear: BoSMidKnightGear alwaysUseSpawner: true icon: "JobIconPassenger" @@ -20,9 +20,7 @@ - type: NpcFactionMember factions: - BrotherhoodMidwest - jobBlockForSpecies: - - !type:JobBlockForSpecie - nameSpecie: Ghoul + jobBlockForSpecies: - !type:JobBlockForSpecie nameSpecie: GhoulGlowing diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin-commander.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin-commander.yml index 5653e2ef66b..db15c7b2626 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin-commander.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin-commander.yml @@ -7,7 +7,7 @@ requirements: - !type:CharacterDepartmentTimeRequirement department: BrotherhoodMidwest - min: 36000 # 10 hours + min: 72000 # 20 hours startingGear: BoSMidPaladinCommanderGear alwaysUseSpawner: true icon: "JobIconPassenger" diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin.yml index 1abe320fa12..94a96ef0ae1 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin.yml @@ -7,7 +7,7 @@ requirements: - !type:CharacterDepartmentTimeRequirement department: BrotherhoodMidwest - min: 18000 # 5 hours + min: 54000 # 15 hours startingGear: BoSMidPaladinGear alwaysUseSpawner: true icon: "JobIconPassenger" diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/scribe.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/scribe.yml index f6f70914816..9233432f70a 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/scribe.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/scribe.yml @@ -7,7 +7,7 @@ requirements: - !type:CharacterDepartmentTimeRequirement department: BrotherhoodMidwest - min: 3600 # 1 hour + min: 18000 # 5 hours startingGear: BoSMidScribeGear alwaysUseSpawner: true icon: "JobIconPassenger" diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml index 573afa1cb94..7a85b92c351 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml @@ -16,6 +16,9 @@ - type: NpcFactionMember factions: - BrotherhoodMidwest + jobBlockForSpecies: + - !type:JobBlockForSpecie + nameSpecie: GhoulGlowing - type: startingGear id: BoSMidSquireGear diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_doctor.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_doctor.yml index 3b426f807a8..68aa490e10b 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_doctor.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_doctor.yml @@ -12,6 +12,7 @@ icon: "JobIconPassenger" supervisors: job-supervisors-ncr-nco canBeAntag: false + alwaysUseSpawner: true access: - NCR - NCRMedic diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_mp.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_mp.yml index 214c285394e..c827ca6cbea 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_mp.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_mp.yml @@ -12,6 +12,7 @@ icon: "JobIconSecurityOfficer" supervisors: job-supervisors-ncr canBeAntag: false + alwaysUseSpawners: true access: - NCR - NCRMP diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_nco.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_nco.yml index 7749161870c..4d1f477a7e6 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_nco.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_nco.yml @@ -12,6 +12,7 @@ icon: "JobIconSecurityOfficer" supervisors: job-supervisors-ncr canBeAntag: false + alwaysUseSpawner: true access: - NCR - NCRNCO diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_officer.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_officer.yml index 95642a7e358..53a954a621e 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_officer.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_officer.yml @@ -13,6 +13,7 @@ icon: "JobIconHeadOfSecurity" requireAdminNotify: true canBeAntag: false + alwaysUseSpawner: true accessGroups: - NCR special: diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_quartermaster.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_quartermaster.yml index bf1341488d6..b1cc97fdea4 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_quartermaster.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_quartermaster.yml @@ -12,6 +12,7 @@ icon: "JobIconWarden" supervisors: job-supervisors-ncr-nco canBeAntag: false + alwaysUseSpawner: true access: - NCR - NCRNCO diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml index 52ceb1e36a4..bd203d21608 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml @@ -12,6 +12,7 @@ icon: "JobIconWarden" supervisors: job-supervisors-ncr-nco canBeAntag: false + alwaysUseSpawner: true access: - NCR special: diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/republic_ranger.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/republic_ranger.yml index 643e49de5e8..2d10f1ad9a1 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/republic_ranger.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/republic_ranger.yml @@ -7,7 +7,7 @@ requirements: - !type:CharacterDepartmentTimeRequirement department: NCR - min: 36000 # 10 hours as NCR + min: 7200 # 20 hours as NCR - !type:CharacterWhitelistRequirement startingGear: NCRRangerGear icon: JobIconSecurityOfficer diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/towndeputy.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/towndeputy.yml index 0dfa660e7aa..011553408cd 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/towndeputy.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/towndeputy.yml @@ -7,7 +7,7 @@ requirements: - !type:CharacterDepartmentTimeRequirement department: Townsfolk - min: 3600 # 1 hours + min: 18000 # 5 hours startingGear: TownDeputyGear icon: "JobIconPassenger" supervisors: job-supervisors-townsfolk From e503868bb7d41db5293757a9c9a4aa3db5662037 Mon Sep 17 00:00:00 2001 From: ReginaeSpence <184731218+ReginaeSpence@users.noreply.github.com> Date: Fri, 1 Nov 2024 06:30:16 -0600 Subject: [PATCH 2/8] Update squire.yml missed a hypen --- .../_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml index 7a85b92c351..af7fc3d0d8a 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml @@ -16,7 +16,7 @@ - type: NpcFactionMember factions: - BrotherhoodMidwest - jobBlockForSpecies: + - jobBlockForSpecies: - !type:JobBlockForSpecie nameSpecie: GhoulGlowing From ddda39dcb7752969204cc0b7321eef03cd2d08f3 Mon Sep 17 00:00:00 2001 From: ReginaeSpence <184731218+ReginaeSpence@users.noreply.github.com> Date: Fri, 1 Nov 2024 06:32:46 -0600 Subject: [PATCH 3/8] Update knight.yml .. a second tabulator.. --- .../_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml index c2b605dcbbf..d884b5a3b85 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml @@ -20,7 +20,7 @@ - type: NpcFactionMember factions: - BrotherhoodMidwest - jobBlockForSpecies: + - jobBlockForSpecies: - !type:JobBlockForSpecie nameSpecie: GhoulGlowing From 583224d4cb4b5a49ca66b02f42cdd7d85fb6757c Mon Sep 17 00:00:00 2001 From: ReginaeSpence <184731218+ReginaeSpence@users.noreply.github.com> Date: Fri, 1 Nov 2024 06:40:29 -0600 Subject: [PATCH 4/8] Update squire.yml --- .../_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml index af7fc3d0d8a..da1bccb7aa1 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml @@ -16,7 +16,7 @@ - type: NpcFactionMember factions: - BrotherhoodMidwest - - jobBlockForSpecies: + - jobBlockForSpecies: - !type:JobBlockForSpecie nameSpecie: GhoulGlowing From 43b4b95577b759c4cce42cc8a3ca9fdd805f15e4 Mon Sep 17 00:00:00 2001 From: ReginaeSpence <184731218+ReginaeSpence@users.noreply.github.com> Date: Fri, 1 Nov 2024 07:19:59 -0600 Subject: [PATCH 5/8] Update knight.yml --- .../_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml index d884b5a3b85..eef137b8e98 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml @@ -20,7 +20,7 @@ - type: NpcFactionMember factions: - BrotherhoodMidwest - - jobBlockForSpecies: + jobBlockForSpecies: - !type:JobBlockForSpecie nameSpecie: GhoulGlowing From 48b4b74c3bcada55bf44d4a983bff8e542a14d84 Mon Sep 17 00:00:00 2001 From: ReginaeSpence <184731218+ReginaeSpence@users.noreply.github.com> Date: Fri, 1 Nov 2024 07:20:45 -0600 Subject: [PATCH 6/8] Update squire.yml --- .../_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml index da1bccb7aa1..d2c56e4ed07 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml @@ -16,7 +16,7 @@ - type: NpcFactionMember factions: - BrotherhoodMidwest - - jobBlockForSpecies: + jobBlockForSpecies: - !type:JobBlockForSpecie nameSpecie: GhoulGlowing From b950fe56abec1ed547dd8d1e2f833abbe0e61732 Mon Sep 17 00:00:00 2001 From: ReginaeSpence <184731218+ReginaeSpence@users.noreply.github.com> Date: Fri, 1 Nov 2024 07:31:07 -0600 Subject: [PATCH 7/8] Update knight.yml --- .../_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml index eef137b8e98..90bf9dd0c6d 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml @@ -20,7 +20,7 @@ - type: NpcFactionMember factions: - BrotherhoodMidwest - jobBlockForSpecies: + jobBlockForSpecies: - !type:JobBlockForSpecie nameSpecie: GhoulGlowing From 86be88e702e9a824a91dc38a705b07cf6f71da3c Mon Sep 17 00:00:00 2001 From: ReginaeSpence <184731218+ReginaeSpence@users.noreply.github.com> Date: Fri, 1 Nov 2024 07:48:29 -0600 Subject: [PATCH 8/8] Update squire.yml --- .../_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml index d2c56e4ed07..360865fccbb 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml @@ -16,7 +16,7 @@ - type: NpcFactionMember factions: - BrotherhoodMidwest - jobBlockForSpecies: + jobBlockForSpecies: - !type:JobBlockForSpecie nameSpecie: GhoulGlowing