cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 03:27:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update robot_movement.dm

Browse Source
This commit is contained in:
Novacat
2020-02-17 01:29:20 -05:00
committed by GitHub
parent 8e7476087d
commit 5ea36b7a60
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot_movement.dm
-3
View File
@@ -32,8 +32,6 @@
var/datum/robot_component/actuator/A = get_component("actuator")
if (cell_use_power(A.active_usage))
return ..()
<<<<<<< HEAD
=======
/mob/living/silicon/robot/Move(a, b, flag)
@@ -84,4 +82,3 @@
if(isturf(tile))
B.gather_all(tile, src, 1) //Shhh, unless the bag fills, don't spam the borg's chat with stuff that's going on every time they move!
return
>>>>>>> a862d55... Fixes mining borg ore box movement on sand with a mining satchel equipped (#6693)