Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

# Conflicts:
#	vorestation.dme
This commit is contained in:
Arokha Sieyes
2016-06-07 18:37:47 -04:00
193 changed files with 3373 additions and 1913 deletions
+1 -1
View File
@@ -39,7 +39,7 @@
var/need_update_field = 0
var/need_player_check = 0
/obj/machinery/mining/drill/map/New()
/obj/machinery/mining/drill/New()
..()
circuit = new circuit(src)