From 7f444532329d435393c04adef48918fb78941ca8 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Fri, 30 Mar 2018 03:27:26 -0500 Subject: [PATCH] Being buckled to an object means space wind wont pull you (#36783) * Being buckled to an object means space wind wont pull you * Puts check in the proper place --- code/modules/mob/living/living.dm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 63ea389ebb..55019dbefc 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -618,23 +618,25 @@ return pick("trails_1", "trails_2") /mob/living/experience_pressure_difference(pressure_difference, direction, pressure_resistance_prob_delta = 0) - if (client && client.move_delay >= world.time + world.tick_lag*2) + if(buckled) + return + if(client && client.move_delay >= world.time + world.tick_lag*2) pressure_resistance_prob_delta -= 30 var/list/turfs_to_check = list() - if (has_limbs) + if(has_limbs) var/turf/T = get_step(src, angle2dir(dir2angle(direction)+90)) if (T) turfs_to_check += T T = get_step(src, angle2dir(dir2angle(direction)-90)) - if (T) + if(T) turfs_to_check += T - for (var/t in turfs_to_check) + for(var/t in turfs_to_check) T = t - if (T.density) + if(T.density) pressure_resistance_prob_delta -= 20 continue for (var/atom/movable/AM in T)