From 0bed005cda2d92d10c0d3b02f5a388c1010a4db0 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 23 Dec 2018 19:59:21 -0800 Subject: [PATCH] fix --- code/modules/projectiles/projectile/hook.dm | 6 +++--- code/modules/projectiles/projectile/magnetic.dm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/projectiles/projectile/hook.dm b/code/modules/projectiles/projectile/hook.dm index ef8e9bc7c6..f85496bec9 100644 --- a/code/modules/projectiles/projectile/hook.dm +++ b/code/modules/projectiles/projectile/hook.dm @@ -9,7 +9,7 @@ var/beam_state = "b_beam" damage = 5 - step_delay = 2 + speed = 2 damage_type = BURN check_armour = "energy" armor_penetration = 15 @@ -26,9 +26,9 @@ var/list/help_messages = list("slaps", "pokes", "nudges", "bumps", "pinches") var/done_mob_unique = FALSE // Has the projectile already done something to a mob? -/obj/item/projectile/energy/hook/launch(atom/target, target_zone, x_offset=0, y_offset=0, angle_offset=0) +/obj/item/projectile/energy/hook/launch_projectile(atom/target, target_zone, mob/user, params, angle_override, forced_spread = 0) var/expected_distance = get_dist(target, loc) - kill_count = expected_distance // So the hook hits the ground if no mob is hit. + range = expected_distance // So the hook hits the ground if no mob is hit. target_distance = expected_distance if(firer) // Needed to ensure later checks in impact and on hit function. launcher_intent = firer.a_intent diff --git a/code/modules/projectiles/projectile/magnetic.dm b/code/modules/projectiles/projectile/magnetic.dm index a371ac076f..8185fb127e 100644 --- a/code/modules/projectiles/projectile/magnetic.dm +++ b/code/modules/projectiles/projectile/magnetic.dm @@ -127,7 +127,7 @@ penetrating = 0 check_armour = "melee" irradiate = 20 - kill_count = 6 + range = 6 /obj/item/projectile/bullet/magnetic/bore/Bump(atom/A, forced=0) if(istype(A, /turf/simulated/mineral))