Battleship changes

Hopefully fix for server crash - it still hates the emmo system and an
attempt to workaround.