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