mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 04:30:44 +01:00
Merge remote-tracking branch 'skrat/master' into upstream-aug-29
# Conflicts: # .github/CODEOWNERS # .github/workflows/ci_suite.yml # README.md # code/controllers/subsystem/processing/quirks.dm # code/modules/antagonists/space_ninja/space_ninja.dm # code/modules/client/preferences/middleware/quirks.dm # code/modules/jobs/job_types/head_of_security.dm # code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm # code/modules/research/techweb/all_nodes.dm # code/modules/vehicles/sealed.dm # modular_skyrat/modules/automapper/code/area_spawn_subsystem.dm # modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm # modular_skyrat/modules/veteran_players/code/veteran_players.dm
This commit is contained in:
@@ -205,6 +205,13 @@
|
||||
add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/simplemob_varspeed, multiplicative_slowdown = speed)
|
||||
SEND_SIGNAL(src, POST_BASIC_MOB_UPDATE_VARSPEED)
|
||||
|
||||
/mob/living/basic/update_movespeed()
|
||||
. = ..()
|
||||
if (cached_multiplicative_slowdown > END_GLIDE_SPEED)
|
||||
ADD_TRAIT(src, TRAIT_NO_GLIDE, SPEED_TRAIT)
|
||||
else
|
||||
REMOVE_TRAIT(src, TRAIT_NO_GLIDE, SPEED_TRAIT)
|
||||
|
||||
/mob/living/basic/relaymove(mob/living/user, direction)
|
||||
if(user.incapacitated())
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user