Merge pull request #7645 from Rivet-the-Zombie/more-prices

More price fixes.
Merge remote-tracking branch 'CleverRaven/master' into FrankenMod
Merge branch 'fix-hallucination-crash' of https://github.com/BevapDin/Cataclysm-DDA into merge
Merge branch 'fix-debugmsg' of https://github.com/BevapDin/Cataclysm-DDA into merge
Merge remote-tracking branch 'dda/pr/7646' into dda-master

* dda/pr/7646:
  Search for item type in itypes when not found in Item_factory::m_templates because newly created artifacts add their itype only to itypes and not to Item_factory::m_templates.
Merge remote-tracking branch 'CleverRaven/master' into FrankenMod
Extract artifact type handling into artifact.cpp.
Move as much artifact definition code into artifact.cpp as possible.
Merge remote-tracking branch 'kevingranade/more_item_cleanup' into FrankenMod

Conflicts:
	src/item.cpp