From 9ea8169cb8b9ea4ea3aba257d95597959ef7b683 Mon Sep 17 00:00:00 2001 From: Rune Knight <30399783+Runian@users.noreply.github.com> Date: Sat, 2 Nov 2024 13:30:58 -0700 Subject: [PATCH] thanks icy --- .../carbon/xenomorph/castes/wraith/abilities_wraith.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/wraith/abilities_wraith.dm b/code/modules/mob/living/carbon/xenomorph/castes/wraith/abilities_wraith.dm index c907dbcbe8193..e7fd5cb65fa77 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/wraith/abilities_wraith.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/wraith/abilities_wraith.dm @@ -600,6 +600,14 @@ GLOBAL_LIST_INIT(wraith_banish_very_short_duration_list, typecacheof(list( var/mob/living/carbon/xenomorph/xeno_crosser = crosser if(xeno_crosser.m_intent == MOVE_INTENT_WALK) return + var/turf/other_portal_turf = get_turf(linked_portal) + for(var/thing in other_portal_turf.contents) + // Prevents the crossing if blocked by a vehicle. + // Without this, crossers would "move" to the vehicle which would cause a bump attack instead of a teleport to the other side. + // While some argue "skill issue" as vehicles could simply move off the portal, it was determined to be an exploit rather than a skill issue. + if(ishitbox(thing) || isvehicle(thing)) + return + COOLDOWN_START(linked_portal, portal_cooldown, 1) crosser.pass_flags &= ~PASS_MOB RegisterSignal(crosser, COMSIG_MOVABLE_MOVED, PROC_REF(do_teleport_atom))