I was kind of hoping the waterskins would function this way to be more useful than regular water bottles.

I've found what I think is a pretty decent way of implementing this, so it will be part of 2.4-b04c