CitizenCode-temp/flaming-adventure — pull request #22 by ksnavely (2014-08-24 00:30:06+00:00)
Title: 21 combat fix

See commit messages.