From e22fb02ef23e40ac973a3f75b3efc88a2157ce5d Mon Sep 17 00:00:00 2001
From: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Fri, 27 Oct 2023 21:18:39 +0200
Subject: [PATCH] Fixes zaps focusing APCs over everything* (#22991)

* The fix

* Extra performance
---
 .../power/engines/tesla/energy_ball.dm        | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/code/modules/power/engines/tesla/energy_ball.dm b/code/modules/power/engines/tesla/energy_ball.dm
index c1475ea7c9e..c7b5b8b2649 100644
--- a/code/modules/power/engines/tesla/energy_ball.dm
+++ b/code/modules/power/engines/tesla/energy_ball.dm
@@ -2,10 +2,10 @@
 #define TESLA_MINI_POWER 869130
 //Zap constants, speeds up targeting
 #define COIL (ROD + 1)
-#define ROD (APC + 1)
-#define APC (RIDE + 1)
+#define ROD (RIDE + 1)
 #define RIDE (LIVING + 1)
-#define LIVING (MACHINERY + 1)
+#define LIVING (APC + 1)
+#define APC (MACHINERY + 1)
 #define MACHINERY (BLOB + 1)
 #define BLOB (STRUCTURE + 1)
 #define STRUCTURE (1)
@@ -296,10 +296,6 @@
 			closest_type = ROD
 			closest_atom = A
 
-		else if(istype(A, /obj/machinery/power/apc))
-			closest_type = APC
-			closest_atom = A
-
 		else if(closest_type >= RIDE)
 			continue
 
@@ -318,6 +314,13 @@
 				closest_type = LIVING
 				closest_atom = A
 
+		else if(closest_type >= APC)
+			continue
+
+		else if(istype(A, /obj/machinery/power/apc))
+			closest_type = APC
+			closest_atom = A
+
 		else if(closest_type >= MACHINERY)
 			continue
 
@@ -385,9 +388,9 @@
 
 #undef COIL
 #undef ROD
-#undef APC
 #undef RIDE
 #undef LIVING
+#undef APC
 #undef MACHINERY
 #undef BLOB
 #undef STRUCTURE