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

Mix up atmos on planets #2430

Merged
merged 4 commits into from
Nov 20, 2024
Merged

Mix up atmos on planets #2430

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
d8721b2
Mix It Up
dvir001 Nov 18, 2024
85b9a38
Update expeditions.ftl
dvir001 Nov 18, 2024
48a363c
Update salvage_mods.yml
dvir001 Nov 18, 2024
ced1994
Merge branch 'master' into 2024-11-19-AtmostMix
dvir001 Nov 19, 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
22 changes: 21 additions & 1 deletion Resources/Locale/en-US/_NF/procedural/expeditions.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,24 @@ salvage-dungeon-mod-med-sci = Medical Science Base
salvage-dungeon-mod-factory-dorms = Factory Dorms
salvage-dungeon-mod-lava-mercenary = Lava Mercenary Base
salvage-dungeon-mod-virology-lab = Virology Lab
salvage-dungeon-mod-salvage-outpost = Salvage Outpost
salvage-dungeon-mod-salvage-outpost = Salvage Outpost

salvage-air-mod-1 = 82 N2, 21 O2
salvage-air-mod-2 = 72 N2, 21 O2, 10 N2O
salvage-air-mod-3 = 72 N2, 21 O2, 10 H2O
salvage-air-mod-4 = 72 N2, 21 O2, 10 NH3
salvage-air-mod-5 = 72 N2, 21 O2, 10 CO2
salvage-air-mod-6 = 79 N2, 21 O2, 5 P
salvage-air-mod-7 = 57 N2, 21 O2, 15 NH3, 5 P, 5 N2O
salvage-air-mod-8 = 57 N2, 21 O2, 15 H2O, 5 NH3, 5 N2O
salvage-air-mod-9 = 57 N2, 21 O2, 15 CO2, 5 P, 5 N2O
salvage-air-mod-10 = 82 CO2, 21 O2
salvage-air-mod-11 = 67 CO2, 31 O2, 5 P
salvage-air-mod-12 = 103 H2O
salvage-air-mod-13 = 103 NH3
salvage-air-mod-14 = 103 N2O
salvage-air-mod-15 = 103 CO2
salvage-air-mod-16 = 34 CO2, 34 NH3, 34 N2O
salvage-air-mod-17 = 34 H2O, 34 NH3, 34 N2O
salvage-air-mod-18 = 34 H2O, 34 N2O, 17 NH3, 17 CO2
salvage-air-mod-unknown = Unknown atmosphere
Loading
Loading