added SCOOP string to core
amalgamate cargo and fuel scoop slots to a single slot
New Multi Scoop equipment added, is a cargo + fuel scoop
Make the fuel_scoop capacity impact the scooping rate

While I was at it, I've differentiated the rates of the normal
fuel scoop equipment and the "all in one" equipment.
Merge branch 'Amalgamate-ship-scoops' #3267