handle unloading to adjacent vehicle correctly

(keep remaining charges)
remove some redundant code
Merge branch 'vehicle-refill' of https://github.com/BevapDin/Cataclysm-DDA into BevapDin-vehicle-refill