Add a sanity check that items vehicle parts disentegrate into exist.
Fix a typo making alarm parts not break apart correctly.
Random style fix.
Fix retrieval of 'best' dispersion for a weapon.
Return number of lines used for instructions from draw_targeting_window().
Manually manage lifetime of w_target to avoid flickering.
Use number of instruction lines to determine how much space the rest of the targeting window has available.
Extend the height of the aim window so most monster descriptions will fit.
Re enable feature where switching targets loses your aim bonus.
Add helper to look up monster index in game::target(), and incidentally fix next/prev monster.
Fix input_context::keys_bound_to() to only return printable characters.
Display actual bound keys in aiming menu.
Category fix for fancy baton.
Make sure non-ASCII characters are excluded from single-character return of keys_bound_to().
Added saline solution as alternative crafting component to salt water wherever applicable - using the existing precedent of 5:1 equivalence from the medsandchemicals recipes.
Merge branch 'fix-alarm-breakage' of https://github.com/kevingranade/Cataclysm-DDA into merge
Merge branch 'aim-menu-tweaks' of https://github.com/kevingranade/Cataclysm-DDA into merge
Merge branch 'baton' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge
Merge branch 'saline4saltwater_recipes' of https://github.com/pipehat/Cataclysm-DDA into merge
Merge branch 'master' into diaperfur