merge changes for smash (Brutal Smash) from brandonjreid's PR https://github.com/HabitRPG/habitrpg-shared/pull/331