River edge tweak
Merge branch 'master' into overmap_tweaks
Change draw_overmap to use tripoint.  Allows debug teleport across z levels
Transition to use overmapbuffer in overmap::open, fails
Further testing
Modify overmap::open to use overmapbuffer, fix road connections
Fixed several overmap special placement bugs.  Roads align (mostly), buildings rotate correctly, no more gas stations on bridges
Fix overmap buffer infinite loops for 0,0 overmap
Fix apartment rotation problem
Merge branch 'master' into misc_fixes
Move terrain & player filenames to overmapbuffer, solve some road connection issues
Fixes the prices of a few shoes.
Merge remote-tracking branch 'dda/pr/7630' into dda-master

* dda/pr/7630:
  Move terrain & player filenames to overmapbuffer, solve some road connection issues
  Fix apartment rotation problem
  Fix overmap buffer infinite loops for 0,0 overmap
  Fixed several overmap special placement bugs.  Roads align (mostly), buildings rotate correctly, no more gas stations on bridges
  Modify overmap::open to use overmapbuffer, fix road connections
  Further testing
  Transition to use overmapbuffer in overmap::open, fails
  Change draw_overmap to use tripoint.  Allows debug teleport across z levels
  River edge tweak
fix to disable dropping of bionic weapons
Sneaker price.
Merge pull request #7638 from Rivet-the-Zombie/still-more-fixes

Fixes the prices of a few shoes.
Merge remote-tracking branch 'dda/pr/7639' into dda-master

* dda/pr/7639:
  fix to disable dropping of bionic weapons
More price fixes.
Merge pull request #7645 from Rivet-the-Zombie/more-prices

More price fixes.