Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
3 changes: 3 additions & 0 deletions code/game/atoms_movable.dm
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,9 @@
if(has_gravity(src))
return TRUE

if(pulledby && (pulledby.pulledby != src || moving_from_pull))
return TRUE

if(throwing)
return TRUE

Expand Down
8 changes: 2 additions & 6 deletions code/modules/mob/living/carbon/carbon_movement.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
return

/mob/living/carbon/Process_Spacemove(movement_dir = 0)
if(!.)
. = ..()
if(!isturf(loc))
return FALSE
// Do we have a jetpack implant (and is it on)?
Expand All @@ -38,12 +40,6 @@
if((movement_dir || J.stabilizers) && J.allow_thrust(0.01, src))
. = TRUE

if(!.)
. = ..()
if(!. && pulledby) // If it still returned false
pulledby.stop_pulling()
return TRUE

/mob/living/carbon/Move(NewLoc, direct)
. = ..()
if(. && !(movement_type & FLOATING)) //floating is easy
Expand Down