-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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
Initial code for improvements of the water faucet. #36315
Closed
gregoranders
wants to merge
18
commits into
CleverRaven:master
from
gregoranders:feature/beverage_from_vehiclce_tank_via_water_faucet
Closed
Initial code for improvements of the water faucet. #36315
gregoranders
wants to merge
18
commits into
CleverRaven:master
from
gregoranders:feature/beverage_from_vehiclce_tank_via_water_faucet
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
* if a water faucet is used it offers all comestible liquids contained in the vehicles tanks * if it is installed in a tile where also a hotplate is present it will heat up liquids that have the appropriate flag * if it is installed in a tile where also a freezer/fridge is present it will cool down liquids that have the appropriate flag * while heating up or cooling down it does consume energy
BevapDin
reviewed
Dec 21, 2019
It is better to avoid using |
BevapDin
reviewed
Dec 21, 2019
BevapDin
reviewed
Dec 21, 2019
BevapDin
reviewed
Dec 21, 2019
BevapDin
reviewed
Dec 21, 2019
BevapDin
reviewed
Dec 21, 2019
Co-Authored-By: BevapDin <tho_ki@gmx.de>
BevapDin
reviewed
Dec 21, 2019
BevapDin
reviewed
Dec 21, 2019
BevapDin
reviewed
Dec 21, 2019
Co-Authored-By: BevapDin <tho_ki@gmx.de>
Co-Authored-By: BevapDin <tho_ki@gmx.de>
…f github.com:gregoranders/Cataclysm-DDA into feature/beverage_from_vehiclce_tank_via_water_faucet * 'feature/beverage_from_vehiclce_tank_via_water_faucet' of github.com:gregoranders/Cataclysm-DDA: Update src/vehicle_use.cpp Update src/vehicle_use.cpp
Qrox
reviewed
Dec 21, 2019
BevapDin
reviewed
Dec 21, 2019
BevapDin
reviewed
Dec 21, 2019
Co-Authored-By: BevapDin <tho_ki@gmx.de>
…ter_faucet * master: Sort gloves and shoes into seperate files from armor.json (#36286) Humans have human skin (#36339) Replace weight ints with strings warn player before drinking water not known to be clean (#36065) Replace weight ints with strings Replace volume ints with strings Use volume strings in mods Change std::unqiue_ptr to pimpl Make copy of item to be thrown - fix throwing bugs (#36296) Update mammal.json Replace volume ints with strings for furn and ter (#36328) Remove the speed debuff when the temp is low Plural name fixes clear stashed activity on assign new and neaten up assign activities Reduce scope of variable. Add some helper functions Use std::string instead of std::ostringstream Add vitamin flags, other contents to food display change Character::change_side parameter to item_location move player::change_side to Character
…ter_faucet * master: Update Graphical Overmap mod to support buildings from some other mods (#36247) Fixed whitespace. Fix debug message in the debug mapgen menu Lower the range of dirt guns spawn with Replace weight int with string in mods Fix reversed boolean check for map memory cache
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.
Summary
SUMMARY: Content "Improvement of the water faucet"
Purpose of change
As a user I would like to be able to be offered comestible liquids when stored in tanks. (Pine Needle Tea from the Ktchen Unit)
Describe the solution
Extended the code hanlding the water faucet and the fill container mechanics.
Describe alternatives you've considered
None
Testing
Added test.
Additional context
I had the idea of turning this into a liquid dispenser item. Also I have noticed the install part mechanic does allow the installation of several of the same kind though it works different in-game....maybe one might change that.