Please read this first! This mod is for survival players only.
If you are not playing on survival and not planning to, just stop reading this any further.

The system of water consumption introduced by a long awaited survival was flawed to say the least. The idea of collecting dirty bottles of unknown origin bugged me ever since. First I need to find an empty bottle. Who knows what was in that bottle after so many years? Shouldn't I get... well I don't know... Ebola by just drinking from such container? Then it gets even more interesting. After filling this unholy vessel with either clean or dirty water - pufff! It transforms into a sealed prewar emergency water supply can or a dirty paper bag, probably filled with someone's urine judging from the looks of it. And I need to cook using this shit, you know... No more!

• Get a flask and fill it with a clean (or if you are one of those nut jobs a dirty) water and drink from it up to 10 times before you'll have to refill it.
• Cook using only clean water, produced by your settlement or taken from a water pump or another clean water source.
• Forget you ever had to collect all those bottles or cook using radioactive waste.
  

There are totally five types of water now.

• Emergency water supply. Previously known as purified water. You can still find it around Commonwealth, though the chance of looting it was drastically decreased. Also vendors should no longer sell this type of water. The idea behind this is that it's meant to be a rare type of water, taken it was produced more than 200 years ago. Though there is nothing special about it. As before you can drink it.
• Institute canned water. No change here. It is a rare type of water already and can only be found at the Institute. Obviously. Naturally you can drink it as well.
• Dirty water. Can be looted at a wide range of places. Pretty much as before. If you are an idiot, you could probably drink this one too.
• Clean water. A new type of water meant to replace purified water. This type of water will be produced by your settlements and it is one of the main ingredients for a number of meals. You could also fetch some at any water pump if you have an empty water bottle in your inventory. You can craft empty bottles for water and get them back after consuming this type of water. No more vanishing water containers either.
• Distilled water. Used to create chems and poisons. Could be produced at chem stations or bought from vendors. You could probably drink this one too, if there is nothing better around. This type of water can be produced from any type of water mentioned above.
  

Now this may seem like too much water types to you. But in fact you can completely ignore a dirty water and an institute water. You will have almost no use for the first and you will not encounter the second anywhere, but at the institute. That also doesn't mean all you supply of purified water will be rendered useless by this. You will be able to drink it, sell it or convert it into a clean water for cooking. Same goes for the institute canned water.

Flask is a key element of this mod. Its weight will be adjusted each time you'll take a sip from it. From 3.1 for a full flask to 0.1 for an empty one. It can always be refilled with a clean water, no matter how much water left in it. If you have a flask with any amount of dirty water, it will be replaced with a fully filled by a clean water. Presumably you are emptying it from a dirty water before refilling it with a clean water. So don't bother me about this in the comments please. You can fill your flask with a dirty water only if it's fully empty. You can't fill it if there is at least one "use" left in it. This was made on purpose, so you wouldn't fill your flask with waste by mistake. There is no quick save feature after all and this could waste you hours of your gameplay or at least spoil your mood. Taken that you are not cheating on survival by using console or mods that allow you to override saves limitation. ;)
Flask can be crafted at chem station or you could find one near the Vault 111 entrance.

This mod also changes a few recipes to use cooking oil instead of oil. No more cooking from a lube. Especially makes sence in conjuction with Better Cooking Stations, since it ads like 10 recipes for making cooking oil. But for some reason you still had to use lube for cooking. Patch for this mod is included naturally. Technically this is not a water related thing, but since I've started to alter cooking recipes and since this small alteration is not worth making an independent mod for, it was included here. This alteration is also present in a base mod. So even if you don't want to use Better Cooking Stations, you will still have to cook with a proper oil type from now on.

Just for the sake of realism and consistency drinking dirty water will reward you with an empty water carton so you could refill it with dirty water. Mind that crafting wont return you any water containers. This is due to the game mechanics and if there is a way to escape this I have knowledge about it. At least not without using more unnecessary scripts.

The 3D models of flask and water bottle is all I could came up with for a moment. If you can kindly provide me with any better alternatives I will gladly use them.

Known Limitations
Due to the nature of this mod mechanics it is impossible to assign flask to hotkey. Shouldn't be an issue anyway.

Compatibility
Anything that edits HC_Manager quest is not compatible. Not without patch anyway. Anything making edits to cooking recipes is not compatible.

Enjoy, if you like it. Ignore its existence, if you don't.