Skip to content

Commit

Permalink
bugfix: Fixed cursed lavaland atmospheric vacuum anomaly (#4854)
Browse files Browse the repository at this point in the history
* bugfix: Fixed cursed lavaland atmospheric vacuum anomaly

* Making usage of planetary atmos NOT ASSIMILATING AIR
  • Loading branch information
Vladisvell authored Apr 11, 2024
1 parent ff03e25 commit a1c239f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions code/game/turfs/simulated.dm
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@

//////Assimilate Air//////
/turf/simulated/proc/assimilate_air(datum/gas_mixture/old_air)
if(blocks_air || !air) // We are wall
if(blocks_air || !air || planetary_atmos) // We are wall, or do not care.
return
if(old_air) // We are floor and prev(old) turf was also floor
air.copy_from(old_air) // We just transfer the old air to our new air and call it a day
Expand All @@ -145,7 +145,7 @@
if(isspaceturf(T))//Counted as no air
turf_count++//Considered a valid turf for air calcs
continue
else if(isfloorturf(T))
else if(issimulatedturf(T))
var/turf/simulated/S = T
if(S.air)//Add the air's contents to the holders
aoxy += S.air.oxygen
Expand Down
2 changes: 1 addition & 1 deletion code/game/turfs/turf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@
var/old_lighting_corner_NW = lighting_corner_NW
var/old_type = type
var/old_air
if(isfloorturf(src))
if(issimulatedturf(src))
var/turf/simulated/old_turf = src
old_air = old_turf.air

Expand Down

0 comments on commit a1c239f

Please sign in to comment.