Merge branch 'master' of https://github.com/VOREStation/Polaris into sync

This commit is contained in:
Arokha Sieyes
2016-05-16 18:31:38 -04:00
48 changed files with 1304 additions and 1374 deletions
@@ -282,8 +282,7 @@
else
path = text2path("/obj/machinery/door/airlock[airlock_type]")
var/obj/machinery/door/new_airlock = new path(src.loc, src)
new_airlock.dir = src.dir
new path(src.loc, src)
qdel(src)
else
..()