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

Waterworks Port & Water Tweaks #2205

Closed
wants to merge 21 commits into from

Conversation

goober3
Copy link
Member

@goober3 goober3 commented Jul 28, 2023

About The Pull Request

ports tgstation/tgstation#52865 (barring plumbing-enabled hydroponics)

and associated tweaks & fixes
tgstation/tgstation#53279
tgstation/tgstation#53377
tgstation/tgstation#54236
tgstation/tgstation#55895
tgstation/tgstation#53311

water can now be scooped from water tiles again (this was commented out in #1900)
water scooped from unpotable sources must be treated via boiling to become safe to drink.

Why It's Good For The Game

image
punished for his sins.

Changelog

🆑 ArcaneMusic, TemporalOroboros, Jack7D1, ported by goober3
add: sinks & showers are now compatible with plumbing, and have an internal water supply.
add: metal sheets can be used on reagent tanks to convert them into a plumbing-enabled tank.
add: water recyclers are now used to construct sinks & showers. print them at an autolathe.
fix: water can be sourced from water tiles again.
tweak: water from unpotable sources must be treated via boiling to become safe to drink.
/:cl:

@github-actions github-actions bot added Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Jul 28, 2023
@github-actions github-actions bot added the Map Change Tile placing is hard. Thank you for your service. label Jul 28, 2023
@goober3
Copy link
Member Author

goober3 commented Jul 28, 2023

i'll finish the rest of this tomorrow.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Aug 1, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Aug 1, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Aug 1, 2023
soundloop = new(list(src), FALSE)

AddComponent(/datum/component/plumbing/simple_demand)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not a big fan of the plumbing integration, as discussed. It doesn't fit very well on shiptest. The other changes are fine; if they're isolated I think the PR will be fine.

@github-actions
Copy link
Contributor

github-actions bot commented Aug 5, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added Merge Conflict Use Git Hooks, you're welcome. and removed Merge Conflict Use Git Hooks, you're welcome. labels Aug 5, 2023
@goober3
Copy link
Member Author

goober3 commented Aug 17, 2023

may perhaps potentially redo this in another form!! without plumbing. we'll see

@goober3 goober3 closed this Aug 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants