diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index 17d2773b60..0af2d8f78c 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -168,7 +168,6 @@ if(-1 to 0) // decent hit, both parties are about equally inconvenienced user.visible_message("[user] lands a passable tackle on [target], sending them both tumbling!", "You land a passable tackle on [target], sending you both tumbling!", target) to_chat(target, "[user] lands a passable tackle on you, sending you both tumbling!") - target.adjustStaminaLoss(stamina_cost) target.Paralyze(5) user.Knockdown(20) @@ -205,8 +204,8 @@ target.Paralyze(5) target.Knockdown(30) if(ishuman(target) && ishuman(user)) - S.dna.species.grab(S, T) - S.setGrabState(GRAB_AGGRESSIVE) + target.grabbedby(user) + target.grippedby(user, instant = TRUE) //instant aggro grab SEND_SIGNAL(user, COMSIG_CARBON_TACKLED, "tackle completed") return COMPONENT_MOVABLE_IMPACT_FLIP_HITPUSH