From 08e6e8f2e2e32559b598ad28b2e364e78af8df8c Mon Sep 17 00:00:00 2001 From: Giacomand Date: Mon, 9 Jun 2014 21:09:16 +0100 Subject: [PATCH] Finalized gravity bouncing. Conflicts: code/modules/mob/living/carbon/human/human_movement.dm --- code/modules/mob/living/carbon/human/human_movement.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 0c9295e9128..09b45f61871 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -79,10 +79,7 @@ if(((!check_drift) || (check_drift && J.stabilization_on)) && (!lying) && (J.allow_thrust(0.01, src))) inertia_dir = 0 return 1 -// if(!check_drift && J.allow_thrust(0.01, src)) -// return 1 - - //If no working jetpack then use the other checks + //If no working jetpack or magboots then use the other checks if(..()) return 1 return 0