all combat except disarm should work
Merge branch 'creature-rework' of github.com:CleverRaven/Cataclysm-DDA into creature-rework

Conflicts:
	src/player.cpp
	src/player.h