From 3cd6cfb7d5c31fc1e5803931c0edf75ddcf70073 Mon Sep 17 00:00:00 2001
From: Ghom <42542238+Ghommie@users.noreply.github.com>
Date: Tue, 4 Feb 2020 23:50:33 +0100
Subject: [PATCH] Update defibrillator_mount.dm

---
 code/game/machinery/defibrillator_mount.dm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/game/machinery/defibrillator_mount.dm b/code/game/machinery/defibrillator_mount.dm
index f3be6ac214..7107a0baea 100644
--- a/code/game/machinery/defibrillator_mount.dm
+++ b/code/game/machinery/defibrillator_mount.dm
@@ -120,7 +120,7 @@
 
 /obj/machinery/defibrillator_mount/AltClick(mob/living/carbon/user)
 	. = ..()
-	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE))
+	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
 		return
 	. = TRUE
 	if(!defib)
@@ -129,9 +129,10 @@
 	if(clamps_locked)
 		to_chat(user, "<span class='warning'>You try to tug out [defib], but the mount's clamps are locked tight!</span>")
 		return
-	if(!user.put_in_hands(defib))
+	if(!user.get_empty_held_indexes)
 		to_chat(user, "<span class='warning'>You need a free hand!</span>")
 		return
+	user.put_in_hands(defib)
 	user.visible_message("<span class='notice'>[user] unhooks [defib] from [src].</span>", \
 	"<span class='notice'>You slide out [defib] from [src] and unhook the charging cables.</span>")
 	playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
@@ -147,4 +148,4 @@
 	materials = list(MAT_METAL = 300, MAT_GLASS = 100)
 	w_class = WEIGHT_CLASS_BULKY
 	result_path = /obj/machinery/defibrillator_mount
-	pixel_shift = -28
\ No newline at end of file
+	pixel_shift = -28