Fixes #5459
Fixes shuttle being late AFTER it arrives
Shuttle now can only be late when arriving
Merge pull request #5507 from mwerezak/supply-shuttle-fix

Supply shuttle fixes