Moved the you were hit message behind a check for the selfaware trait.
Merge branch 'help_fix' of https://github.com/illi-kun/Cataclysm-DDA into illi-kun-help_fix
Merge branch 'nerf-ranged' of https://github.com/macrosblackd/Cataclysm-DDA into macrosblackd-nerf-ranged
Fix for modselection tab
enable shortcuts in the 'world' menu
Fixed the ew_item_groups.json
Adds plant and insect gibs&blood-

for maximum gory fun!
Merge pull request #5962 from MisterFelixFox/survivalist-canteen

Adds an empty water canteen to the Survivalist profession
Minor correction in cata_tiles.cpp

shouldn't affect any functionality, but gotta keep it tidy
Fixes a silly typo.

Looks like somebody's hooked on phonics. FYI: that's not a good thing.
Merge pull request #5952 from Chase-san/patch-2

Increase Max Trait and Initial Points
Merge pull request #5970 from Rivet-the-Zombie/typo-fix

Fixes a silly typo.
Merge branch 'dynamic-submap-loading' of https://github.com/kevingranade/Cataclysm-DDA into kevingranade-dynamic-submap-loading

Conflicts:
	src/mod_manager.cpp

Fixes as BevapDin proposed.
Merge pull request #5944 from kevingranade/nerf-sopanls

Nerf solar panels, hard.
Merge branch 'mod_select' of https://github.com/illi-kun/Cataclysm-DDA into illi-kun-mod_select
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Merge branch 'shortcut_world' of https://github.com/illi-kun/Cataclysm-DDA into illi-kun-shortcut_world
Merge pull request #5945 from illi-kun/astyle_out

Stylish output files
Critter upgrade

Based on http://smf.cataclysmdda.com/index.php?topic=5150.0 ; handles
#5394.

Upgrades most all the zeds and some of the more hostile critters;
downgrades zed-dogs' dodge due to consistent complaints about inability
to hit 'em.

W_BLOCK might stand a bit of down-tuning, though.
Merge branch 'kevingranade-dynamic-submap-loading'