Merge pull request #3256 from Citadel-Station-13/upstream-merge-31469

[MIRROR] Fixes Teslas always doing the same movement pattern
This commit is contained in:
LetterJay
2017-10-10 01:05:03 -04:00
committed by GitHub
+3 -3
View File
@@ -57,7 +57,7 @@
pixel_x = 0
pixel_y = 0
setDir(tesla_zap(src, 7, TESLA_DEFAULT_POWER, TRUE))
tesla_zap(src, 7, TESLA_DEFAULT_POWER, TRUE)
pixel_x = -32
pixel_y = -32
@@ -75,9 +75,9 @@
/obj/singularity/energy_ball/proc/move_the_basket_ball(var/move_amount)
//we face the last thing we zapped, so this lets us favor that direction a bit
var/first_move = dir
var/move_bias = pick(GLOB.alldirs)
for(var/i in 0 to move_amount)
var/move_dir = pick(GLOB.alldirs + first_move) //give the first move direction a bit of favoring.
var/move_dir = pick(GLOB.alldirs + move_bias) //ensures large-ball teslas don't just sit around
if(target && prob(60))
move_dir = get_dir(src,target)
var/turf/T = get_step(src, move_dir)