Chalice Fix

Cannot be used by outlaws/murderers now, previously the chalice
prevented all non-angeled players from using it.

Also fixed some comments, and an in-game text message, to reflect the
change.
In-Combat flag added

This adds a 2 minute In-Combat flag, separate from all other timers, for
use in future additions and changes.

The flag currently does not interact with anything else, and is not set
or used by any code yet.