From 4d5639d874680e32902080e73427065e1d087417 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Wed, 17 Mar 2021 23:16:09 -0900 Subject: [PATCH 1/2] Merge pull request #7968 from Shadow-Quill/Door-Pulling-QOL-Fix 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 8465280607..9cacb36eaf 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -66,15 +66,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