Toilets: Either ask to fill a bottle or drink from hands, but not both.

Does what the title says.

Early in the game, it's been an annoyance and a death for a few characters due to the random chance mistype of characters.

Later in the game it's just an annoyance to be queried if I want to drink from my hands after filling a bottle.