Merge Main->Submarine. Also fixed "salt water" ui appearing + don't allow player to drink the sea water while mounted in a submarine.