From 8a7e4e4ed5125b540f184b93c249e7f624c31b2c Mon Sep 17 00:00:00 2001 From: "petethegoat@gmail.com" Date: Sun, 9 Sep 2012 01:29:05 +0000 Subject: [PATCH] A little bit more away mission work. It should technically be playable. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4663 316c924e-a436-60f5-8080-3fe189b3f50e --- code/datums/helper_datums/teleport.dm | 2 ++ code/game/gamemodes/objective.dm | 2 +- code/game/machinery/teleporter.dm | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index 0297e902207..1f353e3e722 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -168,4 +168,6 @@ else teleatom.visible_message("\red The [teleatom] bounces off of the portal!") return 0 + if(destination.z > 7) + return 0 return 1 \ No newline at end of file diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 7d36eec0e48..d57791803a2 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)) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite + 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 return 1 return 0 return 1 diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index fc1c5606623..416e4e7dfbc 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -66,7 +66,7 @@ var/turf/T = get_turf(R) if (!T) continue - if(T.z == 2) + if(T.z == 2 || T.z > 7) continue var/tmpname = T.loc.name if(areaindex[tmpname])