- Fixed a potential problem where the random teleportation thing that teleporters have a chance of doing would teleport you to a tile that is behind the transition edge.

- Fixed issue 470. You can now teleport while using the chameleon projector.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4466 316c924e-a436-60f5-8080-3fe189b3f50e

code/datums/helper_datums/teleport.dm

@@ -48,7 +48,7 @@
 
 	//must succeed in most cases
 	proc/setTeleatom(atom/movable/ateleatom)
-		if(istype(ateleatom, /obj/effect))
+		if(istype(ateleatom, /obj/effect) && !istype(ateleatom, /obj/effect/dummy/chameleon))
 			del(ateleatom)
 			return 0
 		if(istype(ateleatom))

code/game/machinery/teleporter.dm

@@ -133,7 +133,7 @@
 		return
 	if (istype(M, /atom/movable))
 		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)
+			do_teleport(M, locate(rand((2*TRANSITIONEDGE), world.maxx - (2*TRANSITIONEDGE)), rand((2*TRANSITIONEDGE), world.maxy - (2*TRANSITIONEDGE)), 3), 2)
 		else
 			do_teleport(M, com.locked) //dead-on precision
 	else

code/game/objects/devices/chameleonproj.dm

@@ -86,7 +86,7 @@
 			spawn(8) del(T)
 		else
 			playsound(src, 'pop.ogg', 100, 1, 1)
-			var/obj/O = new saved_item (src)
+			var/obj/O = new saved_item(src)
 			if(!O) return
 			var/obj/effect/dummy/chameleon/C = new/obj/effect/dummy/chameleon(usr.loc)
 			C.name = O.name