cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7018 from GinjaNinja32/robot_move

Browse Source 
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
parent d9b7f29590 5811122619
commit d0d2a100bd
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/living/silicon/robot/robot_movement.dm
View File

@@ -23,10 +23,10 @@
return tally+config.robot_delay return tally+config.robot_delay
// NEW: Use power while moving. // NEW: Use power while moving.
/mob/living/silicon/robot/Move() /mob/living/silicon/robot/SelfMove(turf/n, direct)
if (!is_component_functioning("actuator")) if (!is_component_functioning("actuator"))
return return 0
var/datum/robot_component/actuator/A = get_component("actuator") var/datum/robot_component/actuator/A = get_component("actuator")
if (cell_use_power(A.active_usage)) if (cell_use_power(A.active_usage))
..() return ..()

5
code/modules/mob/mob_movement.dm
View File

@@ -316,7 +316,7 @@
else if(mob.confused) else if(mob.confused)
step(mob, pick(cardinal)) step(mob, pick(cardinal))
else else
. = ..() . = mob.SelfMove(n, direct)
moving = 0 moving = 0
@@ -324,6 +324,9 @@
return return
/mob/proc/SelfMove(turf/n, direct)
return Move(n, direct)
///Process_Grab() ///Process_Grab()
///Called by client/Move() ///Called by client/Move()