diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index d57791803a2..c35c48bcd94 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -51,7 +51,7 @@ datum/objective/assassinate
check_completion()
if(target && target.current)
- if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 7) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
+ if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 6) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
return 1
return 0
return 1
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index ee1969bb181..17014060e8b 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -28,6 +28,9 @@
attack_hand(var/mob/user as mob)
+ if (src.z > 6)
+ user << "\red Unable to establish a connection: \black You're too far away from the station!"
+ return
if(stat & (NOPOWER|BROKEN)) return
if(!isAI(user))
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 419f269b852..1d7fccfc403 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -43,6 +43,9 @@
/obj/machinery/computer/communications/Topic(href, href_list)
if(..())
return
+ if (src.z > 6)
+ usr << "\red Unable to establish a connection: \black You're too far away from the station!"
+ return
usr.machine = src
if(!href_list["operation"])
@@ -274,6 +277,9 @@
/obj/machinery/computer/communications/attack_hand(var/mob/user as mob)
if(..())
return
+ if (src.z > 6)
+ user << "\red Unable to establish a connection: \black You're too far away from the station!"
+ return
user.machine = src
var/dat = "Communications Console"
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
index e9d9f703871..b1df0eca0d3 100644
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -41,6 +41,9 @@
Topic(href, href_list)
if(..()) return
+ if (src.z > 6)
+ usr << "\red Unable to establish a connection: \black You're too far away from the station!"
+ return
if( href_list["close"] )
usr << browse(null, "window=crewcomp")
usr.machine = null
diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm
index 7d2ba43783b..b7cab9c4353 100644
--- a/code/game/machinery/computer/law.dm
+++ b/code/game/machinery/computer/law.dm
@@ -25,6 +25,9 @@
attackby(obj/item/weapon/O as obj, mob/user as mob)
+ if (user.z > 6)
+ user << "\red Unable to establish a connection: \black You're too far away from the station!"
+ return
if(istype(O, /obj/item/weapon/aiModule))
var/obj/item/weapon/aiModule/M = O
M.install(src)
diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm
index e3f51ce211b..31d77f6362b 100644
--- a/code/game/machinery/computer/robot.dm
+++ b/code/game/machinery/computer/robot.dm
@@ -28,6 +28,9 @@
/obj/machinery/computer/robotics/attack_hand(var/mob/user as mob)
if(..())
return
+ if (src.z > 6)
+ user << "\red Unable to establish a connection: \black You're too far away from the station!"
+ return
user.machine = src
var/dat
if (src.temp)
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index d74f398706b..5b4b04230d8 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -41,6 +41,9 @@
/obj/machinery/computer/secure_data/attack_hand(mob/user as mob)
if(..())
return
+ if (src.z > 6)
+ user << "\red Unable to establish a connection: \black You're too far away from the station!"
+ return
var/dat
if (temp)