Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Move final few ammo definitions to JSON.
Add tags_from_json() method to load a list of strings into a set.
Convert ammo_effects field to a tags set instead of a binary flag field.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Changed iuse and iexamine to use choose_adjacent
debugging direction changes
finished changing over getting direction inputs to choose_adjacent
Merge remote-tracking branch 'myfork/master' into choose_adjacent
Removed game argument from player::add_disease
Pickles
Try to reduce cursorx_to_position call for map window. Move cursor options after sdl window is created to prevent random segfaults.
Minor fix to waddch to avoid extra erease_utf8_by_cw call.
Directional Antenna fix
Merge code cleanups, performance enhancements, and pickles.

Conflicts:
	data/raw/item_groups.json
	data/raw/items/comestibles.json
Merge remote-tracking branch 'core/pr/1920'

Conflicts:
	data/raw/items/ammo.json