Set ship type through SetShipId to include property update

Fixes #2225