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

2020-10-10 22:23:22 -07:00
parent 1b1efce556 376f59c8cd
commit 7f611a98e1
215 changed files with 7532 additions and 2391 deletions
@@ -18,3 +18,7 @@
 	blacklisted_movetypes = (FLOATING|CRAWLING)
 	variable = TRUE
 	flags = IGNORE_NOSLOW
+
+/datum/movespeed_modifier/slime_puddle
+	multiplicative_slowdown = 2
+	flags = IGNORE_NOSLOW