From 37d1136ffa0681c14dff1910b778c6d2f42e12a8 Mon Sep 17 00:00:00 2001 From: Geeves Date: Mon, 21 Aug 2023 22:35:07 +0200 Subject: [PATCH] Multi-Tile Projectile Fix (#17123) * Multi-Tile Projectile Fix * cl typo fix --- code/modules/projectiles/projectile.dm | 7 ++++--- html/changelogs/geeves-projectile_fixes.yml | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/geeves-projectile_fixes.yml diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index eb3b4324656..a6509195a1f 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -453,9 +453,10 @@ pixel_x = trajectory.return_px() pixel_y = trajectory.return_py() else - before_move() - step_towards(src, T) - after_move() + if(T != loc) + before_move() + Move(T) + after_move() if(!hitscanning) pixel_x = trajectory.return_px() - trajectory.mpx * trajectory_multiplier pixel_y = trajectory.return_py() - trajectory.mpy * trajectory_multiplier diff --git a/html/changelogs/geeves-projectile_fixes.yml b/html/changelogs/geeves-projectile_fixes.yml new file mode 100644 index 00000000000..8de4c3e9b88 --- /dev/null +++ b/html/changelogs/geeves-projectile_fixes.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Laser projectiles now properly travel through multi-tile airlocks." \ No newline at end of file