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

NCR Loadout Changes #720

Merged
merged 4 commits into from
Nov 24, 2024
Merged

NCR Loadout Changes #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
393fa5d
.
troytroy400 Nov 23, 2024
21c994c
Update kits.yml
troytroy400 Nov 23, 2024
2086932
Update UndecidedLoadout.yml
troytroy400 Nov 23, 2024
9dc0e29
Update kits.yml
troytroy400 Nov 23, 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: 2 additions & 2 deletions Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ undecided-loadout-category-morale-description =
1 NCR spear flag, 1 9mm pistol, 2 9mm magazines, 1 combat knife,
and a C ration MRE.

undecided-loadout-category-medic-name = Medic Kit
undecided-loadout-category-medic-name = Combat Lifesaver Kit
undecided-loadout-category-medic-description =
A crate containing all a NCR medic needs to patrol on the wasteland.
A crate containing all an NCR CLS needs to patrol the wasteland.
Includes 1 NCR leather vest, 1 medical belt, 1 9mm SMG,
4 9mm SMG magazines, 1 combat knife, and a C ration MRE.

Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/UndecidedLoadout.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,4 +699,4 @@
sprite: _Nuclear14/Objects/Misc/kits.rsi
state: marksman
content:
- KitMarksmanBoSWashington
- KitMarksmanBoSWashington
8 changes: 5 additions & 3 deletions Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/kits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,10 @@
path: /Audio/Effects/unwrap.ogg

- type: entity
name: medic kit
name: combat lifesaver kit
parent: KitBase
id: KitMedic
description: A crate containing all an NCR Medic needs to patrol the wasteland.
description: A crate containing all an NCR CLS needs to patrol the wasteland.
components:
- type: Sprite
state: medic
Expand All @@ -156,6 +156,7 @@
- id: N14MagazineSMG9mm
amount: 4
- id: N14CombatKnife
- id: N14ClothingHeadHatNCRHelmetMetalMedic
- id: N14BoxCardboardMREBoxCFilled
sound:
path: /Audio/Effects/unwrap.ogg
Expand All @@ -180,6 +181,7 @@
- id: N14WeaponPistol9mm
- id: N14MagazinePistol9mm
amount: 2
- id: SheetSteel10
- id: N14CombatKnife
- id: N14BoxCardboardMREBoxCFilled
sound:
Expand Down Expand Up @@ -919,4 +921,4 @@
- id: N14PowerCellSmall
amount: 2
- id: N14Stimpak
- id: N14BoxCardboardMREBoxKFilled
- id: N14BoxCardboardMREBoxKFilled
Loading