From 10b6b033a95c8d76abb91fd59f55e3989a4b4f7d Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sat, 6 Mar 2021 04:10:30 +0100 Subject: [PATCH] Hieroclub teleportation now uses do_teleport as it should. (#57431) Hieroclub teleportation now respects unteleportable mobs such as anchored AIs and megafauna. --- code/modules/mining/lavaland/necropolis_chests.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index e515a50ce46..81ba6010097 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -1297,8 +1297,7 @@ /obj/item/hierophant_club/proc/teleport_mob(turf/source, mob/M, turf/target, mob/user) var/turf/turf_to_teleport_to = get_step(target, get_dir(source, M)) //get position relative to caster - var/area/destination_area = turf_to_teleport_to.loc - if(!turf_to_teleport_to || turf_to_teleport_to.is_blocked_turf(TRUE) || destination_area.area_flags & NOTELEPORT) + if(!turf_to_teleport_to || turf_to_teleport_to.is_blocked_turf(TRUE)) return animate(M, alpha = 0, time = 2, easing = EASE_OUT) //fade out sleep(1) @@ -1308,7 +1307,7 @@ sleep(2) if(!M) return - M.forceMove(turf_to_teleport_to) + var/success = do_teleport(M, turf_to_teleport_to, no_effects = TRUE, channel = TELEPORT_CHANNEL_MAGIC) sleep(1) if(!M) return @@ -1317,7 +1316,7 @@ if(!M) return M.visible_message("[M] fades in!") - if(user != M) + if(user != M && success) log_combat(user, M, "teleported", null, "from [AREACOORD(source)]") /obj/item/hierophant_club/pickup(mob/living/user)