From 2e0a2257ebe8182097fab3f7bacc8418fc3fbe3e Mon Sep 17 00:00:00 2001 From: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> Date: Fri, 28 Feb 2020 22:28:42 -0800 Subject: [PATCH] Makes the tesla gun more METAL (#49470) * Adds fun * Makes it hurt * Makes mechs hit harder * Removes stun --- .../projectiles/projectile/energy/tesla.dm | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/code/modules/projectiles/projectile/energy/tesla.dm b/code/modules/projectiles/projectile/energy/tesla.dm index b858365445b..0bce20a3d23 100644 --- a/code/modules/projectiles/projectile/energy/tesla.dm +++ b/code/modules/projectiles/projectile/energy/tesla.dm @@ -2,24 +2,20 @@ name = "tesla bolt" icon_state = "tesla_projectile" impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser - var/chain + damage = 10 //A worse lasergun var/zap_flags = ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE var/zap_range = 3 var/power = 10000 -/obj/projectile/energy/tesla/fire(setAngle) - if(firer) - chain = firer.Beam(src, icon_state = "lightning[rand(1, 12)]", time = INFINITY, maxdistance = INFINITY) - ..() - /obj/projectile/energy/tesla/on_hit(atom/target) . = ..() - tesla_zap(target, zap_range, power, zap_flags) + tesla_zap(src, zap_range, power, zap_flags) qdel(src) -/obj/projectile/energy/tesla/Destroy() - QDEL_NULL(chain) - return ..() +/obj/projectile/energy/tesla/process() + . = ..() + //Many coders have given their blood for this speed + tesla_zap(src, zap_range, power, zap_flags) /obj/projectile/energy/tesla/revolver name = "energy orb" @@ -27,3 +23,4 @@ /obj/projectile/energy/tesla/cannon name = "tesla orb" power = 20000 + damage = 15 //Mech man big