Removed marloss gelatin recipe.
Re-added HMG.
Merge branch 'Fix' of https://github.com/Mshock777/Cataclysm-DDA into merge2
Merge branch 'fix-aim' of https://github.com/BevapDin/Cataclysm-DDA into merge2
Merge branch 'fix-the-monster-on-death-code' of https://github.com/BevapDin/Cataclysm-DDA into merge2
Merge branch 'fix-newchar-header' of https://github.com/VlasovVitaly/Cataclysm-DDA into merge2
Merge branch 'WinterIsComing' of https://github.com/Robik81/Cataclysm-DDA into merge2
Merge branch 'fishing-content' of https://github.com/jcd000/Cataclysm-DDA into merge2
Merge branch 'locked-in-lab-muts-available' of https://github.com/canlo/Cataclysm-DDA into merge2
Have smash attack cost moves, derp.
Merge branch 'refrigerating-labs' of https://github.com/Kodiologist/Cataclysm-DDA into merge2
Adds sandbag walls and half-walls.

Constructed in situ, these use the construction menu to produce.
Prevents people from dragging around toilets, sinks, showers, bathtubs, etc.
Derp.
Merge branch 'sandbags' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge2
furn_set
Stupid Git, saving changes I don't want.
Herp derp.
Merge branch 'sandbags' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge2
Add a check for cargo component damage level to prevent loading items into broken vehicle parts.