Allows borgs to move up and down with jetpacks

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.

code/modules/multiz/movement.dm

@@ -142,7 +142,11 @@
 		return 0
 
 	if(Process_Spacemove()) //Checks for active jetpack
+<<<<<<< HEAD
 		return 1
+=======
+		return TRUE
+>>>>>>> 12489df... Merge pull request #5889 from Atermonera/jetborg
 
 	for(var/turf/simulated/T in trange(1,src)) //Robots get "magboots"
 		if(T.density)