Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev

This commit is contained in:
Ccomp5950
2014-01-24 20:38:29 -06:00
+3
View File
@@ -169,6 +169,9 @@
T = locate(src.x, src.y, controler.down_target)
if(T)
. += power_list(T, src, 12, 1)
else if(!d1)
if(T)
. += power_list(T, src, d1, 1)
if(d2 == 11 || d2 == 12)
var/turf/controlerlocation = locate(1, 1, z)