merge Push and Damage
fix shred colors
Merge branch 'master' into push_is_damage
fix bugs
fix swimming bug
adamantine dwarf
fix load falling bug