cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-16 21:22:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
kevinz000
2018-12-23 19:59:21 -08:00
parent e408250296
commit 0bed005cda
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/projectiles/projectile/hook.dm
View File

@@ -9,7 +9,7 @@
var/beam_state = "b_beam" var/beam_state = "b_beam"
damage = 5 damage = 5
step_delay = 2 speed = 2
damage_type = BURN damage_type = BURN
check_armour = "energy" check_armour = "energy"
armor_penetration = 15 armor_penetration = 15
@@ -26,9 +26,9 @@
var/list/help_messages = list("slaps", "pokes", "nudges", "bumps", "pinches") var/list/help_messages = list("slaps", "pokes", "nudges", "bumps", "pinches")
var/done_mob_unique = FALSE // Has the projectile already done something to a mob? 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) 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 target_distance = expected_distance
if(firer) // Needed to ensure later checks in impact and on hit function. if(firer) // Needed to ensure later checks in impact and on hit function.
launcher_intent = firer.a_intent launcher_intent = firer.a_intent

2
code/modules/projectiles/projectile/magnetic.dm
View File

@@ -127,7 +127,7 @@
penetrating = 0 penetrating = 0
check_armour = "melee" check_armour = "melee"
irradiate = 20 irradiate = 20
kill_count = 6 range = 6
/obj/item/projectile/bullet/magnetic/bore/Bump(atom/A, forced=0) /obj/item/projectile/bullet/magnetic/bore/Bump(atom/A, forced=0)
if(istype(A, /turf/simulated/mineral)) if(istype(A, /turf/simulated/mineral))