From f6f6a4ef875503e534750b6d34db171ce3947dbb Mon Sep 17 00:00:00 2001 From: ccomp5950 Date: Wed, 9 Dec 2015 17:17:33 -0500 Subject: [PATCH] Ninjas teleporter: Checks Z levels and distance. Ninjas are able to use a camera console and teleport across the map. This resolves that. --- code/modules/clothing/spacesuits/rig/modules/ninja.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/clothing/spacesuits/rig/modules/ninja.dm b/code/modules/clothing/spacesuits/rig/modules/ninja.dm index 1ab6067793..96cf6a113a 100644 --- a/code/modules/clothing/spacesuits/rig/modules/ninja.dm +++ b/code/modules/clothing/spacesuits/rig/modules/ninja.dm @@ -121,6 +121,11 @@ if(T.contains_dense_objects()) H << "You cannot teleport to a location with solid objects." + return 0 + + if(T.z != H.z || get_dist(T, get_turf(H)) > world.view) + H << "You cannot teleport to such a distant object." + return 0 phase_out(H,get_turf(H)) H.forceMove(T)