From b3e367c778d486f2875c77d7e4f13e112013c096 Mon Sep 17 00:00:00 2001
From: PsiOmega <git@psiomega.se>
Date: Tue, 20 Jan 2015 11:22:58 +0100
Subject: [PATCH] Fixes  #7879.

Can now enable/disable turrets through a turret controller again.
Adds missing checks to prevent abuse.
---
 code/game/machinery/portable_turret.dm |  7 ++++++-
 code/game/machinery/turret_control.dm  | 13 ++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 603fc9fe98..7497edd695 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -154,6 +154,12 @@
 		user << "<span class='notice'>There seems to be a firewall preventing you from accessing this device.</span>"
 		return 0
 
+	if (get_dist(src, user) > 0 && !issilicon(user))
+		user << "<span class='notice'>You are too far away.</span>"
+		user.unset_machine()
+		user << browse(null, "window=turretid")
+		return 0
+
 	if(locked && !issilicon(user))
 		user << "<span class='notice'>Access denied.</span>"
 		return 0
@@ -175,7 +181,6 @@
 				<TT><B>Automatic Portable Turret Installation</B></TT><BR><BR>
 				Status: []<BR>
 				Behaviour controls are [locked ? "locked" : "unlocked"]"},
-
 				"<A href='?src=\ref[src];power=1'>[on ? "On" : "Off"]</A>" )
 
 	if(!locked || issilicon(user))
diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm
index ce2a3b73ad..41a98103be 100644
--- a/code/game/machinery/turret_control.dm
+++ b/code/game/machinery/turret_control.dm
@@ -66,15 +66,20 @@
 	return
 
 /obj/machinery/turretid/proc/can_use(mob/user)
+	if(ailock && issilicon(user))
+		user << "<span class='notice'>There seems to be a firewall preventing you from accessing this device.</span>"
+		return 0
+
 	if (get_dist(src, user) > 0 && !issilicon(user))
 		user << "<span class='notice'>You are too far away.</span>"
 		user.unset_machine()
 		user << browse(null, "window=turretid")
 		return 0
 
-	if(ailock && issilicon(user))
-		user << "<span class='notice'>There seems to be a firewall preventing you from accessing this device.</span>"
+	if(locked && !issilicon(user))
+		user << "<span class='notice'>Access denied.</span>"
 		return 0
+
 	return 1
 
 /obj/machinery/turretid/attackby(obj/item/weapon/W, mob/user)
@@ -124,7 +129,9 @@
 	if (!istype(loc, /area))
 		return
 	var/area/area = loc
-	var/dat = ""
+	var/dat = text({"Status: []<BR>
+				Behaviour controls are [locked ? "locked" : "unlocked"]"},
+				"<A href='?src=\ref[src];operation=toggleon'>[enabled ? "On" : "Off"]</A>" )
 
 	if(!locked || issilicon(user))
 		dat += text({"<BR><BR>