Readded the crafting to tables

Well at least now i can brag about how you can do this with just few
lines

Conflicts:
	code/game/objects/structures/tables_racks.dm
This commit is contained in:
Razharas
2014-04-28 22:44:00 +04:00
committed by ZomgPonies
parent 61359f74af
commit 3d762cd892
2 changed files with 12 additions and 5 deletions
+4 -4
View File
@@ -25,7 +25,7 @@ var/global/datum/crafting_controller/crafting_master = new()
reqs = list(/obj/item/weapon/handcuffs/cable = 1,
/obj/item/stack/cable_coil = 1,
/obj/item/device/assembly/igniter = 1,
/obj/item/weapon/reagent_containers/food/drinks/soda_cans = 1,
/obj/item/weapon/reagent_containers/food/drinks/cans = 1,
/datum/reagent/fuel = 10)
time = 80
@@ -35,9 +35,9 @@ var/global/datum/crafting_controller/crafting_master = new()
reqs = list(/obj/item/weapon/handcuffs/cable = 1,
/obj/item/stack/rods = 1,
/obj/item/weapon/wirecutters = 1,
/obj/item/weapon/stock_parts/cell = 1)
/obj/item/weapon/cell = 1)
time = 80
parts = list(/obj/item/weapon/stock_parts/cell = 1)
parts = list(/obj/item/weapon/cell = 1)
/datum/crafting_recipe/ed209
name = "ED209"
@@ -50,7 +50,7 @@ var/global/datum/crafting_controller/crafting_master = new()
/obj/item/stack/sheet/metal = 5,
/obj/item/stack/cable_coil = 5,
/obj/item/weapon/gun/energy/taser = 1,
/obj/item/weapon/stock_parts/cell = 1,
/obj/item/weapon/cell = 1,
/obj/item/device/assembly/prox_sensor = 1,
/obj/item/robot_parts/r_arm = 1)
tools = list(/obj/item/weapon/weldingtool, /obj/item/weapon/screwdriver)
+8 -1
View File
@@ -39,16 +39,23 @@
update_icon()
update_adjacent()
craft_holder = new craft_holder()
craft_holder.recipes = crafting_master.all_crafting_recipes
/obj/structure/table/Destroy()
update_adjacent()
..()
/obj/structure/table/proc/destroy()
new parts(loc)
density = 0
qdel(src)
/obj/structure/table/MouseDrop(atom/over)
if(usr.stat || usr.lying || !Adjacent(usr) || (over != usr))
return
craft_holder.interact(usr)
/obj/structure/table/update_icon()
if(flipped)
var/type = 0