Made wheel widths more consistent. Made wheel widths less than 4 not require a jack to remove.
Added nojack flag
Changed bool check for nojack flag
Make wheels not use welding charges if no hacksaw
ar15 description update

Since the commit removing the AR-15's burst fire ability it is no longer an assault rifle.
Merge pull request #10544 from SpongeTheGlaive/ar15-description

AR-15 description update
Merge remote-tracking branch 'origin/master' into wheelJack
Made no jack same as is wrenchable for removal. Made is wrenchable
higher priority over is wheel.
Made smaller wheels wrenchable
Gives SWAT armor a slight boost.

It's uncraftable and quite encumbering, and research indicates that SWAT
armor is typically NIJ level III or higher.
Merge branch 'swatboost' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge3
Adds 4 environmental protection to the SWAT armor.
Slight steel-toe boots nerf.

This leaves them with double the protection of vanilla 'boots', but
makes them slightly less superior to, well, EVERYTHING like they were
before.
Merge pull request #10558 from Rivet-the-Zombie/booties

Slight steel-toe boots nerf.