Skip to content

Commit

Permalink
loadout, kit and names fixes as requested by the ever-watchful Z (#711)
Browse files Browse the repository at this point in the history
Co-authored-by: the-adom <[email protected]>
  • Loading branch information
the-adom and the-adom authored Nov 23, 2024
1 parent 233fff9 commit 5acb75e
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 25 deletions.
20 changes: 10 additions & 10 deletions Resources/Locale/en-US/_Nuclear14/job-names.ftl
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# Midwest Brotherhood
job-name-bos-mid-paladin-comm = Midwest Brotherhood Paladin Commander
job-name-bos-mid-paladin-comm = Midwest BoS Paladin Commander
job-description-bos-mid-paladin-comm = Lead the Midwest Brotherhood of Steel on their mission.
job-name-bos-mid-paladin = Midwest Brotherhood Paladin
job-name-bos-mid-paladin = Midwest BoS Paladin
job-description-bos-mid-paladin = Follow the Paladin Commander on their mission.
job-name-bos-mid-knight = Midwest Brotherhood Knight
job-name-bos-mid-knight = Midwest BoS Knight
job-description-bos-mid-knight = Follow the Paladin Commander on their mission.
job-name-bos-mid-scribe = Midwest Brotherhood Scribe
job-name-bos-mid-scribe = Midwest BoS Scribe
job-description-bos-mid-scribe = Conduct scientific missions and research for your brotherhood chapter.
job-name-bos-mid-squire = Midwest Brotherhood Squire
job-name-bos-mid-squire = Midwest BoS Squire
job-description-bos-mid-squire = Follow your Knight into battle and do their bidding.
# Washington Brotherhood
job-name-bos-washington-commander = Washington Brotherhood Commander
job-name-bos-washington-commander = Washington BoS Paladin Commander
job-description-bos-washington-commander = Lead the Washington Brotherhood of Steel to glory in their mission.
job-name-bos-washington-initiate = Washington Brotherhood Initiate
job-name-bos-washington-initiate = Washington BoS Initiate
job-description-bos-washington-initiate = Prove yourself to your chapter to progress through the ranks.
job-name-bos-washington-knight = Washington Brotherhood Knight
job-name-bos-washington-knight = Washington BoS Knight
job-description-bos-washington-knight = The military arm of the Brotherhood. Defend your chapter in their objectives and manufacture equipment.
job-name-bos-washington-paladin = Washington Brotherhood Captain
job-name-bos-washington-paladin = Washington BoS Paladin
job-description-bos-washington-paladin = Protect the Brotherhood at all costs. Take the Commanders will out into the wasteland.
job-name-bos-washington-scribe = Washington Brotherhood Scribe
job-name-bos-washington-scribe = Washington BoS Scribe
job-description-bos-washington-scribe = Conduct scientific missions and research for your brotherhood chapter.
# Caravan
Expand Down
8 changes: 4 additions & 4 deletions Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ undecided-loadout-category-bos-scribe-field-name = Brotherhood Scribe Field Kit
undecided-loadout-category-bos-scribe-field-description =
A crate containing everything a member of Brotherhood scribes.
For supporting your unit from the back.
Includes 1 AEP-7 pistol, 2 energy cells, 1 medical belt,
1 field scribe clothing, 1 knife, 1 stimpak, 1 C ration MRE
Includes 1 AEP-7 pistol, 2 energy cells, 1 scribe webbing,
1 field scribe clothing, 1 knife, 2 stimpak, 1 gauze, 1 bruise pack, 1 ointment, 1 C ration MRE
undecided-loadout-category-bos-scribe-engineer-name = Brotherhood Scribe Engineer Kit
undecided-loadout-category-bos-scribe-engineer-description =
Expand Down Expand Up @@ -234,8 +234,8 @@ undecided-loadout-category-bos-washington-scribe-field-name = Brotherhood Scribe
undecided-loadout-category-bos-washington-scribe-field-description =
A crate containing everything a member of Brotherhood scribes.
For supporting your unit from the back.
Includes 1 AEP-7 pistol, 1 AEP-7 pistol, 2 energy cells, 1 medical belt,
1 field scribe clothing, 1 knife, 1 stimpak, 1 C ration MRE
Includes 1 AEP-7 pistol, 1 AEP-7 pistol, 2 energy cells, 1 scribe webbing,
1 field scribe clothing, 1 knife, 2 stimpak, 1 gauze, 1 bruise pack, 1 ointment, 1 C ration MRE
undecided-loadout-category-bos-washington-scribe-engineer-name = Brotherhood Scribe Engineer Kit
undecided-loadout-category-bos-washington-scribe-engineer-description =
Expand Down
30 changes: 27 additions & 3 deletions Resources/Prototypes/_Nuclear14/Entities/Clothing/Belt/belts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,39 @@

- type: entity
parent: N14ClothingBeltStorageBase
id: ClothingBeltBoSMidwestWebbing
name: Midwest BoS carrier
description: A simple black carrier capable of holding all kind of ammo.
id: N14ClothingBeltBoSWebbing
name: BoS webbing
description: A simple black carrier, capable of holding all kind of ammo and medicine for field-use.
components:
- type: Sprite
sprite: _Nuclear14/Clothing/Belt/midwestboswebbing.rsi
- type: Clothing
sprite: _Nuclear14/Clothing/Belt/midwestboswebbing.rsi
- type: Appearance
- type: Storage
whitelist:
tags:
- Wrench
- Bottle
- Spray
- Brutepack
- Bloodpack
- Gauze
- Ointment
- CigPack
- PillCanister
- Radio
- DiscreteHealthAnalyzer
- SurgeryTool
- CigPack
- N14AmmoCell
components:
- Hypospray
- Injector
- Pill
- HandLabeler
- BallisticAmmoProvider
- CartridgeAmmo

- type: entity
parent: N14ClothingBeltStorageBase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@
- type: entity
parent: ClothingUniformBase
id: N14ClothingUniformJumpsuitBOSWashingtonFieldScribe
name: MidWest brotherhood scribe uniform
name: washington brotherhood scribe uniform
description: A maroon jumper and black combat trousers, the uniform worn by field-scribes of Washington's Brotherhood of Steel.
components:
- type: Sprite
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -654,14 +654,17 @@
- id: N14WeaponLaserPistol
- id: N14PowerCellSmall
amount: 2
- id: N14ClothingBeltMedicalFilled
- id: Gauze
- id: N14AloeSalve
- id: Brutepack
- id: ClothingHandsGlovesFingerless
- id: N14ClothingHeadHatBrotherhoodFieldCap
- id: N14ClothingOuterBrotherhoodMidwestFieldScribeCoat
- id: N14CombatKnife
- id: N14Stimpak
amount: 2
- id: N14BoxCardboardMREBoxKFilled
- id: ClothingBeltBoSMidwestWebbing
- id: N14ClothingBeltBoSWebbing
- id: N14ClothingUniformJumpsuitBOSFieldScribe

#engineer scribe
Expand Down Expand Up @@ -796,7 +799,7 @@
- id: ClothingHandsGlovesChemist
- id: ClothingHeadBrotherhoodScribeHeadset
- id: N14ClothingBootsBlack
- id: N14ClothingOuterBrotherhoodMedicalScribeRobes #CHANGE THIS!
- id: N14ClothingOuterBrotherhoodMedicalScribeRobes
- id: N14CombatKnife
- id: N14Stimpak
- id: N14BoxCardboardMREBoxKFilled
Expand All @@ -817,14 +820,17 @@
- id: N14WeaponLaserPistol
- id: N14PowerCellSmall
amount: 2
- id: N14ClothingBeltMedicalFilled
- id: ClothingHandsGlovesFingerless
- id: N14ClothingHeadHatBrotherhoodFieldCap
- id: N14ClothingOuterBrotherhoodFieldScribeCoat
- id: N14CombatKnife
- id: N14Stimpak
amount: 2
- id: Gauze
- id: N14AloeSalve
- id: Brutepack
- id: N14BoxCardboardMREBoxKFilled
- id: ClothingBeltBoSWebbing
- id: N14ClothingBeltBoSWebbing
- id: N14ClothingUniformJumpsuitBOSWashingtonFieldScribe

#engineer scribe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,8 @@
jumpsuit: N14ClothingUniformJumpsuitBOSBlack
back: N14ClothingBackpackSatchelMilitary
shoes: N14ClothingBootsCombatFilled
outerClothing: N14ClothingOuterBosScribe
id: N14IDBrotherhoodWashingtonHolotagScribe
ears: N14ClothingHeadsetBOSWashington
belt: N14ClothingBeltUtilityFilled
pocket1: NCRBoSWashingtonScribekits

- type: playTimeTracker
Expand Down

0 comments on commit 5acb75e

Please sign in to comment.