Fixes (at least some) of the recursive power-drain crash issues.
Species use a list for unarmed attack types
Merge pull request #7464 from Zuhayr/dev-freeze

Fixes (at least some) of the recursive power-drain crash issues.
Makes kicks and stomps their own unarmed_attack types
Comments out combi-tool, fixes infinite range combitool.
Fixes #7472
Fixes, fixes, and more fixes
Merge pull request #7476 from Zuhayr/dev-freeze

Dev-freeze tweaks.
Merge pull request #7473 from Hubblenaut/dev-freeze

Context-base Combat Cleanup and Fixes
Line ending conflict resolution.
Merge pull request #7494 from Zuhayr/dev

Dev