Diesel

Rework of #7151

TODO:
Fix currently non-working diesel pumps.