repulse armor now respects moveforce (#40508)

This commit is contained in:
kevinz000
2018-09-29 20:15:57 -07:00
committed by Emmett Gaines
parent 6defd9673f
commit 9c03a9bbf1
@@ -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