Merge branch 'martial_arts' of https://github.com/swwu/Cataclysm-DDA into martial_arts
Added ear plugs and noise cancelling headgear
Prevent active explosives exploding immediately when activated.
More robust json string extraction, and per-locale name lists.
Adds onboard vehicle chemistry set.
Improve implementation by reducing the number of rand calls and if-statements.
Disable scent debug again.
Changes behavior.
Merge branch 'pr/4704'
Revert "Merge branch 'pr/4704'"

This reverts commit dc9e3408ff32d5980c6ec267d7694948c2459eef, reversing
changes made to 946b9c3fd10d6aa72883720d1feed54fe6066922.
Refixed and numbers optimized

Brian's probably saved this a fair few days.  Much appreciated.

The original objective is good to go, and if @glyphgryph is OK with it,
I think I can have some of these rez'd without too much trouble.  Let me
know.
Update the .pot file.
Adds ammo (which I stupidly forgot)
Fixes
Add all the translated names.
Merge launchpad translations.
Fix double implicit cast condition in u.skillLevel usage.

MSVC++ doesn't allow this so the compile fails (and probably generates stern warnings on other compilers too).
Stop absorbing scent from closed doors.  This creates a loop that will
increase smell infinitely on the opposite side of a door.  Ironically, a
player in the room resets their square to their own smell and prevents the
infinite loop.  But anyway.  This is bad.  We will now correctly ignore
closed doors and therefore calculate squares_used accurately.  Note: Smell
still lingers forever, it just doesn't increase.
rename mapgen: { type: (builtin|lua|json), ..} from type to method, due to clash with convention
mapgen_json: 'set' array of abstracted functions which are one of:
"terrain", "furniture", "trap", "radiation" and correspond to map::set_.. functions,
with optional randomization of coordinates, chance (one_in ...), and repeat values