Merge branch 'master' into upstream-merge-32249

2017-12-04 23:15:38 +00:00
parent 7e1bd55f7c 858a9bf428
commit 379f73d1e1
112 changed files with 1764 additions and 717 deletions
@@ -799,3 +799,19 @@
 	materials = list(MAT_METAL = 300, MAT_GLASS = 200)
 	build_path = /obj/item/device/slime_scanner
 	category = list("initial", "Misc")
+
+/datum/design/miniature_power_cell
+	name = "Light Fixture Battery"
+	id = "miniature_power_cell"
+	build_type = AUTOLATHE
+	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")