From 60e3b6a67ffea3a2833c626cfaaa87cfbfe036e3 Mon Sep 17 00:00:00 2001 From: Ryll-Ryll <3589655+Ryll-Ryll@users.noreply.github.com> Date: Fri, 17 Jul 2020 22:20:28 -0400 Subject: [PATCH 1/3] changes buckling to buckled --- code/datums/components/tackle.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index fa703ded705..7e827aa043a 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -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) return if(!A || !(isturf(A) || isturf(A.loc))) From 712898d7130eec85db957c84d20d5417da6cb0d4 Mon Sep 17 00:00:00 2001 From: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com> Date: Sat, 18 Jul 2020 05:35:32 -0400 Subject: [PATCH 2/3] webbit to do the incap check --- code/datums/components/tackle.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index 7e827aa043a..087f4fbc7a2 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -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.buckled) + if(!user.in_throw_mode || user.get_active_held_item() || user.pulling || user.buckled || HAS_TRAIT(user, TRAIT_INCAPACITATED)) return if(!A || !(isturf(A) || isturf(A.loc))) From f909ca066376d317c5c7de072c75f56e00a81d8b Mon Sep 17 00:00:00 2001 From: Ryll-Ryll <3589655+Ryll-Ryll@users.noreply.github.com> Date: Mon, 20 Jul 2020 23:25:31 -0400 Subject: [PATCH 3/3] correct check --- code/datums/components/tackle.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index 087f4fbc7a2..cc35c1f78af 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -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.buckled || HAS_TRAIT(user, TRAIT_INCAPACITATED)) + if(!user.in_throw_mode || user.get_active_held_item() || user.pulling || user.buckled || user.incapacitated()) return if(!A || !(isturf(A) || isturf(A.loc)))