Conveyor movement refactor/fix

This commit is contained in:
CitadelStationBot
2017-04-21 17:28:09 -05:00
parent fc1fd4b72b
commit 1a93abc66e
7 changed files with 26 additions and 7 deletions
+3
View File
@@ -47,6 +47,9 @@
qdel(src)
return 0
/obj/effect/ConveyorMove()
return
/obj/effect/abstract/ex_act(severity, target)
return
@@ -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 ..()