shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #850 from Citadel-Station-13/upstream-merge-26980

Browse Source 
[MIRROR] Small Click refactor.
This commit is contained in:
LetterJay
2017-05-14 16:40:30 -04:00
committed by GitHub
parent 2cf744d69b 98765ec854
commit 6c4a355379
4 changed files with 82 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living.dm
+1 -1
View File
@@ -450,7 +450,7 @@
if(pulledby && moving_diagonally != FIRST_DIAG_STEP && get_dist(src, pulledby) > 1)//separated from our puller and not in the middle of a diagonal move.
pulledby.stop_pulling()
if (s_active && !(s_active.ClickAccessible(src, depth=STORAGE_VIEW_DEPTH) || s_active.Adjacent(src)))
if (s_active && !(CanReach(s_active,view_only = TRUE)))
s_active.close(src)
/mob/living/movement_delay(ignorewalk = 0)