Conveyor movement refactor/fix

code/game/atoms_movable.dm

@@ -621,4 +621,8 @@
 			chosen_langtype = langtype
 			highest_priority = pri
 
-	. = chosen_langtype
+	. = chosen_langtype
+/atom/movable/proc/ConveyorMove(movedir)
+	set waitfor = FALSE
+	if(!anchored && has_gravity())
+		step(src, movedir)

code/game/objects/effects/effects.dm

@@ -47,6 +47,9 @@
 	qdel(src)
 	return 0
 
+/obj/effect/ConveyorMove()
+	return
+
 /obj/effect/abstract/ex_act(severity, target)
 	return
 

code/game/objects/items/weapons/tanks/jetpack.dm

@@ -191,7 +191,7 @@
 
 //Return a jetpack that the mob can use
 //Back worn jetpacks, hardsuit internal packs, and so on.
-//Used in Process_Spacemove() and wherever you want to check for/get a jetpack
+//Used in Process_Spacemove() and wherever you want to check for/get a jetpack	
 
 /mob/proc/get_jetpack()
 	return
@@ -207,3 +207,9 @@
 		var/obj/item/clothing/suit/space/hardsuit/C = wear_suit
 		J = C.jetpack
 	return J
+
+/mob/has_gravity(turf/T)
+	var/obj/item/weapon/tank/jetpack/J = get_jetpack()
+	if(J && J.on)
+		return FALSE
+	return ..()