Merge pull request #11629 from Seris02/nomoreblowingborgs

stops hijackers from being able to remotely blow up borgs (probably)
2020-03-27 21:23:54 -07:00
parent ee28bbf4ee 17f4b0f34f
commit 39e2ae7d1f
1 changed files with 8 additions and 5 deletions
@@ -11,16 +11,19 @@

 /obj/machinery/computer/robotics/proc/can_control(mob/user, mob/living/silicon/robot/R)
 	if(!istype(R))
-		return 0
+		return FALSE
 	if(isAI(user))
 		if (R.connected_ai != user)
-			return 0
+			return FALSE
 	if(iscyborg(user))
 		if (R != user)
-			return 0
+			return FALSE
 	if(R.scrambledcodes)
-		return 0
-	return 1
+		return FALSE
+	if (hasSiliconAccessInArea(user) && !issilicon(user))
+		if (!Adjacent(user))
+			return FALSE
+	return TRUE

 /obj/machinery/computer/robotics/ui_interact(mob/user)
 	. = ..()