added ability to attack with mug
fixed merge conflicts