diff --git a/code/datums/ai/_ai_controller.dm b/code/datums/ai/_ai_controller.dm
index b525f66576c..91f624972ad 100644
--- a/code/datums/ai/_ai_controller.dm
+++ b/code/datums/ai/_ai_controller.dm
@@ -34,7 +34,7 @@ multiple modular subtrees with behaviors
 	///Stored arguments for behaviors given during their initial creation
 	var/list/behavior_args = list()
 	///Tracks recent pathing attempts, if we fail too many in a row we fail our current plans.
-	var/pathing_attempts
+	var/consecutive_pathing_attempts
 	///Can the AI remain in control if there is a client?
 	var/continue_processing_when_client = FALSE
 	///distance to give up on target
diff --git a/code/datums/ai/movement/_ai_movement.dm b/code/datums/ai/movement/_ai_movement.dm
index af29e83f1a4..3f455b2acd0 100644
--- a/code/datums/ai/movement/_ai_movement.dm
+++ b/code/datums/ai/movement/_ai_movement.dm
@@ -8,22 +8,25 @@
 //Override this to setup the moveloop you want to use
 /datum/ai_movement/proc/start_moving_towards(datum/ai_controller/controller, atom/current_movement_target, min_distance)
 	SHOULD_CALL_PARENT(TRUE)
-	controller.pathing_attempts = 0
+	controller.consecutive_pathing_attempts = 0
 	controller.set_blackboard_key(BB_CURRENT_MIN_MOVE_DISTANCE, min_distance)
 	moving_controllers[controller] = current_movement_target
 
 /datum/ai_movement/proc/stop_moving_towards(datum/ai_controller/controller)
-	controller.pathing_attempts = 0
+	controller.consecutive_pathing_attempts = 0
 	moving_controllers -= controller
 	// We got deleted as we finished an action
 	if(!QDELETED(controller.pawn))
 		SSmove_manager.stop_looping(controller.pawn, SSai_movement)
 
 /datum/ai_movement/proc/increment_pathing_failures(datum/ai_controller/controller)
-	controller.pathing_attempts++
-	if(controller.pathing_attempts >= max_pathing_attempts)
+	controller.consecutive_pathing_attempts++
+	if(controller.consecutive_pathing_attempts >= max_pathing_attempts)
 		controller.CancelActions()
 
+/datum/ai_movement/proc/reset_pathing_failures(datum/ai_controller/controller)
+	controller.consecutive_pathing_attempts = 0
+
 ///Should the movement be allowed to happen? return TRUE if it can, FALSE otherwise
 /datum/ai_movement/proc/allowed_to_move(datum/move_loop/source)
 	SHOULD_BE_PURE(TRUE)
@@ -68,7 +71,8 @@
 //Anything to do post movement
 /datum/ai_movement/proc/post_move(datum/move_loop/source, succeeded)
 	SIGNAL_HANDLER
-	if(succeeded != FALSE)
-		return
 	var/datum/ai_controller/controller = source.extra_info
+	if(succeeded != MOVELOOP_FAILURE)
+		reset_pathing_failures(controller)
+		return
 	increment_pathing_failures(controller)
diff --git a/code/datums/ai/movement/ai_movement_jps.dm b/code/datums/ai/movement/ai_movement_jps.dm
index 6024b7e7562..825feefabfa 100644
--- a/code/datums/ai/movement/ai_movement_jps.dm
+++ b/code/datums/ai/movement/ai_movement_jps.dm
@@ -51,3 +51,6 @@
 
 /datum/ai_movement/jps/bot/travel_to_beacon
 	maximum_length = AI_BOT_PATH_LENGTH
+
+/datum/ai_movement/jps/modsuit
+	maximum_length = MOD_AI_RANGE
diff --git a/code/datums/ai/objects/mod.dm b/code/datums/ai/objects/mod.dm
index 2bb555d281b..67d8121a4e1 100644
--- a/code/datums/ai/objects/mod.dm
+++ b/code/datums/ai/objects/mod.dm
@@ -5,7 +5,7 @@
 		BB_MOD_IMPLANT,
 	)
 	max_target_distance = MOD_AI_RANGE //a little spicy but its one specific item that summons it, and it doesn't run otherwise
-	ai_movement = /datum/ai_movement/jps
+	ai_movement = /datum/ai_movement/jps/modsuit
 	///ID card generated from the suit's required access. Used for pathing.
 	var/obj/item/card/id/advanced/id_card