cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8859 from VOREStation/upstream-merge-7554

Browse Source 
[MIRROR] Fixes turf slowdown not applying on non-water/snow turfs
This commit is contained in:
Novacat
2020-08-28 00:17:58 -04:00
committed by GitHub
parent 2dabf37c56 b371cc9ac5
commit e370fda424
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

@@ -151,8 +151,7 @@
if(feet.water_speed) if(feet.water_speed)
turf_move_cost = CLAMP(turf_move_cost + feet.water_speed, HUMAN_LOWEST_SLOWDOWN, 15) turf_move_cost = CLAMP(turf_move_cost + feet.water_speed, HUMAN_LOWEST_SLOWDOWN, 15)
. += turf_move_cost . += turf_move_cost
else if(istype(T, /turf/simulated/floor/outdoors/snow))
if(istype(T, /turf/simulated/floor/outdoors/snow))
if(species.snow_movement) if(species.snow_movement)
turf_move_cost = CLAMP(turf_move_cost + species.snow_movement, HUMAN_LOWEST_SLOWDOWN, 15) turf_move_cost = CLAMP(turf_move_cost + species.snow_movement, HUMAN_LOWEST_SLOWDOWN, 15)
if(shoes) if(shoes)
@@ -160,6 +159,9 @@
if(feet.water_speed) if(feet.water_speed)
turf_move_cost = CLAMP(turf_move_cost + feet.snow_speed, HUMAN_LOWEST_SLOWDOWN, 15) turf_move_cost = CLAMP(turf_move_cost + feet.snow_speed, HUMAN_LOWEST_SLOWDOWN, 15)
. += turf_move_cost . += 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. // 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 :) // I don't like that so I'm commenting it out :)