Combat messages fix

Fixes a fair bit of combat messages to work properly.
Re-adds the "bounced off armor" message for when players are attacked.