From 39b6d1fb49e234e5d7ec33e750f752f3e9776d9a Mon Sep 17 00:00:00 2001 From: oranges Date: Thu, 8 Feb 2018 22:19:05 +1300 Subject: [PATCH 1/2] Merge pull request #35398 from ACCount12/pr_atomization Removes an unnecessary type check from autolathe attackby --- code/game/machinery/autolathe.dm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 71158aa34c..0274c09fd6 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -89,18 +89,17 @@ if(default_deconstruction_screwdriver(user, "autolathe_t", "autolathe", O)) updateUsrDialog() - return + return TRUE if(exchange_parts(user, O)) - return + return TRUE - if(panel_open) - if(istype(O, /obj/item/crowbar)) - default_deconstruction_crowbar(O) - return TRUE - else if(is_wire_tool(O)) - wires.interact(user) - return TRUE + if(default_deconstruction_crowbar(O)) + return TRUE + + if(panel_open && is_wire_tool(O)) + wires.interact(user) + return TRUE if(user.a_intent == INTENT_HARM) //so we can hit the machine return ..()