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

Oxygen concentration and compression #61696

Merged
merged 7 commits into from
Mar 28, 2023

Conversation

taatu
Copy link
Contributor

@taatu taatu commented Oct 14, 2022

Summary

Content "Add appliances for refilling oxygen tanks"

Purpose of change

Currently the only way to get compressed oxygen is by scavenging. However, most compressed oxygen storage mediums can be refilled with machines that are surprisingly compact and relatively cheap/somewhat-relatively-common.
As an aside, through deconstruction will make some progress towards #60105

Describe the solution

Add the ("portable") oxygen concentrator appliance and the ("portable") high pressure compressor unit appliance. (these can't be crafted by the player, for now at least) Other minor changes are done alongside it.

  • appliance items, deconstruct recipes
  • appliances proper, construct & construct groups
  • oxygen crafting recipes and tool pseudo-items
  • inactive furniture for the machines
  • flx the oxygen cylinder Attempt to audit power costs of welding #60660
  • make them spawn in the hospital
  • add missing words to dictionary
  • more testing

Describe alternatives you've considered

since the machines are almost 100% automated, could reduce crafting time to less than realistic times to simulate passive crafting. Staring at a big cylinder getting filled for 10 hours may be a bit frustrating
Or wait until 0.G and try to implement passive crafting

Testing

tested placing appliances, crafting each oxygen type, oxygen cylinder changes
March: tested hospital changes, previous steps again

Additional context

the machines are based on these:

http://www.energetic-tech.com/oxygen/oxygen-fill-system/
http://www.energetic-tech.com/oxygen/newlife-intensity-10/
http://www.energetic-tech.com/oxygen/oil-free-compressor/

extra info:
https://www.youtube.com/watch?v=GxclrM270gA

realistic time for filling of oxygen containers:
https://www.wolframalpha.com/input?i=density+of+oxygen+at+2000+psi
10 LPM (litres per minute) of 15 PSI oxygen -> effective 0.07 litres of compressed per minute (2000 PSI) -> 45 minutes for 3L tank (agrees with internet sources)

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Appliance/Power Grid Anything to do with appliances and power grid Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions Code: Tooling Tooling that is not part of the main game but is part of the repo. labels Oct 14, 2022
@github-actions
Copy link
Contributor

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • oxygen concentrators

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Oct 16, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Jan 6, 2023

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. Please do not bump or comment on this issue unless you are actively working on it. Stale issues, and stale issues that are closed are still considered.

@github-actions github-actions bot added the stale Closed for lack of activity, but still valid. label Jan 6, 2023
@Maleclypse Maleclypse added 0.G String Freeze and removed stale Closed for lack of activity, but still valid. labels Jan 23, 2023
@taatu taatu closed this Mar 25, 2023
@taatu taatu force-pushed the oxygen_machines branch from b663919 to 37a32ef Compare March 25, 2023 23:08
@taatu taatu reopened this Mar 25, 2023
@taatu taatu marked this pull request as ready for review March 26, 2023 01:23
@github-actions github-actions bot added Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Spawn Creatures, items, vehicles, locations appearing on map and removed BasicBuildPassed This PR builds correctly, label assigned by github actions labels Mar 26, 2023
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 26, 2023
@kevingranade kevingranade merged commit 65407fa into CleverRaven:master Mar 28, 2023
@taatu taatu deleted the oxygen_machines branch March 29, 2023 15:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Appliance/Power Grid Anything to do with appliances and power grid astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Code: Tooling Tooling that is not part of the main game but is part of the repo. Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants