Add attack keycode
Kill each other
Merge branch 'develop' into feature/dev-tang