Merge branch 'master' into upstream-merge-33213

2017-12-04 21:39:30 +00:00
parent 84fe88153e 6c01835eec
commit 64aadb868e
51 changed files with 982 additions and 271 deletions
@@ -807,3 +807,11 @@
 	materials = list(MAT_GLASS = 20)
 	build_path = /obj/item/stock_parts/cell/emergency_light
 	category = list("initial", "Electronics")
+
+/datum/design/holodisk
+	name = "Holodisk"
+	id = "holodisk"
+	build_type = AUTOLATHE
+	materials = list(MAT_METAL = 1000)
+	build_path = /obj/item/disk/holodisk
+	category = list("initial", "Misc")