Merge branch 'teleport_trap_fix' into 'master'

Teleport trap fix

teleport on teleport traps happens at the end of the tick so items on them can be picked up

game/modules/tome/data/general/traps/teleport.lua

@@ -32,7 +32,7 @@ newEntity{ base = "TRAP_TELEPORT",
 	message = "@Target@ is teleported away.",
 	pressure_trap = true,
 	triggered = function(self, x, y, who)
-		who:teleportRandom(x, y, 100)
+		game:onTickEnd(function()who:teleportRandom(x, y, 100)end)
 		return true
 	end
 }