Added shift-clicking back in for water staff. Without it picking up water is impossible.