mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-27 10:32:40 +00:00
Merge pull request #8790 from Spookerton/spkrtn/cng/move-it-move-it
unuses DS2NEARESTTICK, fixes a diagonal snafu
This commit is contained in:
@@ -155,7 +155,7 @@ default behaviour is:
|
||||
now_pushing = 0
|
||||
return
|
||||
var/move_time = movement_delay(loc, t) * SQRT_TWO
|
||||
move_time = DS2NEARESTTICK(move_time)
|
||||
//move_time = DS2NEARESTTICK(move_time)
|
||||
if(AM.Move(T2, t, move_time))
|
||||
Move(T, t, move_time)
|
||||
|
||||
|
||||
@@ -285,7 +285,7 @@
|
||||
direct = turn(direct, pick(90, -90))
|
||||
n = get_step(my_mob, direct)
|
||||
|
||||
total_delay = DS2NEARESTTICK(total_delay) //Rounded to the next tick in equivalent ds
|
||||
//total_delay = DS2NEARESTTICK(total_delay) //Rounded to the next tick in equivalent ds
|
||||
my_mob.setMoveCooldown(total_delay)
|
||||
|
||||
if(istype(my_mob.pulledby, /obj/structure/bed/chair/wheelchair))
|
||||
@@ -297,7 +297,7 @@
|
||||
|
||||
// If we ended up moving diagonally, increase delay.
|
||||
if((direct & (direct - 1)) && mob.loc == n)
|
||||
my_mob.setMoveCooldown(total_delay * 2)
|
||||
my_mob.setMoveCooldown(total_delay * SQRT_TWO)
|
||||
|
||||
// If we have a grab
|
||||
var/list/grablist = my_mob.ret_grab()
|
||||
|
||||
Reference in New Issue
Block a user