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

Merged master into BEF.

Browse Source 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
This commit is contained in:
Mloc-Argent
2013-05-06 15:43:50 +01:00
parent c33af034d0 ba8a159c22
commit 27759f47df
41 changed files with 271 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/ZAS/Debug.dm
View File

@@ -14,7 +14,7 @@ client/proc/Zone_Info(turf/T as null|turf)
client/proc/Test_ZAS_Connection(var/turf/simulated/T as turf)
client/verb/Test_ZAS_Connection(var/turf/simulated/T as turf)
set category = "Debug"
if(!istype(T))
return

2
code/ZAS/Functions.dm
View File

@@ -127,6 +127,8 @@ proc/ZConnect(turf/simulated/A,turf/simulated/B)
if(!A.zone || !B.zone) return
if(A.zone == B.zone) return
if(!A.CanPass(null,B,0,0)) return
if(A.CanPass(null,B,0,1))
return ZMerge(A.zone,B.zone)