Skip to content

Commit

Permalink
Merge pull request Baystation12#3352 from Mloc/zasfixes
Browse files Browse the repository at this point in the history
ZAS fix.  It should now be possible to repair breaches without admin int...
  • Loading branch information
MistakeNot4892 committed Jul 25, 2013
2 parents 4a0ebb4 + d02d50d commit 8124f7b
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions code/ZAS/ZAS_Zones.dm
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,12 @@ var/list/CounterDoorDirections = list(SOUTH,EAST) //Which directions doors turfs

/zone/proc/RemoveTurf(turf/T)
//Same, but in reverse.
if(istype(T, /turf/simulated))
if(istype(T, /turf/simulated) && T in unsimulated_tiles) //It happens. Gods know why.
unsimulated_tiles -= T
if(!unsimulated_tiles.len)
unsimulated_tiles = null
src.AddTurf(T) //Make sure it gets onto the simulated list.
else if(istype(T, /turf/simulated))
if(!(T in contents))
return
contents -= T
Expand Down Expand Up @@ -160,11 +165,10 @@ var/list/CounterDoorDirections = list(SOUTH,EAST) //Which directions doors turfs
progress = "problem with: ShareSpace()"


if(unsimulated_tiles)
if(locate(/turf/simulated) in unsimulated_tiles)
for(var/turf/simulated/T in unsimulated_tiles)
RemoveTurf(T)
if(unsimulated_tiles)
if(unsimulated_tiles && length(unsimulated_tiles))
for(var/turf/simulated/T in unsimulated_tiles)
RemoveTurf(T)
if(unsimulated_tiles && length(unsimulated_tiles))
var/moved_air = ShareSpace(air,unsimulated_tiles)

if(moved_air > vsc.airflow_lightest_pressure)
Expand Down

0 comments on commit 8124f7b

Please sign in to comment.