Siphoning no longer causes an infinite loop

Fixes #2624 and #2039, though a more broad-reaching fix is being worked on in #2625.

Also uses the vehicle's actual name in the siphon message instead of "the vehicle".