Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Job Fixes #650

Merged
merged 9 commits into from
Nov 1, 2024
Merged

Job Fixes #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
977ec6e
Spoke with Z, fixed things requested by Z and mappers. Will explain i…
ReginaeSpence Nov 1, 2024
78d35ae
Spoke with Z, fixed things requested by Z and mappers. Will explain i…
ReginaeSpence Nov 1, 2024
e503868
Update squire.yml
ReginaeSpence Nov 1, 2024
ddda39d
Update knight.yml
ReginaeSpence Nov 1, 2024
583224d
Update squire.yml
ReginaeSpence Nov 1, 2024
43b4b95
Update knight.yml
ReginaeSpence Nov 1, 2024
48b4b74
Update squire.yml
ReginaeSpence Nov 1, 2024
b950fe5
Update knight.yml
ReginaeSpence Nov 1, 2024
86be88e
Update squire.yml
ReginaeSpence Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
requirements:
- !type:CharacterDepartmentTimeRequirement
department: BrotherhoodMidwest
min: 3600 # 1 hour
min: 18000 # 5 hours
startingGear: BoSMidKnightGear
alwaysUseSpawner: true
icon: "JobIconPassenger"
Expand All @@ -21,8 +21,6 @@
factions:
- BrotherhoodMidwest
jobBlockForSpecies:
- !type:JobBlockForSpecie
nameSpecie: Ghoul
- !type:JobBlockForSpecie
nameSpecie: GhoulGlowing

Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin-commander.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
requirements:
- !type:CharacterDepartmentTimeRequirement
department: BrotherhoodMidwest
min: 36000 # 10 hours
min: 72000 # 20 hours
startingGear: BoSMidPaladinCommanderGear
alwaysUseSpawner: true
icon: "JobIconPassenger"
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
requirements:
- !type:CharacterDepartmentTimeRequirement
department: BrotherhoodMidwest
min: 18000 # 5 hours
min: 54000 # 15 hours
startingGear: BoSMidPaladinGear
alwaysUseSpawner: true
icon: "JobIconPassenger"
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/scribe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
requirements:
- !type:CharacterDepartmentTimeRequirement
department: BrotherhoodMidwest
min: 3600 # 1 hour
min: 18000 # 5 hours
startingGear: BoSMidScribeGear
alwaysUseSpawner: true
icon: "JobIconPassenger"
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
- type: NpcFactionMember
factions:
- BrotherhoodMidwest
jobBlockForSpecies:
- !type:JobBlockForSpecie
nameSpecie: GhoulGlowing

- type: startingGear
id: BoSMidSquireGear
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_lt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
icon: "JobIconHeadOfSecurity"
requireAdminNotify: true
canBeAntag: false
alwaysUseSpawner: true
accessGroups:
- NCR
special:
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_medic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
icon: "JobIconPassenger"
supervisors: job-supervisors-ncr-nco
canBeAntag: false
alwaysUseSpawner: true
access:
- NCR
- NCRMedic
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_sgt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
icon: "JobIconSecurityOfficer"
supervisors: job-supervisors-ncr
canBeAntag: false
alwaysUseSpawner: true
access:
- NCR
- NCRSGT
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
icon: "JobIconWarden"
supervisors: job-supervisors-ncr-nco
canBeAntag: false
alwaysUseSpawner: true
access:
- NCR
special:
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_ws.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
icon: "JobIconWarden"
supervisors: job-supervisors-ncr-nco
canBeAntag: false
alwaysUseSpawner: true
access:
- NCR
special:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/republic_ranger.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/towndeputy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading