adds hydrogen, ice, and combustion thrusters! #2431
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
keywordlabeler
bot
added
the
Do Not Merge
|
This is genuinely one of the most goated PRs I've seen in a while. |
these are mid and will need to be replaced probably
|
Minimum amount of things needed for the hydrogen loop to work are finished, I'll be undrafting this shortly |
github-actions
bot
added
the
Map Change
Thera-Pissed
changed the title
MarkSuckerberg
requested changes
Nov 9, 2023
FalloutFalcon
requested changes
Jun 6, 2024
Co-authored-by: FalloutFalcon <[email protected]> Signed-off-by: HelmCrab <[email protected]>
FalloutFalcon
approved these changes
Jun 8, 2024
|
there's a bug with both plasma and combustion heaters where the weakref gets set weird if the attached heater is reconstructed, should I just throw the fix on this PR? |
yes |
…ter machines default to east on construction
rye-rice
dismissed
MarkSuckerberg’s stale review
mark needs to look at again but those are adressed
|
this has been in hell for long enough i think |
shiptest-server
pushed a commit
that referenced
this pull request
Jun 20, 2024
MrCat15352
pushed a commit
to MrCat15352/MrCat
that referenced
this pull request
Jun 22, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> adds the following: Hydrogen gas, gotten using hydrogen merits at designated fuel pumps Merits, gotten from putting ice in the electrolyzer or from the Hydrogen Exchange Hydrogen Exchange, a machine that switches between credits and merits, for a price. Combustion Thrusters, which take a fuel and oxidizer mix and creates thrust. Bad ratios waste fuel. Heaters above 1010kpa take damage and eventually leak and explode. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> adding hydrogen allows for a fuel loop to be created, and combustion thrusters add depth that plasma thrusters just don't have. Current Oxidizers + multipliers Oxygen 1x Nitryl 1x N2O 3x + cools heater gases Current Fuels + multipliers Hydrogen 0.5x Plasma 1x Tritium 3x https://cdn.discordapp.com/attachments/837744059291533395/1167252813974356038/2023-10-26_19-00-05.mp4?ex=654d73e5&is=653afee5&hm=b83a3d48f62a76eed47965c86baa93f906db9defcad7d55293c1eb1c2e6f623b& link to video Big thanks to Bog Creature! I wouldn't have gotten nearly this far without their help. overpressure demo: https://youtu.be/kHi6YwixPHs hydrogen system demo: https://youtu.be/uSetVeQDrtI?si=4AN-PotFAONM9aLI  ore in asteroid  ice ore  cans! <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> new hydrogen machines, though merits and the hydrogen pump should get better sprites before merge  orange screen to match UI  changed ships       :cl: add: Added Hydrogen, and Combustion Thrusters to go with! /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Signed-off-by: HelmCrab <[email protected]> Co-authored-by: Mark Suckerberg <[email protected]> Co-authored-by: JimKil3 <[email protected]> Co-authored-by: goober3 <[email protected]> Co-authored-by: FalloutFalcon <[email protected]>
github-merge-queue bot
pushed a commit
that referenced
this pull request
Aug 3, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Hydrogen now burns with the correct (I think) enthalpy, making hydrogen TEGs viable. yay! Komodo, Skipper, and Inkwell get instruction sheets. Crying-sun had one and the upcoming dwayne remap adds one. Electrolyzers now try to link when ice goes in instead of on init, which caused certain maps to not connect. Electrolyzer multitool linking works now. Merits can no longer turn into a magic 0 value slip. Replaces nt_ice passive pumps with volume pumps (skipper keeps hydrogen, the commits lie) Hydrogen pumps not correctly connecting to the pipenet even when the Other recent map bug isn't in effect is still an issue, but I've got no idea how to fix it. Leaving it as an issue for now. fixed single wrong pixel on the sprite. new  old  <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game #2431 needed more testing, especially since it was an early PR of mine. Fixes some of my mistakes. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: fix: hydrogen and combustion bugs /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
MysticalFaceLesS
pushed a commit
to CeladonSS13/Shiptest
that referenced
this pull request
Aug 3, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Hydrogen now burns with the correct (I think) enthalpy, making hydrogen TEGs viable. yay! Komodo, Skipper, and Inkwell get instruction sheets. Crying-sun had one and the upcoming dwayne remap adds one. Electrolyzers now try to link when ice goes in instead of on init, which caused certain maps to not connect. Electrolyzer multitool linking works now. Merits can no longer turn into a magic 0 value slip. Replaces nt_ice passive pumps with volume pumps (skipper keeps hydrogen, the commits lie) Hydrogen pumps not correctly connecting to the pipenet even when the Other recent map bug isn't in effect is still an issue, but I've got no idea how to fix it. Leaving it as an issue for now. fixed single wrong pixel on the sprite. new  old  <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game shiptest-ss13#2431 needed more testing, especially since it was an early PR of mine. Fixes some of my mistakes. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: fix: hydrogen and combustion bugs /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
FalloutFalcon
pushed a commit
to FalloutFalcon/ShiptestF
that referenced
this pull request
Aug 30, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Hydrogen now burns with the correct (I think) enthalpy, making hydrogen TEGs viable. yay! Komodo, Skipper, and Inkwell get instruction sheets. Crying-sun had one and the upcoming dwayne remap adds one. Electrolyzers now try to link when ice goes in instead of on init, which caused certain maps to not connect. Electrolyzer multitool linking works now. Merits can no longer turn into a magic 0 value slip. Replaces nt_ice passive pumps with volume pumps (skipper keeps hydrogen, the commits lie) Hydrogen pumps not correctly connecting to the pipenet even when the Other recent map bug isn't in effect is still an issue, but I've got no idea how to fix it. Leaving it as an issue for now. fixed single wrong pixel on the sprite. new  old  <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game shiptest-ss13#2431 needed more testing, especially since it was an early PR of mine. Fixes some of my mistakes. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: fix: hydrogen and combustion bugs /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
adds the following:
Hydrogen gas, gotten using hydrogen merits at designated fuel pumps
Merits, gotten from putting ice in the electrolyzer or from the Hydrogen Exchange
Hydrogen Exchange, a machine that switches between credits and merits, for a price.
Combustion Thrusters, which take a fuel and oxidizer mix and creates thrust. Bad ratios waste fuel. Heaters above 1010kpa take damage and eventually leak and explode.
Why It's Good For The Game
adding hydrogen allows for a fuel loop to be created, and combustion thrusters add depth that plasma thrusters just don't have.
Current Oxidizers + multipliers
Oxygen 1x
Nitryl 1x
N2O 3x + cools heater gases
Current Fuels + multipliers
Hydrogen 0.5x
Plasma 1x
Tritium 3x
https://cdn.discordapp.com/attachments/837744059291533395/1167252813974356038/2023-10-26_19-00-05.mp4?ex=654d73e5&is=653afee5&hm=b83a3d48f62a76eed47965c86baa93f906db9defcad7d55293c1eb1c2e6f623b& link to video
Big thanks to Bog Creature! I wouldn't have gotten nearly this far without their help.
overpressure demo:
https://youtu.be/kHi6YwixPHs
hydrogen system demo:
https://youtu.be/uSetVeQDrtI?si=4AN-PotFAONM9aLI
ore in asteroid
ice ore
cans!
new hydrogen machines, though merits and the hydrogen pump should get better sprites before merge
orange screen to match UI
changed ships
Changelog
🆑
add: Added Hydrogen, and Combustion Thrusters to go with!
/:cl: