Made overmap file independent of the game mode.
Light wooden frame, travois, storage rebalance
tweak
Fix healing wound killing the player
the more you know
Only allow pulling items with the electromagnetic CBM if the player could pick them up.
Disallow pulling items out of sealed containers with electromagnetic CBM.
Use moves when triggering electrmagnetic CBM.
Restore some volume to canvas sacks.
Merge branch 'Infected-error' of https://github.com/i2amroy/Cataclysm-DDA into merge2
Merge branch 'nerf-electromagnet' of https://github.com/kevingranade/Cataclysm-DDA into merge2
Merge branch 'canvas-sacks-have-volume' of https://github.com/kevingranade/Cataclysm-DDA into merge2
Removed repeated code.

Also corrected a comment.
Peepholes now handled for boarding & damage.  Not compatible with reinforcing.
Merge pull request #9436 from KA101/cross-check

Peepholes now handled for boarding & damage
Fix Python extractor
Update .pot file
Merge pull request #9438 from VlasovVitaly/pot-update

Translations template update
seasonal harvesting from trees and shrubs
unified the tree & shrub harvest functions
revert