Merge pull request #5370 from Citadel-Station-13/upstream-merge-35398

[MIRROR] Removes an unnecessary type check from autolathe attackby
This commit is contained in:
LetterJay
2018-02-08 07:12:48 -06:00
committed by GitHub

View File

@@ -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 ..()