From 24726c60fec6104f24b9ee3db58980414d2f8a6d Mon Sep 17 00:00:00 2001 From: Adrer Date: Thu, 2 May 2024 02:20:07 +0200 Subject: [PATCH] Moving pulled objects as a borg checks if the turf is adjacent to you. (#25253) * Move_Pulled now checks for adjacency of the turf you are moving something to. * Move comment to correct line. * Update code/modules/mob/mob_movement.dm Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: adrermail@gmail.com Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> --- code/modules/mob/mob_movement.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 633887228eb..1b1dfe10392 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -362,6 +362,9 @@ return if(!Process_Spacemove(get_dir(pulling.loc, A))) return + var/target_turf = get_step(pulling, get_dir(pulling.loc, A)) + if(!Adjacent(target_turf)) //Make sure the turf we are trying to pull to is adjacent to the user. + return if(ismob(pulling)) var/mob/M = pulling var/atom/movable/t = M.pulling