-
Notifications
You must be signed in to change notification settings - Fork 108
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'Vault-Overseers:master' into Pog_Howard
- Loading branch information
Showing
110 changed files
with
784 additions
and
337 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,23 @@ | ||
job-supervisors-bos-mid = the midwest brotherhood knight commander | ||
job-supervisors-bos-washington-commander = lead your faction to victory! | ||
job-supervisors-bos-washington = follow your elder to victory! | ||
job-supervisors-bos-washington-initiate = follow orders from all other roles within the chapter | ||
job-supervisors-bos-mid-initiate = anyone in the Midwestern chapter | ||
job-supervisors-bos-mid-knight = the Paladins of the Midwestern chapter | ||
job-supervisors-bos-mid = your bunker's commanding officer | ||
job-supervisors-bos-mid-commander = no one, but the Elder Council & your sense of duty | ||
job-supervisors-bos-wash-initiate = anyone in the Washington chapter | ||
job-supervisors-bos-wash-knight = the Paladins of the Washington chapter | ||
job-supervisors-bos-wash = your bunker's commanding officer | ||
job-supervisors-bos-wash-commander = no one, but the Elder & your sense of duty | ||
job-supervisors-caravan = the caravan leader | ||
job-supervisors-caravan-leader = lead your caravan company to riches through trade | ||
job-supervisors-ncr = the NCR officer | ||
job-supervisors-ncr-nco = the NCR officer followed by the NCO | ||
job-supervisors-ncr-captain = the NCR Captain | ||
job-supervisors-ranger = the ranger | ||
job-supervisors-veteran-ranger = the veteran ranger | ||
job-supervisors-chief-ranger = the chief ranger | ||
job-supervisors-tribal = the tribe elder | ||
job-supervisors-tribal-elder = lead your tribe to health and prosperity | ||
job-supervisors-overseer = the vaults overseer | ||
job-supervisors-vault-overseer = lead your vault to prosperity and maintain the status quo | ||
job-supervisors-wastelander = look after yourself above all else | ||
job-supervisors-townsfolk = the town mayor | ||
job-supervisors-caravan-leader = your greed & Blue Line Co. leadership | ||
job-supervisors-ncr = the Sergeant of the NCR Army | ||
job-supervisors-ncr-sgt = the Lieutenant of the NCR Army | ||
job-supervisors-ncr-lt = your mission & NCR laws | ||
job-supervisors-ncr-ranger = your morale code & NCR laws | ||
job-supervisors-tribal = the Tribe elder | ||
job-supervisors-tribal-elder = your best judgement | ||
job-supervisors-vault = the Overseer | ||
job-supervisors-vault-overseer = your morale code | ||
job-supervisors-wastelander = yourself and you alone | ||
job-supervisors-townsfolk = the Mayor of the town | ||
job-supervisors-townsfolk-deputy = the local Sheriff | ||
job-supervisors-townsfolk-sheriff = the Mayor and/or your sense of justice | ||
job-supervisors-townsfolk-mayor = the people who you represent or your own ambitions |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/gasmasks.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.