From af2ae3d7277dd25f2fc23cc353292f7ed56d4d28 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Wed, 21 Feb 2018 09:28:53 -0600
Subject: [PATCH] [MIRROR] Reverts intercept_user_move change for flightsuits
 (#5630)

* Merge pull request #35830 from vuonojenmustaturska/clientsignal

Reverts intercept_user_move change for flightsuits

* Reverts intercept_user_move change for flightsuits
---
 code/game/objects/objs.dm                     |  3 ++
 .../modules/clothing/spacesuits/flightsuit.dm | 36 ++++++++++---------
 code/modules/mob/mob_movement.dm              |  3 ++
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 6e4c8d5a7b..55dc92b2b4 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -202,6 +202,9 @@
 /obj/proc/check_uplink_validity()
 	return 1
 
+/obj/proc/intercept_user_move(dir, mob, newLoc, oldLoc)
+	return
+
 /obj/vv_get_dropdown()
 	. = ..()
 	.["Delete all of type"] = "?_src_=vars;[HrefToken()];delall=[REF(src)]"
diff --git a/code/modules/clothing/spacesuits/flightsuit.dm b/code/modules/clothing/spacesuits/flightsuit.dm
index 684649b566..3008264d24 100644
--- a/code/modules/clothing/spacesuits/flightsuit.dm
+++ b/code/modules/clothing/spacesuits/flightsuit.dm
@@ -253,22 +253,26 @@
 		afterForceMove = FALSE
 	if(flight)
 		ion_trail.generate_effect()
-		var/momentum_increment = momentum_gain
-		if(boost)
-			momentum_increment = boost_power
-		if(brake)
-			momentum_increment = 0
-		if(!gravity && !pressure)
-			momentum_increment -= 10
-		switch(dir)
-			if(NORTH)
-				adjust_momentum(0, momentum_increment)
-			if(SOUTH)
-				adjust_momentum(0, -momentum_increment)
-			if(EAST)
-				adjust_momentum(momentum_increment, 0)
-			if(WEST)
-				adjust_momentum(-momentum_increment, 0)
+
+/obj/item/device/flightpack/intercept_user_move(dir, mob, newLoc, oldLoc)
+	if(!flight)
+		return
+	var/momentum_increment = momentum_gain
+	if(boost)
+		momentum_increment = boost_power
+	if(brake)
+		momentum_increment = 0
+	if(!gravity && !pressure)
+		momentum_increment -= 10
+	switch(dir)
+		if(NORTH)
+			adjust_momentum(0, momentum_increment)
+		if(SOUTH)
+			adjust_momentum(0, -momentum_increment)
+		if(EAST)
+			adjust_momentum(momentum_increment, 0)
+		if(WEST)
+			adjust_momentum(-momentum_increment, 0)
 
 //Make the wearer lose some momentum.
 /obj/item/device/flightpack/proc/momentum_decay()
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 6a36308924..0e441361d1 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -111,6 +111,9 @@
 		if(mob.throwing)
 			mob.throwing.finalize(FALSE)
 
+	for(var/obj/O in mob.user_movement_hooks)
+		O.intercept_user_move(direct, mob, n, oldloc)
+
 	var/atom/movable/P = mob.pulling
 	if(P && !ismob(P) && P.density)
 		mob.dir = turn(mob.dir, 180)