From 57f016f83f21886fbe5aa68c82df406cdc00a455 Mon Sep 17 00:00:00 2001 From: atermonera Date: Sun, 20 Jan 2019 19:16:23 -0800 Subject: [PATCH] Allows borgs to move up and down with jetpacks --- code/modules/mob/living/silicon/robot/robot_movement.dm | 8 +++++--- code/modules/multiz/movement.dm | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_movement.dm b/code/modules/mob/living/silicon/robot/robot_movement.dm index 5ea383aaa6..f8637e9a78 100644 --- a/code/modules/mob/living/silicon/robot/robot_movement.dm +++ b/code/modules/mob/living/silicon/robot/robot_movement.dm @@ -6,9 +6,11 @@ /mob/living/silicon/robot/Process_Spacemove() if(module) for(var/obj/item/weapon/tank/jetpack/J in module.modules) - if(J && istype(J, /obj/item/weapon/tank/jetpack)) - if(J.allow_thrust(0.01)) return 1 - if(..()) return 1 + if(istype(J, /obj/item/weapon/tank/jetpack)) + if(J.allow_thrust(0.01)) + return 1 + if(..()) + return 1 return 0 //No longer needed, but I'll leave it here incase we plan to re-use it. diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index 1a184b034f..e701cda021 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -130,7 +130,7 @@ return TRUE if(Process_Spacemove()) //Checks for active jetpack - return FALSE + return TRUE for(var/turf/simulated/T in trange(1,src)) //Robots get "magboots" if(T.density)