cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2981 from SkyMarshal/zas-cleanup

Browse Source 
Runtime fix.
This commit is contained in:
Chinsky
2013-06-05 14:54:32 -07:00
parent 1425b6d440 50735caf29
commit e22156aa8c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/ZAS/Functions.dm
View File

@@ -110,7 +110,10 @@ proc/ZMerge(zone/A,zone/B)
C.Cleanup()
//Add space tiles.
A.unsimulated_tiles |= B.unsimulated_tiles
if(A.unsimulated_tiles && B.unsimulated_tiles)
A.unsimulated_tiles |= B.unsimulated_tiles
else if (B.unsimulated_tiles)
A.unsimulated_tiles = B.unsimulated_tiles
//Add contents.
A.contents = new_contents
@@ -150,4 +153,4 @@ proc/ZConnect(turf/simulated/A,turf/simulated/B)
return
//Make the connection.
new /connection(A,B)
new /connection(A,B)