Merge branch 'master' of https://github.com/PolarisSS13/Polaris into featureattack

This commit is contained in:
SinTwo
2016-06-19 22:28:31 -04:00
179 changed files with 4777 additions and 4058 deletions
-1
View File
@@ -606,7 +606,6 @@ obj/structure/cable/proc/cableColor(var/colorC)
/obj/item/stack/cable_coil/transfer_to(obj/item/stack/cable_coil/S)
if(!istype(S))
world << 1
return
..()