From 7fc7d5888aea3f4e3c68402fcce76911e61492cf Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sat, 18 Jul 2020 20:39:05 -0700
Subject: [PATCH 1/2] Update _movespeed_modifier.dm

---
 code/modules/movespeed/_movespeed_modifier.dm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/modules/movespeed/_movespeed_modifier.dm b/code/modules/movespeed/_movespeed_modifier.dm
index a338919c4b..69fa7dba85 100644
--- a/code/modules/movespeed/_movespeed_modifier.dm
+++ b/code/modules/movespeed/_movespeed_modifier.dm
@@ -199,7 +199,12 @@ GLOBAL_LIST_EMPTY(movespeed_modification_cache)
 			else
 				continue
 		. += amt
+	var/old = cached_multiplicative_slowdown		// CITAEDL EDIT - To make things a bit less jarring, when in situations where
+	// your delay decreases, "give" the delay back to the client
 	cached_multiplicative_slowdown = .
+	var/diff = old - cached_multiplicative_slowdown
+	if(diff > 0)
+		client.move_delay -= diff
 
 /// Get the move speed modifiers list of the mob
 /mob/proc/get_movespeed_modifiers()

From a0250cfaaad763aff0dff89be442cd4f99613bfc Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sat, 18 Jul 2020 20:42:39 -0700
Subject: [PATCH 2/2] Update _movespeed_modifier.dm

---
 code/modules/movespeed/_movespeed_modifier.dm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/modules/movespeed/_movespeed_modifier.dm b/code/modules/movespeed/_movespeed_modifier.dm
index 69fa7dba85..3bc4463531 100644
--- a/code/modules/movespeed/_movespeed_modifier.dm
+++ b/code/modules/movespeed/_movespeed_modifier.dm
@@ -203,8 +203,9 @@ GLOBAL_LIST_EMPTY(movespeed_modification_cache)
 	// your delay decreases, "give" the delay back to the client
 	cached_multiplicative_slowdown = .
 	var/diff = old - cached_multiplicative_slowdown
-	if(diff > 0)
-		client.move_delay -= diff
+	if((diff > 0) && client)
+		if(client.move_delay > world.time + 1.5)
+			client.move_delay -= diff
 
 /// Get the move speed modifiers list of the mob
 /mob/proc/get_movespeed_modifiers()