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

2017-06-08 03:33:56 -05:00
parent d53044aa10 ad97147dfe
commit 3563459d15
251 changed files with 4967 additions and 9496 deletions
@@ -12,6 +12,7 @@
 	origin_tech = "materials=1"
 	var/turf_type = null
 	var/mineralType = null
+	novariants = TRUE

 /obj/item/stack/tile/Initialize(mapload, amount)
 	. = ..()