mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Merge pull request #7018 from GinjaNinja32/robot_move
Fixes cyborg movement depending on actuators when not caused by cyborg
This commit is contained in:
@@ -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 ..()
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user