From 0850cd8ba49ce546dea3bdbfdadf6e040eed1571 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Sat, 12 May 2012 16:40:26 +0100 Subject: [PATCH] Prevents chameleon effects from entering teleporters, hotfix for mobs being deleted. --- code/game/machinery/teleporter.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 1fec2e76069..82b19052d4a 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -130,6 +130,10 @@ O.show_message("\red Failure: Cannot authenticate locked on coordinates. Please reinstate coordinate matrix.") return if (istype(M, /atom/movable)) + if (istype(M, /obj/effect/dummy/chameleon)) + for(var/mob/C in M) + C << "\red The projection field prevents you from entering!" + return if(prob(5) && !accurate) //oh dear a problem, put em in deep space do_teleport(M, locate(rand(5, world.maxx - 5), rand(5, world.maxy - 5), 3), 2) else