John's branch!

Fixed some light errors. Ships should change colour according to armor and damage, and so should bases. Some of this has not been teste dyet due to the infamous "disappearing moves" bug... hoping this merge can fix this.