-
-
Notifications
You must be signed in to change notification settings - Fork 517
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
adds hydrogen, ice, and combustion thrusters! #2431
Conversation
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is absolutely awesome! I can't wait to see this in-game.
my review may look menacing but it's mostly just some code nitpicking, don't fret
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixes issue caused by #2865 resorting the args
Co-authored-by: FalloutFalcon <[email protected]> Signed-off-by: HelmCrab <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pretty sure this is good to merge. I wait on atleast one other maint since this is a pretty big feature
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
mark needs to look at again but those are adressed
this has been in hell for long enough i think |
<!-- 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 ![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/65dcc95c-eca5-485a-981c-b72e66301a65) ore in asteroid ![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/9a03b0fe-9520-4679-8202-c80d6c667f54) ice ore ![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/30eacab2-8f0d-4263-bfaf-e378ea0643fe) 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 ![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/0339827c-c756-49c0-b7dc-e00e8418aeee) orange screen to match UI ![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/9c4b1ae8-5c17-4d8f-9d67-0fde00e34508) changed ships ![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/24242b38-92d3-4f6f-b4da-36f346513290) ![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/bbe8be05-be2f-49ab-b346-afa395569b62) ![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/a2957267-396e-48ee-91c5-856906c1a9e3) ![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/06c3e0bf-e36c-431a-9baf-585069bf8f4c) ![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/1e9110b0-a365-4234-82aa-7b60aa31cb69) ![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/4f269819-8f87-4300-94f8-c383675a7a70) :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]>
<!-- 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 ![image](https://github.com/user-attachments/assets/575e4ef0-5f29-4fc8-bbf6-cc2d57eb28c4) old ![image](https://github.com/user-attachments/assets/2165bc33-f260-41ab-934d-3f6a90062277) <!-- 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. -->
<!-- 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 ![image](https://github.com/user-attachments/assets/575e4ef0-5f29-4fc8-bbf6-cc2d57eb28c4) old ![image](https://github.com/user-attachments/assets/2165bc33-f260-41ab-934d-3f6a90062277) <!-- 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. -->
<!-- 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 ![image](https://github.com/user-attachments/assets/575e4ef0-5f29-4fc8-bbf6-cc2d57eb28c4) old ![image](https://github.com/user-attachments/assets/2165bc33-f260-41ab-934d-3f6a90062277) <!-- 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. -->
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: