readded onhit effects
more onhit changes
readded on-hit effects
grabbing fixed
deleted some commented code
Merge branch 'onhit' of https://github.com/C0DEHERO/Cataclysm-DDA into C0DEHERO-onhit
Detail-checks

Neither's much better, but it's working.
Merge remote-tracking branch 'origin/master'