…hicle_on_vehicle

Conflicts:
	src/map.cpp
	src/veh_type.h
	src/veh_typedef.cpp
	src/vehicle.cpp