cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-24 17:12:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9958 from VOREStation/upstream-merge-7968

Browse Source 
[MIRROR] Clicking on turfs while dragging something no longer closes the door
This commit is contained in:
Novacat
2021-03-18 10:39:56 -04:00
committed by Chompstation Bot
parent 5c285eda7d
commit d468ae34f5
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/game/turfs/turf.dm
View File

@@ -67,15 +67,16 @@
return 1 return 1
/turf/attack_hand(mob/user) /turf/attack_hand(mob/user)
//QOL feature, clicking on turf can toogle doors //QOL feature, clicking on turf can toggle doors, unless pulling something
var/obj/machinery/door/airlock/AL = locate(/obj/machinery/door/airlock) in src.contents if(!user.pulling)
if(AL) var/obj/machinery/door/airlock/AL = locate(/obj/machinery/door/airlock) in src.contents
AL.attack_hand(user) if(AL)
return TRUE AL.attack_hand(user)
var/obj/machinery/door/firedoor/FD = locate(/obj/machinery/door/firedoor) in src.contents return TRUE
if(FD) var/obj/machinery/door/firedoor/FD = locate(/obj/machinery/door/firedoor) in src.contents
FD.attack_hand(user) if(FD)
return TRUE FD.attack_hand(user)
return TRUE
if(!(user.canmove) || user.restrained() || !(user.pulling)) if(!(user.canmove) || user.restrained() || !(user.pulling))
return 0 return 0