From 7150e738e7587e267a9b10e97c58f57759cca9c0 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Mon, 4 Dec 2017 16:08:49 -0500 Subject: [PATCH] Update autolathe_designs.dm --- code/modules/research/designs/autolathe_designs.dm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 1c0c12a02b..3aaebe55be 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -799,16 +799,6 @@ materials = list(MAT_METAL = 300, MAT_GLASS = 200) build_path = /obj/item/device/slime_scanner category = list("initial", "Misc") -<<<<<<< HEAD -======= - -/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" @@ -817,4 +807,3 @@ materials = list(MAT_METAL = 1000) build_path = /obj/item/disk/holodisk category = list("initial", "Misc") ->>>>>>> 78fe2bc... Holorecord disks. (#32868)