I don't know if it has already been asked but shouldn't water be stackable? I mean I doubt that my character has to drink a whole bottle everytime he's slightly thirsty.
The "bottles" have a volume of only 0.25 L (I have drinking glasses which are twice as big), so what we need are bigger bottles.
Ran around with a clown mask before it was cool
And maybe soda drinking hats that hold bottles.