From de5d1f6120ff444c0d5b48d7e37fcd7d525d7331 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Thu, 27 Aug 2020 16:56:43 -0700 Subject: [PATCH 1/2] Merge pull request #7554 from Heroman3003/turfslow 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 0d6766b7a3..3f633c262d 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -151,8 +151,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) @@ -160,6 +159,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. // I don't like that so I'm commenting it out :)