Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

2018-01-01 14:09:07 -06:00
parent 32291c247b c2fb9ed729
commit 30d4b25aee
180 changed files with 2769 additions and 4332 deletions
@@ -465,7 +465,7 @@
 		var/turf/T1 = L1[i]
 		if(!T1)
 			continue
-		if(T0.type != T0.baseturf)
+		if(T0.type != T0.baseturfs)
 			ripple_turfs += T1

 	return ripple_turfs