new stuff

control.lua

@@ -43,6 +43,23 @@ function walkabout(player_name, distance)
 		game.player.print("This command moved to /walkabout.")
 end
 
+--[[
+tp_players = {}
+
+function tp_mode(boolean)	
+	tp_players[game.player.index] = boolean	
+end
+
+local function put_item(event)
+	local index = event.player_index
+	if tp_players[index] then
+		game.players[index].teleport(event.position)		
+	end
+end
+
+Event.register(defines.events.on_put_item, put_item )
+
+--]]
 
 Event.register(defines.events.on_player_created, player_joined)
 Event.register(defines.events.on_player_respawned, player_respawned)

map_layout.lua

@@ -10,6 +10,11 @@ in this file and your run_*type*_module(event) function will be called.
 --require "locale.gen_combined.island_resort"
 
 --grilledham's maps
+<<<<<<< HEAD
+=======
+--MAP_GEN = require "locale.gen_combined.grilledham_map_gen.presets.test"
+--MAP_GEN = require "locale.gen_combined.grilledham_map_gen.presets.picture_test"
+>>>>>>> new stuff
 --MAP_GEN = require "locale.gen_combined.grilledham_map_gen.presets.creation_of_adam"
 
 --shapes--