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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit

Browse Source
This commit is contained in:
SandPoot
2024-03-08 19:10:22 -03:00
parent fcd036dab5 c4c3a8ace1
commit a65f323734
810 changed files with 140372 additions and 5523 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/tackle.dm
+1 -1
View File
@@ -66,7 +66,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.throw_mode || user.get_active_held_item() || user.pulling || user.buckling)
return
if(HAS_TRAIT(user, TRAIT_HULK))