From 40cf3ab656d3a53636e1620b2e999b808e7d9e10 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Mon, 4 Dec 2017 16:22:24 -0500 Subject: [PATCH] Update robot_movement.dm --- .../living/silicon/robot/robot_movement.dm | 29 ------------------- 1 file changed, 29 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_movement.dm b/code/modules/mob/living/silicon/robot/robot_movement.dm index 8959c8245b..a1f0dbf4be 100644 --- a/code/modules/mob/living/silicon/robot/robot_movement.dm +++ b/code/modules/mob/living/silicon/robot/robot_movement.dm @@ -1,31 +1,3 @@ -<<<<<<< HEAD -/mob/living/silicon/robot/Process_Spacemove(movement_dir = 0) - if(ionpulse()) - return 1 - return ..() - -/mob/living/silicon/robot/movement_delay() - . = ..() - var/static/config_robot_delay - if(isnull(config_robot_delay)) - config_robot_delay = CONFIG_GET(number/robot_delay) - . += speed + config_robot_delay - -/mob/living/silicon/robot/mob_negates_gravity() - return magpulse - -/mob/living/silicon/robot/mob_has_gravity() - return ..() || mob_negates_gravity() - -/mob/living/silicon/robot/experience_pressure_difference(pressure_difference, direction) - if(!magpulse) - return ..() - -/mob/living/silicon/robot/Moved() - . = ..() - if(riding_datum) - riding_datum.on_vehicle_move() -======= /mob/living/silicon/robot/Process_Spacemove(movement_dir = 0) if(ionpulse()) return 1 @@ -47,4 +19,3 @@ /mob/living/silicon/robot/experience_pressure_difference(pressure_difference, direction) if(!magpulse) return ..() ->>>>>>> 5182128... refactors riding datums to a component, vehicle refactor staging for mech overhaul (#32249)