shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update autolathe_designs.dm

Browse Source
This commit is contained in:
deathride58
2017-12-04 16:08:49 -05:00
committed by GitHub
parent 1cc3e33714
commit 7150e738e7
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/autolathe_designs.dm
-11
View File
@@ -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)