Merge remote-tracking branch 'citadel/master' into combat_v7

This commit is contained in:
silicons
2021-03-20 14:13:23 -07:00
202 changed files with 6640 additions and 4867 deletions
@@ -21,6 +21,9 @@
multiplicative_slowdown = 1.5
priority = 50
/datum/movespeed_modifier/status_effect/domain
multiplicative_slowdown = 3
/datum/movespeed_modifier/status_effect/tased/no_combat_mode
multiplicative_slowdown = 8
priority = 100