Merge pull request #7018 from GinjaNinja32/robot_move

Fixes cyborg movement depending on actuators when not caused by cyborg
This commit is contained in:
Chinsky
2014-11-16 10:17:31 +03:00
2 changed files with 7 additions and 4 deletions

View File

@@ -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))
..()
return ..()

View File

@@ -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()