Merge branch 'master' of github.com:Baystation12/Baystation12

This commit is contained in:
cib
2012-02-24 10:37:25 -08:00
3 changed files with 9 additions and 4 deletions
@@ -24,6 +24,9 @@
if(!loc) // Fixing a null error that occurs when the mob isn't found in the world -- TLE
return
if(stat == 2)
return
life_tick++
var/datum/gas_mixture/environment = loc.return_air()