All Rust commits from Facepunch
Tweaked two values to stop clipping issues we're seeing with the cannon