Allow frigates to trade - #1989

Not pushing this to `release` until we iron out #1999 at the very least.
Fixes #1999 - Don't crash on special unloading and loading combinations