Swap Fun_Water and Collision damage types getting switched around in merge from main, set waterguns to use Fun_Water again