fixes conflicts, adds the ability to remove the crystal from the prod via using it when no cell is attached

This commit is contained in:
PKPenguin321
2015-11-26 18:28:12 -08:00
parent 7e640d3463
commit cf29721672
2 changed files with 18 additions and 4 deletions
+1 -1
View File
@@ -76,7 +76,7 @@
/obj/item/stack/rods = 1,
/obj/item/weapon/wirecutters = 1,
/obj/item/weapon/stock_parts/cell = 1,
/obj/item/bluespace_crystal = 1)
/obj/item/weapon/ore/bluespace_crystal = 1)
time = 80
parts = list(/obj/item/weapon/stock_parts/cell = 1)
category = CAT_WEAPON