From b839e02639e7dce89fdf16a9427c1f8b2346df69 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Fri, 5 Aug 2022 15:33:04 -0400 Subject: [PATCH] fixes weak ion shots... being stronger than normal ions (#18713) * fixes weak ion shots... being stronger than normal ions * charl request --- code/modules/projectiles/projectile/special.dm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 2f101c2a36f..77bd75e0dcb 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -7,18 +7,17 @@ nodamage = 1 impact_effect_type = /obj/effect/temp_visual/impact_effect/ion flag = "energy" + var/strong_emp = 1 + var/weak_emp = 1 /obj/item/projectile/ion/on_hit(atom/target, blocked = 0) ..() - empulse(target, 1, 1, 1, cause = "[type] fired by [key_name(firer)]") + empulse(target, strong_emp, weak_emp, TRUE, cause = "[type] fired by [key_name(firer)]") return 1 /obj/item/projectile/ion/weak - -/obj/item/projectile/ion/weak/on_hit(atom/target, blocked = 0) - ..() - empulse(target, 0, 0, 1, cause = "[type] fired by [key_name(firer)]") - return 1 + strong_emp = 0 + weak_emp = 0 /obj/item/projectile/bullet/gyro name ="explosive bolt"