Tatami flag fix
Mat bashing fix
Increase chance of gas stations spawning outside of towns
Merge branch 'mat-fix' of https://github.com/Mshock777/Cataclysm-DDA into merge3
Merge branch 'gas_station_fix' of https://github.com/vache/Cataclysm-DDA into merge3
Merge branch 'master' into diaperfur