Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""

This reverts commit 27a099c6bf.
2020-10-11 00:53:18 +02:00
parent 27a099c6bf
commit 4ccf40f775
207 changed files with 8589 additions and 3508 deletions
@@ -515,3 +515,12 @@
 /obj/effect/temp_visual/dir_setting/space_wind/Initialize(mapload, set_dir, set_alpha = 255)
 	. = ..()
 	alpha = set_alpha
+
+/obj/effect/temp_visual/slime_puddle
+	icon = 'icons/mob/mob.dmi'
+	duration = 12
+	icon_state = "to_puddle"
+
+/obj/effect/temp_visual/slime_puddle/reverse
+	icon_state = "from_puddle"
+	duration = 7