From 8597fbd71514270c2c2a58eaa8553d44cd74ba6c Mon Sep 17 00:00:00 2001 From: "quartz235@gmail.com" Date: Sat, 28 Jan 2012 10:14:26 +0000 Subject: [PATCH] Fix for issue 324 (what the hell was the point of moved_recently if it's stuck at one after moving and has no impact outside of electropacks) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2997 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/atom.dm | 1 - code/game/objects/radio/electropack.dm | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/defines/atom.dm b/code/defines/atom.dm index 7f1ae68a40c..a8109647e3b 100644 --- a/code/defines/atom.dm +++ b/code/defines/atom.dm @@ -166,7 +166,6 @@ obj src.m_flag = 1 if ((A != src.loc && A && A.z == src.z)) src.last_move = get_dir(A, src.loc) - src.moved_recently = 1 return /* diff --git a/code/game/objects/radio/electropack.dm b/code/game/objects/radio/electropack.dm index 4f5b5d07632..f4a1c1189a5 100644 --- a/code/game/objects/radio/electropack.dm +++ b/code/game/objects/radio/electropack.dm @@ -131,8 +131,12 @@ var/mob/M = src.loc var/turf/T = M.loc if ((istype(T, /turf))) - if (M.moved_recently && M.last_move) + if (!M.moved_recently && M.last_move) + M.moved_recently = 1 step(M, M.last_move) + sleep 50 + if(M) + M.moved_recently = 0 M.show_message("\red You feel a sharp shock!") var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, M)