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
Adjustment #1
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.
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.
Gives HAMMER1 to steel chunk.
Autolearn fix for long underwear bottom.

These aren't that hard and the top is autolearn already.
Merge pull request #9924 from Rivet-the-Zombie/autolearn-fix

Autolearn fix for long underwear bottom.
Batch time tweak for boiling off salt.

To make it match boiling other water.
Time fix for boiled egg recipe
Merge branch 'chunkhammer' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge4
Merge branch 'saltbatch-fix' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge4
Merge branch 'egg-fix' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge4
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Salty fishes too!