set ship type through SetShipId to include property update

fixes #2225
Merge remote-tracking branch 'johnbartholomew/issue-2225'