From 3ef252a2b933cd5e55cdf92e0bd70bde0a5a5e86 Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Mon, 16 Sep 2019 13:06:31 +1000
Subject: [PATCH 1/3] Fixes for real

---
 code/game/machinery/machinery.dm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index f10f2252d0c..4f4055c13ba 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -212,8 +212,11 @@ Class Procs:
 	return (stat & (NOPOWER | BROKEN | additional_flags))
 
 /obj/machinery/CanUseTopic(var/mob/user)
-	if(!interact_offline && (stat & (NOPOWER | BROKEN)))
+	if(!interact_offline && (stat & (NOPOWER | BROKEN)) || user.stat)
 		return STATUS_CLOSE
+	if(!isliving(user))
+		return STATUS_UPDATE
+	return STATUS_INTERACTIVE
 
 /obj/machinery/CouldUseTopic(var/mob/user)
 	..()

From 421dbe9ab81bf8a1edfbbd22288b65695411399a Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Mon, 16 Sep 2019 13:06:49 +1000
Subject: [PATCH 2/3] removes extra check

---
 code/game/machinery/machinery.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 4f4055c13ba..e1de02c28ac 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -212,7 +212,7 @@ Class Procs:
 	return (stat & (NOPOWER | BROKEN | additional_flags))
 
 /obj/machinery/CanUseTopic(var/mob/user)
-	if(!interact_offline && (stat & (NOPOWER | BROKEN)) || user.stat)
+	if(!interact_offline && (stat & (NOPOWER | BROKEN)))
 		return STATUS_CLOSE
 	if(!isliving(user))
 		return STATUS_UPDATE

From 536f7a946a4cb928c507afcc6ebaeb98969ab6bd Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sun, 15 Sep 2019 23:14:03 -0400
Subject: [PATCH 3/3] Update machinery.dm

---
 code/game/machinery/machinery.dm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index e1de02c28ac..5d2ed9a1743 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -214,9 +214,7 @@ Class Procs:
 /obj/machinery/CanUseTopic(var/mob/user)
 	if(!interact_offline && (stat & (NOPOWER | BROKEN)))
 		return STATUS_CLOSE
-	if(!isliving(user))
-		return STATUS_UPDATE
-	return STATUS_INTERACTIVE
+	return ..()
 
 /obj/machinery/CouldUseTopic(var/mob/user)
 	..()
@@ -459,4 +457,4 @@ Class Procs:
 	return
 
 /datum/proc/remove_visual(mob/M)
-	return
\ No newline at end of file
+	return