shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3870 from Citadel-Station-13/upstream-merge-32530

Browse Source 
[MIRROR] Makes editing movements delay configs have an effect again
This commit is contained in:
LetterJay
2017-11-11 12:37:59 -06:00
committed by GitHub
parent a3ba99a7e8 5a1d0d706a
commit fc04d94a29
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/mob/living/living.dm
View File

@@ -479,21 +479,21 @@
if(isopenturf(loc) && !is_flying())
var/turf/open/T = loc
. += T.slowdown
var/static/config_run_delay
var/static/config_walk_delay
var/static/datum/config_entry/number/run_delay/config_run_delay
var/static/datum/config_entry/number/walk_delay/config_walk_delay
if(isnull(config_run_delay))
config_run_delay = CONFIG_GET(number/run_delay)
config_walk_delay = CONFIG_GET(number/walk_delay)
if(ignorewalk)
. += config_run_delay
. += config_run_delay.value_cache
else
switch(m_intent)
if(MOVE_INTENT_RUN)
if(drowsyness > 0)
. += 6
. += config_run_delay
. += config_run_delay.value_cache
if(MOVE_INTENT_WALK)
. += config_walk_delay
. += config_walk_delay.value_cache
/mob/living/proc/makeTrail(turf/target_turf, turf/start, direction)
if(!has_gravity())