From 9c03a9bbf16ba5996cbc7fc775577417147bee5e Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 29 Sep 2018 20:15:57 -0700 Subject: [PATCH] repulse armor now respects moveforce (#40508) --- code/modules/clothing/suits/reactive_armour.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm index 7542a0dd599..2bd24e21a2f 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -186,6 +186,7 @@ /obj/item/clothing/suit/armor/reactive/repulse name = "reactive repulse armor" desc = "An experimental suit of armor that violently throws back attackers." + var/repulse_force = MOVE_FORCE_EXTREMELY_STRONG /obj/item/clothing/suit/armor/reactive/repulse/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(!active) @@ -202,7 +203,7 @@ if(A == owner || A.anchored || thrown_items[A]) continue var/throwtarget = get_edge_target_turf(T, get_dir(T, get_step_away(A, T))) - A.throw_at(throwtarget,10,1) + A.safe_throw_at(throwtarget, 10, 1, force = repulse_force) thrown_items[A] = A reactivearmor_cooldown = world.time + reactivearmor_cooldown_duration