cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 01:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7554 from Heroman3003/turfslow

Browse Source 
Fixes turf slowdown not applying on non-water/snow turfs
This commit is contained in:
Atermonera
2020-08-27 16:56:43 -07:00
committed by GitHub
parent 2064750ea2 b42cfc6a61
commit cfbf5d10b4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/living/carbon/human/human_movement.dm
View File

@@ -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))