Click on a puddle, get interface menu to drink directly and/or gather water into container:
http://s24.postimg.org/k3habq6l1/interface2.png
Click on player, get “eat <X>” menu (scans inventory to build list) :
http://s29.postimg.org/oglir176f/interface3.png
