The combat system is now generic enough for the player to be hurt in the same way enemies are. But flexible enough to have states added to both in the future (like bleeding, sickness, stun) still needs a little bit of work though, im not 100% sure how i want to do stat based damage progression, and how i want the weapons themselves to effect the damage. But at least the bones are there now.
The actives and guns now live in the dev room.