Merge pull request #6547 from Citadel-Station-13/upstream-merge-37473

[MIRROR] Lets quantum pads be used by sillycones properly.
This commit is contained in:
LetterJay
2018-04-29 02:29:05 -05:00
committed by GitHub
+2 -9
View File
@@ -68,14 +68,7 @@
return ..()
/obj/machinery/quantumpad/attack_hand(mob/user)
. = ..()
if(.)
return
if(panel_open)
to_chat(user, "<span class='warning'>The panel must be closed before operating this machine!</span>")
return
/obj/machinery/quantumpad/interact(mob/user)
if(!linked_pad || QDELETED(linked_pad))
if(!map_pad_link_id || !initMappedLink())
to_chat(user, "<span class='warning'>There is no linked pad!</span>")
@@ -96,7 +89,7 @@
if(linked_pad.stat & NOPOWER)
to_chat(user, "<span class='warning'>Linked pad is not responding to ping.</span>")
return
src.add_fingerprint(user)
add_fingerprint(user)
doteleport(user)
/obj/machinery/quantumpad/proc/sparks()