From b42cfc6a61e2fe0867e7eab6aa0cd04fa71311f2 Mon Sep 17 00:00:00 2001 From: Heroman Date: Mon, 24 Aug 2020 07:46:41 +1000 Subject: [PATCH] Fixes turf slowdown not applying on non-water/snow turfs --- code/modules/mob/living/carbon/human/human_movement.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index df1242d007..492cc2aca3 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -133,8 +133,7 @@ if(feet.water_speed) turf_move_cost = CLAMP(turf_move_cost + feet.water_speed, HUMAN_LOWEST_SLOWDOWN, 15) . += turf_move_cost - - if(istype(T, /turf/simulated/floor/outdoors/snow)) + else if(istype(T, /turf/simulated/floor/outdoors/snow)) if(species.snow_movement) turf_move_cost = CLAMP(turf_move_cost + species.snow_movement, HUMAN_LOWEST_SLOWDOWN, 15) if(shoes) @@ -142,6 +141,9 @@ if(feet.water_speed) turf_move_cost = CLAMP(turf_move_cost + feet.snow_speed, HUMAN_LOWEST_SLOWDOWN, 15) . += turf_move_cost + else + turf_move_cost = CLAMP(turf_move_cost, HUMAN_LOWEST_SLOWDOWN, 15) + . += turf_move_cost // Wind makes it easier or harder to move, depending on if you're with or against the wind. if(T.outdoors && (T.z <= SSplanets.z_to_planet.len))