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

This commit is contained in:
kevinz000
2020-05-24 15:03:06 -07:00
1045 changed files with 21989 additions and 11144 deletions
+2 -1
View File
@@ -24,7 +24,8 @@
variable = TRUE
/datum/movespeed_modifier/damage_slowdown_flying
movetypes = FLOATING
movetypes = FLYING
blacklisted_movetypes = FLOATING
variable = TRUE
/datum/movespeed_modifier/equipment_speedmod