All Rust commits from Facepunch
Fix skinnable matching accidentally including null EntityPrefab matches (base barrel and base shelf)