From eeb3e97a1bf623aa4c1e4af6f310b10e5413bb2b Mon Sep 17 00:00:00 2001 From: Robustin Date: Tue, 14 Nov 2017 15:12:41 -0500 Subject: [PATCH] Tesla no longer NOTHING PERSONNEL's the power beacon (#32714) * Tesla beacon movement sanity * Announcement tweak --- code/game/machinery/syndicatebeacon.dm | 4 ++-- code/modules/power/tesla/energy_ball.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index b8d1535c81f..f8f980a1ee9 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -88,10 +88,10 @@ if(surplus() > 1500) add_load(1500) if(cooldown <= world.time) - cooldown = world.time + 100 + cooldown = world.time + 80 for(var/obj/singularity/singulo in GLOB.singularities) if(singulo.z == z) - say("The [singulo] is now [get_dist(src,singulo)] standard lengths away to the [dir2text(get_dir(src,singulo))]") + say("[singulo] is now [get_dist(src,singulo)] standard lengths away to the [dir2text(get_dir(src,singulo))]") else Deactivate() say("Insufficient charge detected - powering down") diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 9d527560fce..4a26950217b 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -78,7 +78,7 @@ var/move_bias = pick(GLOB.alldirs) for(var/i in 0 to move_amount) var/move_dir = pick(GLOB.alldirs + move_bias) //ensures large-ball teslas don't just sit around - if(target && prob(60)) + if(target && prob(10)) move_dir = get_dir(src,target) var/turf/T = get_step(src, move_dir) if(can_move(T))