cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52304 from Ryll-Ryll/fixing-under-protest

Browse Source 
Fixes handi-capable tackling from beyond the grave
This commit is contained in:
skoglol
2020-07-21 19:25:51 +02:00
committed by GitHub
parent 0be5a2a093 f909ca0663
commit 0d85dc20eb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/tackle.dm
+1 -1
View File
@@ -68,7 +68,7 @@
///See if we can tackle or not. If we can, leap!
/datum/component/tackler/proc/checkTackle(mob/living/carbon/user, atom/A, params)
if(!user.in_throw_mode || user.get_active_held_item() || user.pulling || user.buckling)
if(!user.in_throw_mode || user.get_active_held_item() || user.pulling || user.buckled || user.incapacitated())
return
if(!A || !(isturf(A) || isturf(A.loc)))