Merge branch '6432BleedFix' of https://github.com/frycarson/Cataclysm-DDA into frycarson-6432BleedFix
Merge branch 'prof-translations' of https://github.com/BevapDin/Cataclysm-DDA into BevapDinFixes
Merge branch 'fix-vstring-format' of https://github.com/unikmhz/Cataclysm-DDA into BevapDinFixes
Merge branch 'bugfix-popup-nowait' of https://github.com/BevapDin/Cataclysm-DDA into BevapDinFixes
Merge branch 'Atomic-ammo' of https://github.com/i2amroy/Cataclysm-DDA into i2amroy-Atomic-ammo
I hope I did this right.
Correction.
Merge branch 'alcohol' of https://github.com/9600bauds/Cataclysm-DDA into TerrainMegaMerge
Finally got around to reimplementing the (fixed) wearable RX12.
Formatting.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into TerrainMegaMerge
Hopefully-final fixups

More syntax/grammar & catch a commit that came late.
Merge branch 'BionicsMenuFadesTargeting' of https://github.com/frycarson/Cataclysm-DDA into frycarson-BionicsMenuFadesTargeting
Re-secures Lab and Bunker doors

Hadn't realized that the metal doors were only used with card readers.
This removes my expanding them.  :-/
Melee weapons can take wear and tear damage based on their primary material.

They still don't lose their effectiveness when damaged, but that comes
next.
Some math tweaks.
Changes to vending machine prices
Balance bulter profession

Dropped the point req by one, added a few points in driving/tailoring.
Should bring it in line with most other professions.
Add some encapsulation to cata_tiles.

Made most functions and all members protected.
Only the functions called from outside are still public.
Added inline wrapper to access some members.
Move releasing loaded tile data into separate clear function