From 597432424c95c91b19b221474bd6c36c894e2252 Mon Sep 17 00:00:00 2001 From: Arturlang Date: Mon, 1 Jun 2020 22:51:41 +0300 Subject: [PATCH] Buffs lunging gloves a bit, so they arent a detriment to the user as much (#12336) * Buffs leap all around * Kev suggestions * Im stoopid --- code/datums/components/tackle.dm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index ddc47d59a1..8b533c2ef0 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -163,24 +163,24 @@ if(-4 to -2) // glancing blow at best user.visible_message("[user] lands a weak [tackle_word] on [target], briefly knocking [target.p_them()] off-balance!", "You land a weak [tackle_word] on [target], briefly knocking [target.p_them()] off-balance!", target) to_chat(target, "[user] lands a weak [tackle_word] on you, briefly knocking you off-balance!") - user.Knockdown(30) + target.adjustStaminaLoss(15) target.apply_status_effect(STATUS_EFFECT_TASED_WEAK, 6 SECONDS) if(-1 to 0) // decent hit, both parties are about equally inconvenienced user.visible_message("[user] lands a passable [tackle_word] on [target], sending them both tumbling!", "You land a passable [tackle_word] on [target], sending you both tumbling!", target) to_chat(target, "[user] lands a passable [tackle_word] on you, sending you both tumbling!") - target.adjustStaminaLoss(stamina_cost) + target.adjustStaminaLoss(stamina_cost * 1.5) target.Paralyze(5) user.Knockdown(20) - target.Knockdown(25) + target.Knockdown(30) if(1 to 2) // solid hit, tackler has a slight advantage user.visible_message("[user] lands a solid [tackle_word] on [target], knocking them both down hard!", "You land a solid [tackle_word] on [target], knocking you both down hard!", target) to_chat(target, "[user] lands a solid [tackle_word] on you, knocking you both down hard!") - target.adjustStaminaLoss(30) + target.adjustStaminaLoss(40) target.Paralyze(5) user.Knockdown(10) target.Knockdown(20) @@ -192,9 +192,9 @@ user.SetKnockdown(0) user.set_resting(FALSE, TRUE, FALSE) user.forceMove(get_turf(target)) - target.adjustStaminaLoss(40) - target.Paralyze(5) - target.Knockdown(30) + target.adjustStaminaLoss(50) + target.Paralyze(3) //Otherwise the victim can just instantly get out of the grab. + target.DefaultCombatKnockdown(20) //So they cant get up instantly. if(ishuman(target) && iscarbon(user)) target.grabbedby(user) @@ -205,9 +205,9 @@ user.SetKnockdown(0) user.set_resting(FALSE, TRUE, FALSE) user.forceMove(get_turf(target)) - target.adjustStaminaLoss(40) - target.Paralyze(5) - target.Knockdown(30) + target.adjustStaminaLoss(65) + target.Paralyze(10) + target.DefaultCombatKnockdown(20) if(ishuman(target) && iscarbon(user)) target.grabbedby(user) target.grippedby(user, instant = TRUE)