Move input check to start of weather animation to bypass it if there's immediate input.
Reset ammunition types when unloading a world.
Fix member name from which the faction description is read from saves.
Wide sidebar: make the message log go down to the bottom of the screen.

This occupies the previously unused space and erases / redraws it when the sidebar is redrawn.
The window w_hp goes also down to the same line as w_mesages, so it occupies and erases the space between the messages window and the terrain window.
Avoid flickering with wide sidebar:

Don't erase nor refresh the unused w_status2 window. Nothing is drawn to it anyway.
Buff metal doors
MShock's v0.32

modern_tanner
down_blanket
can_tomato
corndogs_cooked
corndogs_frozen
leather_funnel
rm451_flamethrower
badge_marshal
badge_detective
tin
bismuth
gold_small
new incendiary
bolt_explosive
diesel
brew_vinegar
harvested bushes and trees
t_diesel_pump
mon_fish_whitefish
thinner cig smoke
fixed yellow/purple carpets
fixed bondage suit/mask
fixed vp_wheel_armor not rotating
returned mask_dust, heatpack
Merge branch 'faction-descriptions' of https://github.com/BevapDin/Cataclysm-DDA into merge2
Merge branch 'squash-and-terminate-the-bug' of https://github.com/BevapDin/Cataclysm-DDA into merge2
Adjustment #1
Blanket coverage, suitcase warmth fix
Fix
Merge branch 'door-buff' of https://github.com/John-Candlebury/Cataclysm-DDA into merge3
Merge branch 'tileset' of https://github.com/Mshock777/Cataclysm-DDA into merge3
Slightly nerfs pine nuts.

So as not to be such an overwhelmingly abundant resource.
Merge branch 'pine-nuts-nerf' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge3
Faster Survival Marker Recipe

Changes Survival Marker recipe from 50 minutes to 3 minutes.
Weight fix for some liquid
Merge branch 'master' of https://github.com/ArikVhedrovix/Cataclysm-DDA into merge3
Batch crafting time fix for human jerky.

To make it match normal jerky.