Merge remote-tracking branch 'upstream/master' into motivation

2021-04-14 17:55:24 -04:00
parent bb047bd57e 4d797ab694
commit 20c190c17d
1616 changed files with 351906 additions and 333939 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"