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

2021-03-20 14:13:23 -07:00
parent 957c1fcc5d a970c73960
commit 5b2a42f254
202 changed files with 6640 additions and 4867 deletions
@@ -243,6 +243,17 @@
 	icon_state = "shieldsparkles"
 	duration = 5

+/obj/effect/temp_visual/voidpush
+	name = "eldritch energy"
+	icon_state = "emark4"
+	duration = 5
+
+/obj/effect/temp_visual/voidswap
+	name = "altered space"
+	icon = 'icons/mob/mob.dmi'
+	icon_state = "voidalter"
+	duration = 5
+
 /obj/effect/temp_visual/telekinesis
 	name = "telekinetic force"
 	icon_state = "empdisable"