From 9f38cd7884bea4cb75f3684282660121a79b0f1d Mon Sep 17 00:00:00 2001
From: ReginaeSpence <184731218+ReginaeSpence@users.noreply.github.com>
Date: Fri, 1 Nov 2024 08:12:01 -0600
Subject: [PATCH] Job Fixes (#650)

* Spoke with Z, fixed things requested by Z and mappers. Will explain in notes.

* Update squire.yml

missed a hypen

* Update knight.yml

.. a second tabulator..

* Update squire.yml

* Update knight.yml

* Update squire.yml

* Update knight.yml

* Update squire.yml
---
 .../_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml       | 4 +---
 .../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 +++
 Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_lt.yml     | 1 +
 Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_medic.yml  | 1 +
 Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_sgt.yml    | 1 +
 .../Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml      | 1 +
 Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_ws.yml     | 1 +
 .../Prototypes/_Nuclear14/Roles/Jobs/NCR/republic_ranger.yml  | 2 +-
 .../Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/towndeputy.yml | 2 +-
 12 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml
index e74a5185f9e..90bf9dd0c6d 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"
@@ -21,8 +21,6 @@
         factions:
           - BrotherhoodMidwest
   jobBlockForSpecies:
-  - !type:JobBlockForSpecie
-    nameSpecie: Ghoul
   - !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..360865fccbb 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_lt.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_lt.yml
index a6b58f51c4b..f1f0fdc110f 100644
--- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_lt.yml
+++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_lt.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_medic.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_medic.yml
index d6afc371cbd..19641351243 100644
--- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_medic.yml
+++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_medic.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_sgt.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_sgt.yml
index e62245d959c..8fbfca2d919 100644
--- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_sgt.yml
+++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_sgt.yml
@@ -12,6 +12,7 @@
   icon: "JobIconSecurityOfficer"
   supervisors: job-supervisors-ncr
   canBeAntag: false
+  alwaysUseSpawner: true
   access:
   - NCR
   - NCRSGT
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/ncr_ws.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_ws.yml
index c28f25e3bcd..61d6f2e8b29 100644
--- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_ws.yml
+++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_ws.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 ff6cd2bb94b..455786cff60 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