From d6a3fb42e2fa91dbd70d97399455426a04ac0759 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Sun, 3 Jan 2016 10:23:24 -0800 Subject: [PATCH 1/3] Tesla nerf It no longer bounces shocks nearly as far. --- code/modules/power/tesla/energy_ball.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index e1e2018779e..5d1dfa51755 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -44,7 +44,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics, move_the_basket_ball(amount_to_move) pixel_x = 0 pixel_y = 0 - playsound(src.loc, 'sound/magic/lightningbolt.ogg', 100, 1, extrarange = 5) + playsound(src.loc, 'sound/magic/lightningbolt.ogg', 100, 1, extrarange = 15) tesla_zap(src, 7, what_does_the_scouter_say_about_the_balls_power_level) pixel_x = -32 pixel_y = -32 @@ -69,7 +69,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics, /obj/singularity/energy_ball/proc/handle_energy() if(energy >= 300) energy -= 300 - playsound(src.loc, 'sound/magic/lightning_chargeup.ogg', 100, 1, extrarange = 5) + playsound(src.loc, 'sound/magic/lightning_chargeup.ogg', 100, 1, extrarange = 15) spawn(100) var/obj/singularity/energy_ball/EB = new(loc) orbiting_balls.Add(EB) @@ -114,7 +114,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics, return closest_atom /proc/tesla_zap(var/atom/source, zap_range = 3, power) - if(power < 500) + if(power < 100) return var/list/tesla_coils = list() var/list/grounding_rods = list() From 51de33e3c4406a4a89dcbeb361b11426dd0a1fda Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Sun, 3 Jan 2016 10:24:03 -0800 Subject: [PATCH 2/3] haha whoops --- code/modules/power/tesla/energy_ball.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 5d1dfa51755..bcad58900c5 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -114,7 +114,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics, return closest_atom /proc/tesla_zap(var/atom/source, zap_range = 3, power) - if(power < 100) + if(power < 1000) return var/list/tesla_coils = list() var/list/grounding_rods = list() From e1828f363ecc7df376f9cd79ffeb3beb7dbd86df Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Sun, 3 Jan 2016 10:25:10 -0800 Subject: [PATCH 3/3] nerfs machine bounce range --- code/game/objects/objs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 3e716979df8..a2752abc747 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -194,7 +194,7 @@ /obj/proc/tesla_act(var/power) being_shocked = 1 - var/power_bounced = power / 1.3 - tesla_zap(src, 5, power_bounced) + var/power_bounced = power / 2 + tesla_zap(src, 3, power_bounced) spawn(10) being_shocked = 0