From 63ca6b53915d91343a391d618145da5a47207f9d Mon Sep 17 00:00:00 2001 From: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> Date: Tue, 19 Mar 2024 06:55:41 -0400 Subject: [PATCH] Electropack works more consistently, and is more responsive. (#24680) * electropack is less silly * dont need this anymore * Update code/game/objects/items/devices/radio/electropack.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> --------- Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> --- code/game/atoms_movable.dm | 1 - code/game/objects/items/devices/radio/electropack.dm | 9 --------- 2 files changed, 10 deletions(-) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 59fd2db6433..13007750572 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -15,7 +15,6 @@ var/throw_range = 7 var/no_spin = FALSE var/no_spin_thrown = FALSE - var/moved_recently = FALSE var/mob/pulledby = null var/atom/movable/pulling /// Face towards the atom while pulling it diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index d8448a6bf67..963c81c35ec 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -74,15 +74,6 @@ if(isliving(loc)) var/mob/living/M = loc - var/turf/T = M.loc - if(isturf(T)) - if(!M.moved_recently && M.last_move) - M.moved_recently = 1 - step(M, M.last_move) - sleep(50) - if(M) - M.moved_recently = 0 - to_chat(M, "You feel a sharp shock!") do_sparks(3, 1, M)