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

chemistry: extracts and concentrates pt2 #37944

Conversation

NastyNate2612
Copy link
Contributor

@NastyNate2612 NastyNate2612 commented Feb 12, 2020

adds filter paper qualitative and quantitative, tool qualities, vac pump on/off, recovery pump, butane tank

Summary

SUMMARY: Content "3rd installment of my extracts and concentrates mod into mainline"

Describe the solution

-filter paper qualitative and quantitative: used in filtration with buchner flask to seperate solids from liquids (ill add byproduct solid for that soon)
-vac pump on/off: used in various recipes, needs to be on to operate
-recovery pump: required for closed loop extraction systems. similar function to a vacuum pump but can recover solvent without risk of explosion
-butane tank: used with closed loop extractors. (eventually ill add butane as an ammo source similar to "battery" (wont exist on tiles because its a gas) and then butane tanks will be able to be refilled)

-added item qualities to this PR. Whenever this one gets merged it should make parts 3-6 pass the checks.

TODO LIST: Add into item groups! Im not sure where all of the items i created should spawn so ill add that last as a part 7 when everyone is ready for the content to be merged

Testing

All items crafted and tested

adds filter paper qualitative and quantitative, tool qualities, vac pump on/off, recovery pump, butane tank
@ashGlaw
Copy link
Contributor

ashGlaw commented Feb 12, 2020

Yay butane!

@curstwist curstwist added [JSON] Changes (can be) made in JSON Items / Item Actions / Item Qualities Items and how they work and interact labels Feb 12, 2020
@NastyNate2612 NastyNate2612 changed the title extracts and concentrates pt3 extracts and concentrates pt2 Feb 14, 2020
@ZhilkinSerg ZhilkinSerg changed the base branch from master to dev March 16, 2020 12:03
@ZhilkinSerg ZhilkinSerg force-pushed the dev branch 3 times, most recently from 924f105 to 39e00e3 Compare March 18, 2020 07:00
@ZhilkinSerg ZhilkinSerg force-pushed the dev branch 3 times, most recently from ad63e77 to 8e68539 Compare April 1, 2020 12:18
@kevingranade kevingranade force-pushed the dev branch 4 times, most recently from 621a68e to b7106d0 Compare April 2, 2020 07:42
@ZhilkinSerg ZhilkinSerg force-pushed the dev branch 3 times, most recently from 0f30a43 to d432807 Compare April 2, 2020 12:55
@NastyNate2612
Copy link
Contributor Author

NastyNate2612 commented Apr 2, 2020

woohoo my contributions are getting merged! Ill probably have to change a few crafting recipes and stuff, but im ready to start working on it again. Thanks everybody for everything you do!

@ZhilkinSerg ZhilkinSerg changed the base branch from dev to master April 2, 2020 21:46
@NastyNate2612
Copy link
Contributor Author

NastyNate2612 commented Apr 14, 2020

hey so I noticed that there were a bunch of changes made to this PR that doesn't have to do with the content in here. Do i need to close out this PR and start a new one? If it wasnt for all the other changes done this PR should pass all checks at this point i believe. I could be wrong, this is my first set of PR's so im still learning how all this works.

@mlangsdorf mlangsdorf changed the title extracts and concentrates pt2 chemistry: extracts and concentrates pt2 Apr 14, 2020
@kevingranade
Copy link
Member

Rebased and pushed as 2876ece

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Items / Item Actions / Item Qualities Items and how they work and interact [JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.