Missing underscores

It was KA101, in the Study, with the Missed Something In A Merge Check!
/Accusative, dammit ;-)

(Without the underscores there, it gave me the %1$s, etc in the actual
message log.  Interface bug.)
Conflict-Informer

Not the cleanest solution, but one less blocker in the world.
Bloody enums!
Updated for json compatability...
Updated to support NPC jsons
Ported hardcoded NPCs to jsons, update place_npc
Added json support for NPCs
Increases artifact armor coverage

As reported on the forums:
http://smf.cataclysmdda.com/index.php?topic=7289.msg164471#msg164471
Feature: upgrade multi cooker to faster cooking
Merge pull request #8344 from Rivet-the-Zombie/tonfa-material-fix

Removes aluminum from police tonfa.
time and battery charges depends on recipe time
oddities for hallucinations
add item to item groups
little fixes
deleted unused variable
more fun for schizophrenic
more agression to multi cooker and format json
remove unised parameter
move_cost(x,y) -> is_empty(x,y)
premonition that meal is ready soon