diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index 3638ae128a..069e72b318 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -248,6 +248,12 @@ 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" diff --git a/code/modules/antagonists/eldritch_cult/eldritch_magic.dm b/code/modules/antagonists/eldritch_cult/eldritch_magic.dm index 0510130892..ce118c1cc9 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_magic.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_magic.dm @@ -830,7 +830,7 @@ continue living_mob.adjustBruteLoss(40) - do_teleport(user,targeted_turf,TRUE,no_effects = TRUE) + do_teleport(user,targeted_turf,0,TRUE,no_effects = TRUE,channel=TELEPORT_CHANNEL_MAGIC) /obj/effect/temp_visual/voidin icon = 'icons/effects/96x96.dmi' @@ -868,7 +868,7 @@ continue living_mob.adjustBruteLoss(30) - playsound(user,'sound/magic/voidblink.ogg',100) + playsound(user,'sound/magic/voidpull.ogg',75) new /obj/effect/temp_visual/voidin(user.drop_location()) for(var/mob/living/livies in view(7,user)-user) @@ -902,9 +902,12 @@ var/turf/targeted_turf = get_turf(target) var/turf/user_turf = get_turf(user) + new /obj/effect/temp_visual/voidswap(user.drop_location()) + new /obj/effect/temp_visual/voidswap(targeted_turf) + if(isliving(target)) - do_teleport(user,targeted_turf,0,TRUE,no_effects = TRUE) - do_teleport(target,user_turf,0,TRUE,no_effects = TRUE) + do_teleport(user,targeted_turf,0,TRUE,no_effects = TRUE,channel=TELEPORT_CHANNEL_MAGIC) + do_teleport(target,user_turf,0,TRUE,no_effects = TRUE,channel=TELEPORT_CHANNEL_MAGIC) /obj/effect/proc_holder/spell/pointed/boogie_woogie/can_target(atom/target, mob/user, silent) diff --git a/icons/mob/actions/actions_ecult.dmi b/icons/mob/actions/actions_ecult.dmi index 6118217d4a..483929e24e 100644 Binary files a/icons/mob/actions/actions_ecult.dmi and b/icons/mob/actions/actions_ecult.dmi differ diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi index 3d1cbfa273..5b5b9dd81d 100644 Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ diff --git a/sound/magic/voidpull.ogg b/sound/magic/voidpull.ogg new file mode 100644 index 0000000000..703d3d4a76 Binary files /dev/null and b/sound/magic/voidpull.ogg differ