From 5811122619981bb01fa25b53c9ca5beaf990c638 Mon Sep 17 00:00:00 2001
From: GinjaNinja32 <ginjaninja32@gmail.com>
Date: Thu, 13 Nov 2014 14:52:13 +0000
Subject: [PATCH] Fixes robot movement caused by non-self using power

---
 code/modules/mob/living/silicon/robot/robot_movement.dm | 6 +++---
 code/modules/mob/mob_movement.dm                        | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/code/modules/mob/living/silicon/robot/robot_movement.dm b/code/modules/mob/living/silicon/robot/robot_movement.dm
index 8cf0eae0c0..f9265a383f 100644
--- a/code/modules/mob/living/silicon/robot/robot_movement.dm
+++ b/code/modules/mob/living/silicon/robot/robot_movement.dm
@@ -23,10 +23,10 @@
 	return tally+config.robot_delay
 
 // NEW: Use power while moving.
-/mob/living/silicon/robot/Move()
+/mob/living/silicon/robot/SelfMove(turf/n, direct)
 	if (!is_component_functioning("actuator"))
-		return
+		return 0
 
 	var/datum/robot_component/actuator/A = get_component("actuator")
 	if (cell_use_power(A.active_usage))
-		..()
\ No newline at end of file
+		return ..()
\ No newline at end of file
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 9244b55e48..f999b26ec0 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -316,7 +316,7 @@
 		else if(mob.confused)
 			step(mob, pick(cardinal))
 		else
-			. = ..()
+			. = mob.SelfMove(n, direct)
 
 		moving = 0
 
@@ -324,6 +324,9 @@
 
 	return
 
+/mob/proc/SelfMove(turf/n, direct)
+	return Move(n, direct)
+
 
 ///Process_Grab()
 ///Called by client/Move()