From 16604112c7899e7008a57c6d6f92ef65f71003ce Mon Sep 17 00:00:00 2001
From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date: Tue, 17 Jan 2023 01:55:01 +0000
Subject: [PATCH] Fixes airlock buttons (#20187)

---
 .../machinery/airlock_control/airlock_button.dm     | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/code/game/machinery/airlock_control/airlock_button.dm b/code/game/machinery/airlock_control/airlock_button.dm
index 4ad772aa8f0..eca032cb188 100644
--- a/code/game/machinery/airlock_control/airlock_button.dm
+++ b/code/game/machinery/airlock_control/airlock_button.dm
@@ -45,18 +45,19 @@ GLOBAL_LIST_EMPTY(all_airlock_access_buttons)
 /obj/machinery/access_button/attack_hand(mob/user)
 	add_fingerprint(user)
 
-	if(!powered(power_channel))
+	var/obj/machinery/airlock_controller/C = locateUID(controller_uid)
+	if(!C)
+		to_chat(user, "<span class='warning'>Could not communicate with controller.</span>")
+		return
+
+	if(!C.powered(C.power_channel))
+		to_chat(user, "<span class='warning'>No response from controller, possibly offline.</span>")
 		return
 
 	if(!allowed(user) && !user.can_advanced_admin_interact())
 		to_chat(user, "<span class='warning'>Access denied.</span>")
 		return
 
-	var/obj/machinery/airlock_controller/C = locateUID(controller_uid)
-	if(!C)
-		to_chat(user, "<span class='warning'>Could not communicate with controller.</span>")
-		return
-
 	C.handle_button(assigned_command)
 	flick("access_button_cycle", src)