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.

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

up #1

Merged
merged 19 commits into from
Jun 21, 2024
Merged

up #1

Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 1 deletion Resources/IgnoredPrototypes/ignoredPrototypes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,6 @@
- /Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml
- /Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml
- /Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml
- /Prototypes/Loadouts/Jobs/Heads/researchDirector.yml
- /Prototypes/Loadouts/Jobs/Heads/researchDirector.yml
# Recipes
- /Prototypes/Recipes/Lathes
7 changes: 6 additions & 1 deletion Resources/Locale/en-US/Nuclear14/construction.ftl
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
construction-category-medical = Medical
construction-category-medical = Medical

lathe-category-containers = Containers
lathe-category-chemistry = Chemistry
lathe-category-kitchen = Kitchen
lathe-category-misc = Misc
24 changes: 23 additions & 1 deletion Resources/Locale/en-US/Nuclear14/reagents.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ reagent-name-milk-bighorner = bighorner milk
reagent-desc-milk-bighorner = Fatty bighorner milk.
reagent-name-milk-radstag = radstag milk
reagent-desc-milk-radstag = Protein rich radstag milk.
reagent-name-wasteland-blood = waster blood
reagent-desc-wasteland-blood = waster blood

reagent-name-fireantnectar = Fire ant nectar
reagent-desc-fireantnectar = Crystals of fire ant nectar.
Expand Down Expand Up @@ -144,8 +146,10 @@ reagent-name-antidote = antidote
reagent-desc-antidote = A potent antitoxin manufactured in a lab.

# Medicine
reagent-name-healing-mixture = healing mixture
reagent-name-healing-mixture = stimpak
reagent-desc-healing-mixture = A mixture of reagents that makes you heal.
reagent-name-dirty-stimpak = dirty stimpak
reagent-desc-dirty-stimpak = A dirty mixture of reagents that makes you heal.

reagent-name-robust-healing-mixture = robust healing mixture
reagent-desc-robust-healing-mixture = A mixture of reagents that makes you heal fast.
Expand All @@ -167,6 +171,12 @@ reagent-desc-fixer = A reagent that cures your addictions.

reagent-name-mentats = mentats
reagent-desc-mentats = A reagent that makes you mentally sharper.
reagent-name-mentats-berry = berry mentats
reagent-desc-mentats-berry = A fruity reagent that makes you mentally sharper.
reagent-name-mentats-grape = grape mentats
reagent-desc-mentats-grape = A fruity reagent that makes you mentally sharper.
reagent-name-mentats-orange = orange mentats
reagent-desc-mentats-orange = A citrus reagent that makes you mentally sharper.

reagent-name-cateye = cateye
reagent-desc-cateye = A reagent that improves your low-light vision.
Expand All @@ -193,6 +203,18 @@ reagent-desc-wonderglue = A pre-war adhesive. Don't sniff it.
reagent-name-turpentine = Turpentine
reagent-desc-turpentine = A spirit used for cleaning things.

# Ores, Metals, Materials
materials-gunpowder = gunpowder
materials-lead = lead
materials-sulfur = sulfur
materials-raw-lead = raw lead
materials-raw-sulfur = raw sulfur
reagent-name-gunpowder = gunpowder
reagent-desc-gunpowder = gunpowder
reagent-name-fertilizer = fertilizer
reagent-desc-fertilizer = fertilizer


# Other
reagent-name-scorpiontail = scorpion tail
reagent-desc-scorpiontail = scorpion tail. Stingy.
6,936 changes: 3,767 additions & 3,169 deletions Resources/Maps/N14/wave1.yml

Large diffs are not rendered by default.

Loading
Loading