From 695afcc94e1bee00dc86d57593abcb112ca66a06 Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Mon, 28 Dec 2015 09:21:45 -0800 Subject: [PATCH] removes last_move checks from do_after/do_mob it ticks at 1ds now, the cases where you could move and come back are rare, and require the server to be running at 21fps or higher and you have perfect lag and timing. --- code/__HELPERS/mobs.dm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 0d6a768710f..cd321db03dd 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -147,10 +147,8 @@ Proc for attack log creation, because really why not if(!user || !target) return 0 var/user_loc = user.loc - user.last_move = null var/target_loc = target.loc - target.last_move = null var/holding = user.get_active_hand() var/datum/progressbar/progbar @@ -167,7 +165,7 @@ Proc for attack log creation, because really why not break if(uninterruptible) continue - if(user.loc != user_loc || user.last_move || target.loc != target_loc || target.last_move || user.get_active_hand() != holding || user.incapacitated() || user.lying ) + if(user.loc != user_loc || target.loc != target_loc || user.get_active_hand() != holding || user.incapacitated() || user.lying ) . = 0 break sleep(1) @@ -181,13 +179,9 @@ Proc for attack log creation, because really why not var/atom/Tloc = null if(target) Tloc = target.loc - var/atom/movable/AMtarget - if(istype(target,/atom/movable)) - AMtarget = target - AMtarget.last_move = null var/atom/Uloc = user.loc - user.last_move = null + var/holding = user.get_active_hand() var/holdingnull = 1 //User's hand started out empty, check for an empty hand @@ -205,11 +199,11 @@ Proc for attack log creation, because really why not if (progress) progbar.update(world.time - starttime) - if(!user || user.stat || user.weakened || user.stunned || user.loc != Uloc || user.last_move) + if(!user || user.stat || user.weakened || user.stunned || user.loc != Uloc) . = 0 break - if(Tloc && (!target || Tloc != target.loc || (AMtarget && AMtarget.last_move))) + if(Tloc && (!target || Tloc != target.loc)) . = 0 break