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
Vault-Overseers · Nov 1, 2024 · 9f38cd7 · 9f38cd7
1 parent 9fa7ab9
commit 9f38cd7
Showing 12 changed files with 14 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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