Added maptools:chest into mod and tsm_pyramids

- Added node maptools:chest which is now used in tsm_pyramids
- Preparing merge conflicts

mods/maptools/default_nodes.lua

@@ -589,3 +589,17 @@ minetest.register_node("maptools:unbreakable_rail_power", {
 		},
 	},
 })
+
+local chestdef = minetest.registered_nodes["default:chest"]
+
+minetest.register_node("maptools:chest",{
+	description = "Chest",
+	tiles = chestdef.tiles,
+	stack_max = 1000,
+	paramtype2 = "facedir",
+	on_construct = chestdef.on_construct,
+	on_metadata_inventory_move = chestdef.on_metadata_inventory_move,
+	on_metadata_inventory_put  = chestdef.on_metadata_inventory_put,
+	on_metadata_inventory_take = chestdef.on_metadata_inventory_take,
+	groups = {unbreakable = 1},
+})

mods/tsm_pyramids/init.lua

@@ -18,7 +18,7 @@ local chest_stuff = {
 function pyramids.fill_chest(pos)
 	minetest.after(2, function()
 		local n = minetest.get_node(pos)
-		if n and n.name and n.name == "default:chest" then
+		if n and n.name and n.name == "maptools:chest" then
 			local meta = minetest.get_meta(pos)
 			local inv = meta:get_inventory()
 			inv:set_size("main", 8*4)

mods/tsm_pyramids/room.lua

@@ -35,6 +35,7 @@ local function replace(str,iy)
 	if iy == 0 and str == "s" then out = "tsm_pyramids:" str = "sun" end
 	if iy == 3 and str == "s" then out = "tsm_pyramids:" str = "men" end
 	if str == "a" then out = "" end
+	if str == "c" then out = "maptools:" end
 	return out..code[str]
 end