Assassinate oil traps with fire traps
Merge branch 'master' into LevelGen2