From 73d5c92c2b6c1267fcb945c9c598dc6820ea022e Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Fri, 27 Apr 2018 11:17:41 -0700 Subject: [PATCH 1/2] Quantum pad interaction (#37473) --- code/game/machinery/quantum_pad.dm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index 91a7f6923f..37e46809d2 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -68,14 +68,7 @@ return ..() -/obj/machinery/quantumpad/attack_hand(mob/user) - . = ..() - if(.) - return - if(panel_open) - to_chat(user, "The panel must be closed before operating this machine!") - return - +/obj/machinery/quantumpad/interact(mob/user) if(!linked_pad || QDELETED(linked_pad)) if(!map_pad_link_id || !initMappedLink()) to_chat(user, "There is no linked pad!") @@ -96,7 +89,7 @@ if(linked_pad.stat & NOPOWER) to_chat(user, "Linked pad is not responding to ping.") return - src.add_fingerprint(user) + add_fingerprint(user) doteleport(user) /obj/machinery/quantumpad/proc/sparks()