Fix complete_vehicle
c/p error fixed
More fixes.
Change some vehicles to use diesel engines.
Merge branch 'diesel_engines' of github.com:desrik/Cataclysm-DDA into diesel_engines

Conflicts:
	data/json/items/ammo.json
	data/json/vehicle_parts.json
Fix diesel pump spawn.
Changed windchill model
No electricity no honking
Hotel spawn fix
Hotel blankets/pillows spawn
Fix
Hotel spawn fix 2
Fixed windchill model
Properly added a weather debug item
Merge branch 'torchfix' of https://github.com/Mshock777/Cataclysm-DDA into merge3
Merge branch 'hide-glue' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge3
Merge branch 'vehicle-fix-horn' of https://github.com/drbig/Cataclysm-DDA into merge3
Merge branch 'hotelfix' of https://github.com/Mshock777/Cataclysm-DDA into merge3
Merge pull request #9589 from Rivet-the-Zombie/hide-glue

Adds leather to superglue ingredient choices.
Fixed some bad copy/pasted code.