contact lenses->effects, removed unused disease enums
boomered->effects
Updated CMakeLists.txt

Need it for generating a compilation database, for use with YouCompleteMe etc.
More grid access refactors.

Yup, I overlooked some in mapgen.cpp
Move player designated zones into player class/their own files.

What was this doing in map.h?
Safely erase savegame entries when they're inaccessable in shared mode.
Adds locked gates to hacksaw target list

Fixes #8168, thanks BevapDin for the pointer.
Restores shock_staff damage

it's an upgraded ironshod, not an upgraded wooden one, so per the forums
its damages should be higher.

http://smf.cataclysmdda.com/index.php?topic=7221.msg161104#msg161104
(CR) Clothing upgrade

Seeing as we're asking folks to start in mid-March 20-50F, rather than
65F, I think it's only fair we let 'em evac with a bit warmer gear.

The Generic Survivor gets a light jacket, and everyone who doesn't have
a clear reason NOT to have socks gets a pair.  (It's truly amazing how
many folks didn't have socks!)

This is open to discussion and changes; for instance, I could agree with
issuing a sweatshirt instead of the T-shirt & jacket combo.  Let's talk!
fix JSON

Thanks for the catch, Rivet.
Fix ghost options in SDL build
Removed ghost options on any build
fix joystick description
Merge branch 'master' into effects-migration
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA

Conflicts:
	src/clzones.cpp

Weird place for a conflict, but wev
Merge branch 'fix-options-again' of https://github.com/VlasovVitaly/Cataclysm-DDA into merge
Merge branch 'effects-migration' of https://github.com/swwu/Cataclysm-DDA into merge