Add water source long actions

Supplants #9760.

This adds two new long actions, one for filling containers from normal water sources and one from salt water sources. Water is added at a rate of 3 charges per turn and is cancelable just like any other long action.
Breaking everything apparently. : /

This was originally just a quick fix that I cooked while rater tired. I noticed some of the other activities cleared the various activity values, and some didn't, which seemed horribly inconsistent. Being as tired as I was I probably assumed that this was a good place to ensure that activity values from one activity didn't interfere with others. Wipe these lines if they are causing problems, but I'm a little busy with something else now that the weekend is done so I can't PR it up right now.