Weapon fix, code cleanup

Weapons now destroy enemies again. Some quick code cleanup/formatting.

TODO:
- Fix grappling bug
- Weapons and combat