From 6bb746995e93f198ed7657828e377d6aac7168df Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Mon, 12 Aug 2019 09:54:30 -0800
Subject: [PATCH] Merge pull request #6401 from Shophaune/dronehatissues

Maybe fixes drone hat issues
---
 code/modules/mob/living/silicon/robot/drone/drone_abilities.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
index 2f688a90080..2595d451c1e 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
@@ -26,10 +26,10 @@
 	if(!istype(H) || !Adjacent(H))
 		return ..()
 	if(H.a_intent == "grab" && hat && !(H.l_hand && H.r_hand))
-		hat.loc = get_turf(src)
 		H.put_in_hands(hat)
 		H.visible_message("<span class='danger'>\The [H] removes \the [src]'s [hat].</span>")
 		hat = null
 		updateicon()
+		return
 	else
 		return ..()
\ No newline at end of file