Merge branch 'master' into work

* master:
  else*
  weapons that don't work on land
  fix reorder, remove unused variables from Globe
  use different sprite sheet for underwater bullets
  adjust bubbles when aiming.
  add ambient sound effects to battlescape
  get sound by depth
  allow selective definition of internal sound catalogs
Update Xcode project
Merge branch 'work' into craft_kill_credits

* work:
  Update Xcode project