diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 961b9f8ee28..2cd7a772f8c 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -195,7 +195,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 diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index d3d88edfbaf..9835371591d 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) @@ -113,7 +113,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 < 1000) return var/list/tesla_coils = list() var/list/grounding_rods = list()