From 8952eb3e960eb26bef6b5edbe7fff399b7385663 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Tue, 12 May 2020 07:45:00 -0700 Subject: [PATCH] WOOPS --- code/__DEFINES/subsystems.dm | 2 +- code/modules/projectiles/projectile.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 06781b087c..405119c0ab 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -115,8 +115,8 @@ #define FIRE_PRIORITY_PARALLAX 65 #define FIRE_PRIORITY_NPC 80 #define FIRE_PRIORITY_MOBS 100 -#define FIRE_PRIORITY_PROJECTILES 100 #define FIRE_PRIORITY_TGUI 110 +#define FIRE_PRIORITY_PROJECTILES 200 #define FIRE_PRIORITY_TICKER 200 #define FIRE_PRIORITY_ATMOS_ADJACENCY 300 #define FIRE_PRIORITY_CHAT 400 diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 252fb5c540..a4bdd917b1 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -545,8 +545,8 @@ pixel_x = trajectory.return_px() pixel_y = trajectory.return_py() else if(T != loc) - var/safety = CEILING(pixel_increment_amount / world.icon_size, 1) * 2 - while(T.loc != loc) + var/safety = CEILING(pixel_increment_amount / world.icon_size, 1) * 2 + 1 + while(T != loc) if(!--safety) CRASH("Projectile took more than pixel incrememnt speed times 2 to get to its location, this is probably something seriously scuffed going on.") step_towards(src, T)