From d468ae34f59c4b334c74b43f94d0911997eba18f Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Thu, 18 Mar 2021 10:39:56 -0400
Subject: [PATCH] Merge pull request #9958 from VOREStation/upstream-merge-7968

[MIRROR] Clicking on turfs while dragging something no longer closes the door
---
 code/game/turfs/turf.dm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index e2db82664e..17bc2aee51 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -67,15 +67,16 @@
 	return 1
 
 /turf/attack_hand(mob/user)
-	//QOL feature, clicking on turf can toogle doors
-	var/obj/machinery/door/airlock/AL = locate(/obj/machinery/door/airlock) in src.contents
-	if(AL)
-		AL.attack_hand(user)
-		return TRUE
-	var/obj/machinery/door/firedoor/FD = locate(/obj/machinery/door/firedoor) in src.contents
-	if(FD)
-		FD.attack_hand(user)
-		return TRUE
+	//QOL feature, clicking on turf can toggle doors, unless pulling something
+	if(!user.pulling)
+		var/obj/machinery/door/airlock/AL = locate(/obj/machinery/door/airlock) in src.contents
+		if(AL)
+			AL.attack_hand(user)
+			return TRUE
+		var/obj/machinery/door/firedoor/FD = locate(/obj/machinery/door/firedoor) in src.contents
+		if(FD)
+			FD.attack_hand(user)
+			return TRUE
 
 	if(!(user.canmove) || user.restrained() || !(user.pulling))
 		return 0