ports #44155 from /tg/station

This commit is contained in:
Rob Bailey
2019-08-24 20:21:44 -05:00
committed by Linzolle
parent 62e931c62d
commit 5e94a5db80
12 changed files with 261 additions and 166 deletions
@@ -1,3 +1,4 @@
<<<<<<< HEAD
/mob/living/Moved()
. = ..()
update_turf_movespeed(loc)
@@ -25,3 +26,11 @@
add_movespeed_modifier(MOVESPEED_ID_LIVING_TURF_SPEEDMOD, TRUE, 100, override = TRUE, multiplicative_slowdown = T.slowdown)
else
remove_movespeed_modifier(MOVESPEED_ID_LIVING_TURF_SPEEDMOD)
/mob/living/proc/update_pull_movespeed()
if(pulling && isliving(pulling))
var/mob/living/L = pulling
if(drag_slowdown && !(L.mobility_flags & MOBILITY_STAND) && !L.buckled && grab_state < GRAB_AGGRESSIVE)
add_movespeed_modifier(MOVESPEED_ID_PRONE_DRAGGING, multiplicative_slowdown = PULL_PRONE_SLOWDOWN)
return
remove_movespeed_modifier(MOVESPEED_ID_PRONE_DRAGGING)