From 9956dce898af670f7477ab62c184f81bbbd449bc Mon Sep 17 00:00:00 2001 From: Geeves Date: Tue, 15 Dec 2020 23:18:50 +0200 Subject: [PATCH] Z Level Pull Fix Fix (#10793) --- code/controllers/subsystems/falling.dm | 2 +- html/changelogs/geeves-z_level_pull_fix_fix.yml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/geeves-z_level_pull_fix_fix.yml diff --git a/code/controllers/subsystems/falling.dm b/code/controllers/subsystems/falling.dm index af9daf1328e..3343bbf13ef 100644 --- a/code/controllers/subsystems/falling.dm +++ b/code/controllers/subsystems/falling.dm @@ -80,7 +80,7 @@ // fall_collateral if the next turf is not open space. if (isopenturf(victim.loc) && victim.loc:is_hole) victim.forceMove(below) - if(victim.pulledby) + if(victim.pulledby && victim.pulledby.z != victim.z) var/mob/M = victim.pulledby M.stop_pulling() diff --git a/html/changelogs/geeves-z_level_pull_fix_fix.yml b/html/changelogs/geeves-z_level_pull_fix_fix.yml new file mode 100644 index 00000000000..14454de052e --- /dev/null +++ b/html/changelogs/geeves-z_level_pull_fix_fix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Pulling things down stairs will maintain the pull." \ No newline at end of file