From 69ece3d12e13ba5850ccb69afbe0c98744199851 Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Tue, 21 Feb 2017 02:19:00 -0800 Subject: [PATCH] Makes autolathe hacking work again --- code/datums/wires/autolathe.dm | 7 +------ code/game/machinery/autolathe.dm | 8 ++++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/code/datums/wires/autolathe.dm b/code/datums/wires/autolathe.dm index 77a8ce6c03c..011c2f9dc90 100644 --- a/code/datums/wires/autolathe.dm +++ b/code/datums/wires/autolathe.dm @@ -18,11 +18,6 @@ var/const/AUTOLATHE_DISABLE_WIRE = 4 return 1 return 0 -/datum/wires/autolathe/Interact(var/mob/living/user) - if(CanUse(user)) - var/obj/machinery/autolathe/V = holder - V.attack_hand(user) - /datum/wires/autolathe/UpdateCut(index, mended) var/obj/machinery/autolathe/A = holder switch(index) @@ -55,4 +50,4 @@ var/const/AUTOLATHE_DISABLE_WIRE = 4 spawn(50) if(A && !IsIndexCut(index)) A.disabled = 0 - Interact(usr) \ No newline at end of file + Interact(usr) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index a5011905f79..083b2317b00 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -75,11 +75,11 @@ /obj/machinery/autolathe/interact(mob/user) if(shocked && !(stat & NOPOWER)) - shock(user, 50) - return + if(shock(user, 50)) + return if(panel_open) - wires.Interact() + wires.Interact(user) else ui_interact(user) @@ -451,4 +451,4 @@ else for(var/datum/design/D in files.known_designs) if("hacked" in D.category) - files.known_designs -= D.id \ No newline at end of file + files.known_designs -= D.id