Merge branch 'master' into changelog-memes

This commit is contained in:
Poojawa
2018-09-11 07:52:59 -05:00
committed by GitHub
9 changed files with 1128 additions and 1088 deletions

View File

@@ -14,7 +14,11 @@
SSair.remove_from_active(T)
for(var/turf/open/T in map)
if(T.air)
T.air.copy_from_turf(T)
if(T.initial_gas_mix)
T.air.parse_gas_string(T.initial_gas_mix)
T.temperature = T.air.temperature
else
T.air.copy_from_turf(T)
SSair.add_to_active(T)
/datum/mapGeneratorModule/bottomLayer/massdelete