All Rust commits from Facepunch
Fixed farm access guard not actually taking scrap, S2P both cities (no scene changes)