Merge pull request #7518 from Rivet-the-Zombie/more-price-fixes

Fixes cigarette pricing.
Merge pull request #7521 from Rivet-the-Zombie/juice-recipe-fix

Fruit juice recipe fix.
Merge branch 'more-input-contetxt' of https://github.com/BevapDin/Cataclysm-DDA into merge
Merge branch 'fix-6758' of https://github.com/BevapDin/Cataclysm-DDA into merge
Removed unused mapbuffer dirty/clean distinction.
Trim some unnecessary includes.
Nuke a chunk of dead code.
When saving, discard map data outside the active map to conserve memory and make shared maps more consistent.
Merge remote-tracking branch 'kevingranade/trim-saves' into FrankenMod

Conflicts:
	src/game.cpp
	src/game.h