From 953bdd97558ec17d5b92eae96d9e4183df967dd7 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Sat, 16 Dec 2023 20:48:39 +0100 Subject: [PATCH] pulled objects follow on Z level change in space --- code/modules/multiz/movement.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index 288b84798c..4312e38f57 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -134,10 +134,18 @@ if(!Move(destination)) return 0 if(isliving(src)) + var/list/atom/movable/pulling = list() + var/mob/living/L = src + if(L.pulling && !L.pulling.anchored) + pulling |= L.pulling + for(var/obj/item/weapon/grab/G in list(L.l_hand, L.r_hand)) + pulling |= G.affecting if(direction == UP) src.audible_message("[src] moves up.") else if(direction == DOWN) src.audible_message("[src] moves down.") + for(var/atom/movable/P in pulling) + P.forceMove(destination) return 1 /mob/proc/can_overcome_gravity()