fix name typo in github action

.luacheckrc

@@ -19,7 +19,6 @@ read_globals = {
 	"xpanes",
 	"screwdriver",
 	"minetest",
-	"mesecon",
+	"mesecon"
-	"unifieddyes"
 
 }

README.md

@@ -4,13 +4,11 @@
 
 ![](https://github.com/D00Med/scifi_nodes/workflows/luacheck/badge.svg)
 ![](https://github.com/D00Med/scifi_nodes/workflows/integration-test/badge.svg)
-[![ContentDB](https://content.minetest.net/packages/D00Med/scifi_nodes/shields/downloads/)](https://content.minetest.net/packages/D00Med/scifi_nodes/)
 
 Minetest mod that adds scifi themed blocks, doors, materials, plants and other assets.
 
-# Changelog
+# Changes log
 
-* Added support for unifieddyes
 * 14/08/2019 : retrocompatibility fixed (aliases in doors.lua)
 * 13/08/2019 :
   * added mod option doors_open_with_mesecon_only (default = false)
@@ -45,13 +43,9 @@ CC0
 
 # Contributors:
 
-* D00Med https://github.com/D00Med (creator)
 * tanmayameher https://github.com/tanmayameher
-* BuckarooBanzay https://github.com/BuckarooBanzay
+* naturefreshmilk https://github.com/naturefreshmilk
 * acmgit https://github.com/acmgit
 * catz85 https://github.com/catz85
 * coil0 https://github.com/coil0
 * Grossam https://github.com/Grossam
-* OgelGames https://github.com/OgelGames
-* leftshift https://github.com/leftshift
-* fluxionary https://github.com/fluxionary

chest.lua

@@ -43,7 +43,7 @@ minetest.register_node("scifi_nodes:crate", {
 	groups = {cracky = 1, oddly_breakable_by_hand = 2, fuel = 8},
 	legacy_facedir_simple = true,
 	is_ground_content = false,
-	sounds = scifi_nodes.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults(),
 
 	after_dig_node = drop_chest_stuff(),
 	on_construct = function(pos)
@@ -82,7 +82,7 @@ minetest.register_node("scifi_nodes:box", {
 	groups = {cracky = 1},
 	legacy_facedir_simple = true,
 	is_ground_content = false,
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.node_sound_metal_defaults(),
 
 	after_dig_node = drop_chest_stuff(),
 	on_construct = function(pos)

crafts.lua

@@ -1,24 +1,14 @@
 -- CRAFTING RECIPES FOR SCIFI NODES
 
-if minetest.get_modpath("basic_materials") then
+-- 6 basic plastic from 9 homedecor plastic sheet
-    -- 6 basic plastic from 9 homedecor plastic sheet
+minetest.register_craft({
-    minetest.register_craft({
 	output = "scifi_nodes:white2 6",
 	recipe = {
 		{"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"},
 		{"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"},
 		{"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"}
 	}
-    })
+})
-end
-
-if not minetest.get_modpath("default") or not minetest.get_modpath("dye") then
-    -- the default and dye mod are required for most of the recipes
-    -- if either of them is missing (because we are not in the default game)
-    -- then just skip the recipes entirely
-    -- TODO: potentially switch recipes depending on current game
-    return
-end
 
 minetest.register_craft({
 	output = "scifi_nodes:super_white",
@@ -777,16 +767,6 @@ minetest.register_craft({
     }
 })
 
--- 4 green light bar from 4 green metal, 2 green dye, 1 lightbar
-minetest.register_craft({
-    output = "scifi_nodes:greenbar_animated 4",
-    recipe = {
-        {"scifi_nodes:greenbar", "", "scifi_nodes:greenbar"},
-        {"", "mesecons:wire_00000000_off", ""},
-        {"scifi_nodes:greenbar", "", "scifi_nodes:greenbar"}
-    }
-})
-
 -- 4 green metal block from 4 green metal
 minetest.register_craft({
     output = "scifi_nodes:green_square 4",
@@ -1109,22 +1089,6 @@ minetest.register_craft({
     }
 })
 
--- wet metal plant pot from dry metal plant pot
-minetest.register_craft({
-    output = "scifi_nodes:pot2",
-    recipe = {
-        {"scifi_nodes:pot", "bucket:bucket_water"}
-    },
-    replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}}
-})
-
--- dry metal plant pot from wet metal plant pot
-minetest.register_craft({
-	type = "cooking",
-	output = "scifi_nodes:pot",
-	recipe = "scifi_nodes:pot2",
-})
-
 -- 6 itemholder from 2 dented metal block and 1 plastic
 minetest.register_craft({
     output = "scifi_nodes:itemholder 6",
@@ -1318,13 +1282,10 @@ minetest.register_craft({
 })
 
 -- https://forum.minetest.net/viewtopic.php?f=10&t=13125&p=261481#p261481
--- with modified recipe
 minetest.register_craft({
-    output = 'scifi_nodes:windowpanel',
+    output = 'scifi_nodes:windowpanel 4',
     recipe = {
-        {"scifi_nodes:glass_pane","scifi_nodes:glass_pane",""},
+        {"scifi_nodes:glass","",""}
-        {"scifi_nodes:glass_pane","scifi_nodes:glass_pane",""},
-        {"","",""}
     }
 })
 
@@ -1719,7 +1680,7 @@ minetest.register_craft({
 minetest.register_craft({
     output = 'scifi_nodes:stripes2top 3',
     recipe = {
-        {"scifi_nodes:black","scifi_nodes:black","scifi_nodes:black"},
+        {"scifi_nodes:black","scifi_noedes:black","scifi_nodes:black"},
         {"default:silver_sand","default:silver_sand","default:silver_sand"}
     }
 })
@@ -1731,3 +1692,4 @@ minetest.register_craft({
         {"scifi_nodes:stripes"}
     }
 })
+

digicode.lua

@@ -122,14 +122,14 @@ minetest.register_node("scifi_nodes:digicode_on", {
 	paramtype2 = "wallmounted",
 	light_source = 5,
 	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1, mesecon_needs_receiver = 1},
-	drop = "scifi_nodes:digicode_off",
+	drop = {items = {"scifi_nodes:digicode_off"}},
 	mesecons = {
 		receptor = {
 			state = (has_mesecons and mesecon.state.on)
 		}
 	},
 	on_timer = toggle_digicode,
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:digicode_off", {
@@ -152,7 +152,7 @@ minetest.register_node("scifi_nodes:digicode_off", {
 	},
 	after_place_node = set_owner,
 	on_rightclick = show_digicode_formspec,
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_craft({

init.lua

@@ -4,30 +4,19 @@ scifi_nodes = {}
 
 local MP = minetest.get_modpath("scifi_nodes")
 
-
-dofile(MP.."/sounds.lua")
-
 if minetest.get_modpath("xpanes") then
 	dofile(MP.."/panes.lua")
 end
 
 dofile(MP.."/common.lua")
-
+dofile(MP.."/builder.lua")
-if minetest.get_modpath("default") then
+dofile(MP.."/chest.lua")
-	-- only load builder and chest if the default mod is available
-	-- the formspecs depend on it
-	dofile(MP.."/builder.lua")
-	dofile(MP.."/chest.lua")
-end
-
 dofile(MP.."/plants.lua")
 dofile(MP.."/nodes.lua")
 dofile(MP.."/doors.lua")
-dofile(MP.."/switch.lua")
+dofile(MP.."/switches.lua")
-dofile(MP.."/protected_switch.lua")
 dofile(MP.."/nodeboxes.lua")
 dofile(MP.."/palm_scanner.lua")
 dofile(MP.."/digicode.lua")
 dofile(MP.."/models.lua")
-dofile(MP.."/octagon_panes.lua")
 dofile(MP.."/crafts.lua")

mod.conf

@@ -1,15 +1,4 @@
 name = scifi_nodes
 description = Minetest mod that adds scifi themed blocks, doors, materials, plants and other assets.
-optional_depends = """
+depends = default,dye
-default,
+optional_depends = xpanes,mesecons,moreblocks,mesecons_microcontroller,mesecons_button,mesecons_torch,mesecons_receiver,basic_materials
-xpanes,
-mesecons,
-moreblocks,
-mesecons_microcontroller,
-mesecons_button,
-mesecons_torch,
-mesecons_receiver,
-basic_materials,
-dye
-unifieddyes
-"""

models.lua

@@ -29,7 +29,6 @@ minetest.register_node("scifi_nodes:slope_"..name, {
 		},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = "clip",
 	light_source = light,
 	groups = {cracky=1},
 	on_place = minetest.rotate_node
@@ -39,7 +38,7 @@ end
 -- register some blocks in stairsplus if available (part of moreblocks)
 scifi_nodes.register_slope("white2", "Plastic", {"scifi_nodes_white2.png",}, 0)
 scifi_nodes.register_slope("super_white", "Super Plastic", {"scifi_nodes_super_white.png",}, 11)
-scifi_nodes.register_slope("ultra_white", "Super Plastic", {"scifi_nodes_ultra_white.png",}, minetest.LIGHT_MAX)
+scifi_nodes.register_slope("ultra_white", "Super Plastic", {"scifi_nodes_ultra_white.png",}, default.LIGHT_MAX)
 scifi_nodes.register_slope("black", "Black", {"scifi_nodes_black.png",}, 0)
 scifi_nodes.register_slope("white", "White", {"scifi_nodes_white.png",}, 0)
 scifi_nodes.register_slope("grey", "Grey", {"scifi_nodes_grey.png",}, 0)
@@ -54,8 +53,8 @@ scifi_nodes.register_slope("holes", "Holes", {"scifi_nodes_holes.png",}, 0)
 scifi_nodes.register_slope("pipe", "Pipe", {"scifi_nodes_pipe.png",}, 0)
 scifi_nodes.register_slope("stripes", "Stripes", {"scifi_nodes_stripes.png",}, 0)
 scifi_nodes.register_slope("screen", "Screen", {"scifi_nodes_screen3.png",}, 5)
-scifi_nodes.register_slope("lightstripe", "Lightstripe", {"scifi_nodes_lightstripe.png",}, minetest.LIGHT_MAX)
+scifi_nodes.register_slope("lightstripe", "Lightstripe", {"scifi_nodes_lightstripe.png",}, default.LIGHT_MAX)
-scifi_nodes.register_slope("blight2", "Blue Light 2", {"scifi_nodes_capsule3.png",}, minetest.LIGHT_MAX)
+scifi_nodes.register_slope("blight2", "Blue Light 2", {"scifi_nodes_capsule3.png",}, default.LIGHT_MAX)
 scifi_nodes.register_slope("wallpipe", "Alien Pipe", {"scifi_nodes_wallpipe.png",}, 0)
 scifi_nodes.register_slope("alien", "Alien Wall", {"scifi_nodes_alnslp.png",}, 0)
 scifi_nodes.register_slope("purple", "Purple", {"scifi_nodes_purple.png",}, 0)
@@ -70,104 +69,106 @@ scifi_nodes.register_slope("blklt2", "Black stripe light", {"scifi_nodes_black_l
 local node = {}
 
 node.types = {
-	{"blue",      "blue lines"},
+	{"blue",      "blue lines",        "blue"},
-	{"holes",       "metal with holes"},
+	{"holes",       "metal with holes","holes"},
-	{"white2",      "plastic",},
+	{"white2",      "plastic",         "white2"},
-	{"super_white",      "Super Plastic", 11},
+    {"super_white",      "Super Plastic",         "super_white", 11},
-	{"ultra_white",      "Ultra Plastic", minetest.LIGHT_MAX},
+    {"ultra_white",      "Ultra Plastic",         "ultra_white", default.LIGHT_MAX},
 --	{"engine",      "engine",          "engine"},
-	{"wall",      "metal wall"},
+	{"wall",      "metal wall",        "wall"},
-	{"white",      "plastic wall"},
+	{"white",      "plastic wall",     "white"},
-	{"stripes2top",     "dirty metal block"},
+	{"stripes2top",     "dirty metal block","metal2"},
-	{"rough",      "rough metal"},
+	{"rough",      "rough metal",      "rough"},
-	{"lighttop",      "metal block"},
+	{"lighttop",      "metal block",      "metal"},
-	{"red",      "red lines"},
+	{"red",      "red lines",          "red"},
-	{"green",      "green lines"},
+	{"green",      "green lines",      "green"},
-	{"vent2",      "vent"},
+	{"vent2",      "vent",              "vent"},
-	{"stripes",      "hazard stripes"},
+	{"stripes",      "hazard stripes", "stripes"},
-	{"rust",      "rusty metal"},
+	{"rust",      "rusty metal",       "rust"},
-	{"mesh",      "metal mesh"},
+	{"mesh",      "metal mesh",       "mesh"},
-	{"black",      "black wall"},
+	{"black",      "black wall",       "black"},
-	{"blackoct",      "black octagon"},
+	{"blackoct",      "black octagon",       "blackoct"},
-	{"blackpipe",      "black pipe"},
+	{"blackpipe",      "black pipe",       "blackpipe"},
-	{"blacktile",      "black tile"},
+	{"blacktile",      "black tile",       "blktl"},
-	{"blacktile2",      "black tile 2"},
+	{"blacktile2",      "black tile 2",       "blktl2"},
-	{"blackvent",      "black vent"},
+	{"blackvent",      "black vent",       "blkvnt"},
-	{"bluebars",      "blue bars"},
+	{"bluebars",      "blue bars",       "bluebars"},
-	{"bluemetal",      "blue metal"},
+	{"bluemetal",      "blue metal",       "blumtl"},
-	{"bluetile",      "blue tile"},
+	{"bluetile",      "blue tile",       "blutl"},
-	{"greytile",      "grey tile"},
+	{"greytile",      "grey tile",       "grytl"},
-	{"mesh2",      "metal floormesh"},
+	{"mesh2",      "metal floormesh",       "mesh2"},
-	{"pipe",      "wall pipe"},
+	{"white",      "plastic wall",       "white"},
-	{"pipeside",      "side pipe"},
+	{"pipe",      "wall pipe",       "pipe2"},
-	{"tile",      "white tile"},
+	{"pipeside",      "side pipe",       "pipe3"},
-	{"whiteoct",      "white octagon"},
+	{"tile",      "white tile",       "tile"},
-	{"whitetile",      "white tile2"},
+	{"whiteoct",      "white octagon",       "whiteoct"},
-	{"black_detail",      "black detail"},
+	{"whitetile",      "white tile2",       "whttl"},
-	{"green_square",      "green metal block"},
+	{"black_detail",      "black detail",       "blckdtl"},
-	{"red_square",      "red metal block"},
+	{"green_square",      "green metal block",       "grnblck"},
-	{"grey_square",      "grey metal block"},
+	{"red_square",      "red metal block",       "redblck"},
-	{"blue_square",      "blue metal block"},
+	{"grey_square",      "grey metal block",       "greyblck"},
-	{"black_mesh",      "black vent block"},
+	{"blue_square",      "blue metal block",       "blublck"},
-	{"dent",      "dented metal block"},
+	{"black_mesh",      "black vent block",       "blckmsh"},
-	{"greenmetal",      "green metal wall"},
+	{"dent",      "dented metal block",       "dent"},
-	{"greenmetal2",      "green metal wall2"},
+	{"greenmetal",      "green metal wall",       "grnmetl"},
-	{"greenlights",      "green wall lights",       10},
+	{"greenmetal2",      "green metal wall2",       "grnmetl2"},
-	{"greenlights2",      "green wall lights2",     10},
+	{"greenlights",      "green wall lights",       "grnlt", 10},
-	{"greenbar",      "green light bar",            10},
+	{"greenlights2",      "green wall lights2",       "grnlt2", 10},
-	{"green2",      "green wall panel"},
+	{"greenbar",      "green light bar",       "grnlghtbr", 10},
-	{"greentubes",      "green pipes"},
+	{"green2",      "green wall panel",       "grn2"},
-	{"grey",      "grey wall"},
+	{"greentubes",      "green pipes",       "grntubes"},
-	{"greybolts",      "grey wall bolts"},
+	{"grey",      "grey wall",       "gry"},
-	{"greybars",      "grey bars"},
+	{"greybolts",      "grey wall bolts",       "gryblts"},
-	{"greydots",      "grey wall dots"},
+	{"greybars",      "grey bars",       "grybrs"},
-	{"greygreenbar",      "gray power pipe",        10},
+	{"greydots",      "grey wall dots",       "grydts"},
-	{"octofloor",      "Doom floor"},
+	{"greygreenbar",      "gray power pipe",       "grygrnbr", 10},
-	{"octofloor2",      "Brown Doom floor"},
+	{"octofloor",      "Doom floor",       "octofloor"},
-	{"doomwall1",      "Doom wall 1"},
+	{"octofloor2",      "Brown Doom floor",       "octofloor2"},
-	{"doomwall2",      "Doom wall 2"},
+	{"doomwall1",      "Doom wall 1",       "doomwall1"},
-	{"doomwall3",      "Doom wall 3"},
+	{"doomwall2",      "Doom wall 2",       "doomwall2"},
-	{"doomwall4",      "Doom wall 4"},
+	{"doomwall3",      "Doom wall 3",       "doomwall3"},
-	{"doomwall41",      "Doom wall 4.1"},
+	{"doomwall4",      "Doom wall 4",       "doomwall4"},
-	{"doomwall42",      "Doom wall 4.2"},
+	{"doomwall41",      "Doom wall 4.1",       "doomwall4.1"},
-	{"doomwall43",      "Doom wall 4.3"},
+	{"doomwall42",      "Doom wall 4.2",       "doomwall4.2"},
-	{"doomwall431",      "Doom wall 4.3.1"},
+	{"doomwall43",      "Doom wall 4.3",       "doomwall4.3"},
-	{"doomwall44",      "Doom wall 4.4"},
+	{"doomwall431",      "Doom wall 4.3.1",       "doomwall4.3.1"},
-	{"blackdmg",      "Damaged black wall"},
+	{"doomwall44",      "Doom wall 4.4",       "doomwall4.4"},
-	{"blackdmgstripe",      "Damaged black wall(stripes)"},
+	{"blackdmg",      "Damaged black wall",       "blckdmg"},
-	{"doomengine",      "Doom engine wall"},
+	{"blackdmgstripe",      "Damaged black wall(stripes)",       "blckdmgstripe"},
+	{"doomengine",      "Doom engine wall",       "doomengine"},
 --	{"monitorwall",      "Wall monitors",       "monitorwall"},
-	{"screen3",      "Wall monitor"},
+	{"screen3",      "Wall monitor",       "screen3"},
-	{"doomlight",      "Doom light",       12},
+	{"doomlight",      "Doom light",       "doomlight", 12},
-	{"bluwllight",      "Blue wall light", minetest.LIGHT_MAX},
+	{"bluwllight",      "Blue wall light", "capsule3", default.LIGHT_MAX},
-	{"bluegrid",      "Blue Grid", 5},
+	{"bluegrid",      "Blue Grid", "bluegrid", 5},
-	{"fan",      "Fan"},
+	{"fan",      "Fan",       "fan"},
-	{"ppllght",      "Purple wall light", minetest.LIGHT_MAX},
+	{"ppllght",      "Purple wall light", "", default.LIGHT_MAX},
-	{"pplwll",      "Purple wall"},
+	{"pplwll",      "Purple wall", "", 0},
-	{"pplwll2",      "Purple wall2"},
+	{"pplwll2",      "Purple wall2", "", 0},
-	{"pplwll3",      "Purple wall3"},
+	{"pplwll3",      "Purple wall3", "", 0},
-	{"pplwll4",      "Purple wall4"},
+	{"pplwll4",      "Purple wall4", "", 0},
-	{"pplblk",      "Purple tile"},
+	{"pplblk",      "Purple tile", "", 0},
-	{"purple",      "Purple node"},
+	{"purple",      "Purple node", "", 0},
-	{"rock",      "Moonstone"},
+	{"rock",      "Moonstone", "", 0},
-	{"rock2",      "Moonstone2"},
+	{"rock2",      "Moonstone2", "", 0},
-	{"blackvnt",      "Black vent"},
+	{"blackvnt",      "Black vent", "", 0},
-	{"blackplate",      "Black plate"},
+	{"blackplate",      "Black plate", "", 0},
 }
 
 if minetest.global_exists("stairsplus") then
+
 	for _, row in ipairs(node.types) do
 		local name = row[1]
-
+		local desc = row[2]
+		local light = row[4]
 		-- Node Definition
-		stairsplus:register_all("scifi_nodes", name, "scifi_nodes:"..name, {
+		stairsplus:register_all("scifi_nodes", row[1], "scifi_nodes:"..name, {
-			description = row[2],
+			description = desc,
 			tiles = {"scifi_nodes_"..name..".png"},
-			use_texture_alpha = "clip",
 			groups = {cracky=1},
 			paramtype = "light",
 			paramtype2 = "facedir",
-			light_source = row[3],
+			light_source = light,
 		})
 	end
 end

nodeboxes.lua

@@ -32,7 +32,7 @@ minetest.register_node("scifi_nodes:alienslope", {
 			{-0.125, 0.375, -0.5, 0.5, 0.5, 0.5}, -- NodeBox17
 		}
 	},
-	sounds = scifi_nodes.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults(),
 	on_place = minetest.rotate_node
 })
 
@@ -62,7 +62,7 @@ minetest.register_node("scifi_nodes:wallpipe", {
 			{-0.5, -0.125, 0, 0.5, 0, 0.0625}, -- NodeBox24
 		}
 	},
-	sounds = scifi_nodes.node_sound_wood_defaults()
+	sounds = default.node_sound_wood_defaults()
 })
 
 minetest.register_node("scifi_nodes:plant_trap", {
@@ -91,7 +91,7 @@ minetest.register_node("scifi_nodes:plant_trap", {
 			{-0.0625, -0.5, 0.3125, 0, 0.5, 0.375}, -- NodeBox28
 		}
 	},
-	sounds = scifi_nodes.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults(),
 })
 
 minetest.register_node("scifi_nodes:egg", {
@@ -122,7 +122,7 @@ minetest.register_node("scifi_nodes:egg", {
 			{-0.125, 0.75, -0.125, 0.125, 0.8125, 0.125}, -- NodeBox8
 			{-0.375, -0.3125, -0.4375, 0.375, 0.3125, 0.4375}, -- NodeBox9
 		},
-	sounds = scifi_nodes.node_sound_wood_defaults()
+	sounds = default.node_sound_wood_defaults()
 	}
 })
 
@@ -151,8 +151,7 @@ minetest.register_node("scifi_nodes:pad", {
 	paramtype = "light",
 	groups = {cracky=1, oddly_breakable_by_hand=1},
 	light_source = 5,
-    after_place_node = function(pos, placer, itemstack, pointed_thing)
+	on_construct = function(pos, node, placer)
-        local placer_name = placer:get_player_name()
 		local meta = minetest.get_meta(pos)
 		if position1 == nil then
 			position1 = pos
@@ -161,11 +160,10 @@ minetest.register_node("scifi_nodes:pad", {
 			position2 = pos
 			meta:set_int("type", 2)
 		else
-			minetest.chat_send_player(placer_name, "There can only be two teleportation pads at a time!")
+			minetest.chat_send_all("There can only be two teleportation pads at a time!")
 		end
 	end,
 	on_rightclick = function(pos, node, clicker)
-        local clicker_name = clicker:get_player_name()
 		local meta = minetest.get_meta(pos)
 		if meta:get_int("type") == 1 and position2 ~= nil and position1 ~= nil then
 		minetest.add_particlespawner(
@@ -238,12 +236,12 @@ minetest.register_node("scifi_nodes:pad", {
 		elseif position1 == nil and meta:get_int("type") ~= 2 then
 		position1 = pos
 		meta:set_int("type", 1)
-		minetest.chat_send_player(clicker_name, "Teleporter 1 connected at "..minetest.pos_to_string(pos))
+		minetest.chat_send_all("Teleporter 1 connected at "..minetest.pos_to_string(pos))
 		elseif position2 == nil and meta:get_int("type") ~= 1 then
 		position2 = pos
 		meta:set_int("type", 2)
-		minetest.chat_send_player(clicker_name, "Teleporter 2 connected at "..minetest.pos_to_string(pos))
+		minetest.chat_send_all("Teleporter 2 connected at "..minetest.pos_to_string(pos))
-		else minetest.chat_send_player(clicker_name, "Teleporter error!")
+		else minetest.chat_send_all("Teleporter error!")
 		end
 	end,
 	on_destruct = function(pos, oldnode, placer)
@@ -264,7 +262,7 @@ minetest.register_node("scifi_nodes:pad", {
 			{-0.875, -0.5, -0.8125, 0.8125, -0.375, 0.8125}, -- NodeBox3
 			{-0.8125, -0.5, -0.75, 0.75, -0.3125, 0.75}, -- NodeBox4
 		},
-	sounds = scifi_nodes.node_sound_wood_defaults()
+	sounds = default.node_sound_wood_defaults()
 	}
 })
 
@@ -281,9 +279,9 @@ minetest.register_node("scifi_nodes:pplwndw", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	groups = {cracky=3},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -304,11 +302,11 @@ minetest.register_node("scifi_nodes:gloshroom", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	light_source = minetest.LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	walkable = false,
 	buildable_to = true,
 	sunlight_propagates = false,
-	use_texture_alpha = "blend",
+	use_texture_alpha =  true,
 	groups = {fleshy=1, oddly_breakable_by_hand=1, dig_immediate=3},
 	node_box = {
 		type = "fixed",
@@ -324,64 +322,50 @@ minetest.register_node("scifi_nodes:gloshroom", {
 })
 
 minetest.register_node("scifi_nodes:pot_lid", {
-	description = "Plant Pot Lid",
+	description = "plant pot lid(place above plant)",
 	tiles = {
+		"scifi_nodes_glass2.png",
+		"scifi_nodes_glass2.png",
+		"scifi_nodes_glass2.png",
+		"scifi_nodes_glass2.png",
+		"scifi_nodes_glass2.png",
 		"scifi_nodes_glass2.png"
 	},
 	inventory_image = "scifi_nodes_pod_inv.png",
 	wield_image = "scifi_nodes_pod_inv.png",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	drawtype = "nodebox",
 	paramtype = "light",
-	groups = {not_in_creative_inventory = 1},
+	groups = {cracky=1, not_in_creative_inventory=1},
 	sunlight_propagates = true,
-	diggable = false,
-	drop = "",
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.5, -1.5, -0.5, 0.5, -0.25, 0.5}
+		fixed = {0, 0, 0, 0, 0, 0}
+	},
+	collision_box = {
+		type = "fixed",
+		fixed = {-0.5, -1.5, -0.5, 0.5, -0.5, 0.5}
 	},
 	node_box = {
 		type = "fixed",
 		fixed = {
-			{-0.4375, -1.5, -0.4375, 0.4375, -0.5, -0.375},
+			{-0.1875, -0.5625, -0.1875, 0.1875, -0.5, 0.1875}, -- NodeBox13
-			{-0.4375, -1.5, 0.375, 0.4375, -0.5, 0.4375},
+			{-0.25, -0.625, -0.25, 0.25, -0.5625, 0.25}, -- NodeBox14
-			{-0.4375, -1.5, -0.375, -0.375, -0.5, 0.375},
+			{-0.3125, -0.6875, -0.3125, 0.3125, -0.625, 0.3125}, -- NodeBox15
-			{0.375, -1.5, -0.375, 0.4375, -0.5, 0.375},
+			{-0.375, -0.75, -0.375, 0.375, -0.6875, 0.375}, -- NodeBox16
-			{-0.375, -0.5, -0.375, 0.375, -0.4375, 0.375},
+			{-0.4375, -0.75, 0.375, 0.4375, -1.5, 0.4375}, -- NodeBox17
-			{-0.3125, -0.4375, -0.3125, 0.3125, -0.375, 0.3125},
+			{-0.4375, -0.75, -0.4375, 0.4375, -1.5, -0.375}, -- NodeBox18
-			{-0.25, -0.375, -0.25, 0.25, -0.3125, 0.25},
+			{0.375, -0.75, -0.4375, 0.4375, -1.5, 0.4375}, -- NodeBox19
-			{-0.1875, -0.3125, -0.1875, 0.1875, -0.25, 0.1875}
+			{-0.4375, -0.75, -0.4375, -0.375, -1.5, 0.4375}, -- NodeBox20
 		}
 	},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
-local function toggle_lid(pos, node, player, itemstack)
-	if not player or minetest.is_protected(pos, player:get_player_name()) then
-		return
-	end
-	local lid_pos = {x = pos.x, y = pos.y+2 , z = pos.z}
-	local lid_node = minetest.get_node(lid_pos)
-	if lid_node.name == "scifi_nodes:pot_lid" then
-		minetest.set_node(lid_pos, {name = "air"})
-	elseif lid_node.name == "air" then
-		minetest.set_node(lid_pos, {name = "scifi_nodes:pot_lid"})
-	end
-end
-
-local function remove_lid(pos)
-	local lid_pos = {x = pos.x, y = pos.y+2 , z = pos.z}
-	local lid_node = minetest.get_node(lid_pos)
-	if lid_node.name == "scifi_nodes:pot_lid" then
-		minetest.set_node(lid_pos, {name = "air"})
-	end
-end
-
 minetest.register_node("scifi_nodes:pot", {
-	description = "Metal Plant Pot (right-click for lid, sneak + right-click to plant)",
+	description = "metal plant pot (right click for lid, shift+rightclick to plant)",
 	tiles = {
-		"default_dirt.png^scifi_nodes_pot.png",
+		"scifi_nodes_pot.png",
 		"scifi_nodes_greybolts.png",
 		"scifi_nodes_greybolts.png",
 		"scifi_nodes_greybolts.png",
@@ -390,30 +374,34 @@ minetest.register_node("scifi_nodes:pot", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	groups = {cracky = 1, soil = 1, sand = 1},
+	groups = {cracky=1, soil=1, sand=1},
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}
-	},
 	node_box = {
 		type = "fixed",
 		fixed = {
-			{-0.5, -0.25, -0.5, 0.5, 0.5, 0.5},
+			{-0.5, -0.25, -0.5, 0.5, 0.5, 0.5}, -- NodeBox1
-			{0.1875, -0.5, 0.1875, 0.5, -0.25, 0.5},
+			{0.1875, -0.5, 0.1875, 0.5, -0.25, 0.5}, -- NodeBox2
-			{-0.5, -0.5, -0.5, -0.1875, -0.25, -0.1875},
+			{-0.5, -0.5, -0.5, -0.1875, -0.25, -0.1875}, -- NodeBox3
-			{-0.5, -0.5, 0.1875, -0.1875, -0.25, 0.5},
+			{-0.5, -0.5, 0.1875, -0.1875, -0.25, 0.5}, -- NodeBox4
-			{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}
+			{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}, -- NodeBox5
 		}
 	},
-	on_rightclick = toggle_lid,
+	on_rightclick = function(pos, node, clicker, item, _)
-	on_destruct = remove_lid,
+		local lid_node = minetest.get_node({x=pos.x, y=pos.y+2, z=pos.z})
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+		if lid_node.name == "scifi_nodes:pot_lid" then
+			minetest.set_node({x=pos.x, y=pos.y+2, z=pos.z}, {name="air", param2=lid_node.param2})
+		elseif lid_node.name ~= "scifi_nodes:pot_lid" and node.name == "air" then
+			minetest.set_node({x=pos.x, y=pos.y+2, z=pos.z}, {name="scifi_nodes:pot_lid", param2=lid_node.param2})
+		end
+	end,
+	on_destruct = function(pos, node, _)
+		minetest.remove_node({x=pos.x, y=pos.y+2, z=pos.z})
+	end
 })
 
 minetest.register_node("scifi_nodes:pot2", {
-	description = "Metal Plant Pot Wet (right-click for lid, sneak + right-click to plant)",
+	description = "metal wet plant pot(right click for lid, shift+rightclick to plant)",
 	tiles = {
-		"default_dirt.png^scifi_nodes_pot2.png",
+		"scifi_nodes_pot.png^[colorize:black:100",
 		"scifi_nodes_greybolts.png",
 		"scifi_nodes_greybolts.png",
 		"scifi_nodes_greybolts.png",
@@ -422,24 +410,28 @@ minetest.register_node("scifi_nodes:pot2", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	groups = {cracky = 1, soil = 3, wet = 1},
+	groups = {cracky=1, soil=3, wet=1},
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}
-	},
 	node_box = {
 		type = "fixed",
 		fixed = {
-			{-0.5, -0.25, -0.5, 0.5, 0.5, 0.5},
+			{-0.5, -0.25, -0.5, 0.5, 0.5, 0.5}, -- NodeBox1
-			{0.1875, -0.5, 0.1875, 0.5, -0.25, 0.5},
+			{0.1875, -0.5, 0.1875, 0.5, -0.25, 0.5}, -- NodeBox2
-			{-0.5, -0.5, -0.5, -0.1875, -0.25, -0.1875},
+			{-0.5, -0.5, -0.5, -0.1875, -0.25, -0.1875}, -- NodeBox3
-			{-0.5, -0.5, 0.1875, -0.1875, -0.25, 0.5},
+			{-0.5, -0.5, 0.1875, -0.1875, -0.25, 0.5}, -- NodeBox4
-			{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}
+			{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}, -- NodeBox5
 		}
 	},
-	on_rightclick = toggle_lid,
+	on_rightclick = function(pos, node, clicker, item, _)
-	on_destruct = remove_lid,
+		local lid_node = minetest.get_node({x=pos.x, y=pos.y+2, z=pos.z})
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+		if lid_node.name == "scifi_nodes:pot_lid" then
+			minetest.set_node({x=pos.x, y=pos.y+2, z=pos.z}, {name="air", param2=lid_node.param2})
+		elseif lid_node.name ~= "scifi_nodes:pot_lid" and node.name == "air" then
+			minetest.set_node({x=pos.x, y=pos.y+2, z=pos.z}, {name="scifi_nodes:pot_lid", param2=lid_node.param2})
+		end
+	end,
+	on_destruct = function(pos, node, _)
+		minetest.remove_node({x=pos.x, y=pos.y+2, z=pos.z})
+	end
 })
 
 minetest.register_node("scifi_nodes:lightbar", {
@@ -451,7 +443,7 @@ minetest.register_node("scifi_nodes:lightbar", {
 	paramtype = "light",
 	paramtype2 = "wallmounted",
 	sunlight_propagates = true,
-	light_source = minetest.LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -465,7 +457,7 @@ minetest.register_node("scifi_nodes:lightbar", {
 		}
 	},
 	groups = {cracky=1},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:light_dynamic", {
@@ -481,16 +473,10 @@ minetest.register_node("scifi_nodes:light_dynamic", {
 		type = "wallmounted",
 		fixed = {-0.5, -0.5, -0.5, -0.45, 0.5, 0.5}
 	},
-	node_box = {
-		type = "fixed",
-		fixed = {
-			fixed = {-0.5, -0.5, -0.5, -0.45, 0.5, 0.5}
-		}
-	},
 	paramtype2 = "wallmounted",
-	light_source = minetest.LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:ladder", {
@@ -520,7 +506,7 @@ minetest.register_node("scifi_nodes:ladder", {
 			{0.3125, -0.5, 0.0625, 0.4375, -0.375, 0.1875}, -- NodeBox25
 			{0.3125, -0.5, -0.1875, 0.4375, -0.375, -0.0625}, -- NodeBox26
 		},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	sounds = default.node_sound_metal_defaults()
 	},
 	paramtype2 = "wallmounted",
 	walkable = false,
@@ -535,8 +521,8 @@ minetest.register_node("scifi_nodes:lightbars", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
-	light_source = minetest.LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -547,7 +533,7 @@ minetest.register_node("scifi_nodes:lightbars", {
 		}
 	},
 	groups = {cracky=1},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:liquid_pipe", {
@@ -556,8 +542,8 @@ tiles = {{
 		name = "scifi_nodes_liquid.png",
 		animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 1.00},
 	}},
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
-	light_source = minetest.LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	drawtype = "nodebox",
 	sunlight_propagates = true,
 	paramtype = "light",
@@ -568,7 +554,7 @@ tiles = {{
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:liquid_pipe2", {
@@ -576,8 +562,8 @@ minetest.register_node("scifi_nodes:liquid_pipe2", {
 tiles = {
 		"scifi_nodes_orange.png",
 	},
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
-	light_source = minetest.LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	drawtype = "nodebox",
 	sunlight_propagates = true,
 	paramtype = "light",
@@ -588,7 +574,7 @@ tiles = {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:powered_stand", {
@@ -655,7 +641,7 @@ minetest.register_node("scifi_nodes:cover", {
 			{-0.3125, -0.375, -0.3125, 0.3125, -0.3125, 0.3125}, -- NodeBox6
 		}
 	},
-	sounds = scifi_nodes.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults(),
 	groups = {cracky=1, oddly_breakable_by_hand=1}
 })
 
@@ -760,7 +746,7 @@ minetest.register_node("scifi_nodes:table", {
 			{-0.0625, 0.25, -0.125, 0.0625, 0.4375, -0.0625}, -- NodeBox7
 		}
 	},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.node_sound_metal_defaults(),
 	groups = {cracky=1}
 })
 
@@ -860,7 +846,7 @@ minetest.register_node("scifi_nodes:windowcorner", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -876,7 +862,7 @@ minetest.register_node("scifi_nodes:windowcorner", {
 	},
 	groups = {cracky=1},
 	on_place = minetest.rotate_node,
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:windowstraight", {
@@ -891,7 +877,7 @@ minetest.register_node("scifi_nodes:windowstraight", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -903,7 +889,7 @@ minetest.register_node("scifi_nodes:windowstraight", {
 	},
 	groups = {cracky=1},
 	on_place = minetest.rotate_node,
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:windowcorner2", {
@@ -918,7 +904,7 @@ minetest.register_node("scifi_nodes:windowcorner2", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -934,7 +920,7 @@ minetest.register_node("scifi_nodes:windowcorner2", {
 	},
 	groups = {cracky=1},
 	on_place = minetest.rotate_node,
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:windowstraight2", {
@@ -949,7 +935,7 @@ minetest.register_node("scifi_nodes:windowstraight2", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -961,7 +947,7 @@ minetest.register_node("scifi_nodes:windowstraight2", {
 	},
 	groups = {cracky=1},
 	on_place = minetest.rotate_node,
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 
@@ -976,7 +962,7 @@ minetest.register_node("scifi_nodes:capsule", {
 		"scifi_nodes_capsule.png",
 		"scifi_nodes_capsule.png"
 	},
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -990,7 +976,7 @@ minetest.register_node("scifi_nodes:capsule", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	on_rightclick = function(pos, node, clicker, item, _)
 			minetest.set_node(pos, {name="scifi_nodes:capsule2", param2=node.param2})
 	end,
@@ -1006,7 +992,7 @@ minetest.register_node("scifi_nodes:capsule3", {
 		"scifi_nodes_capsule3.png",
 		"scifi_nodes_capsule3.png"
 	},
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -1020,7 +1006,7 @@ minetest.register_node("scifi_nodes:capsule3", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	on_rightclick = function(pos, node, clicker, item, _)
 			minetest.set_node(pos, {name="scifi_nodes:capsule", param2=node.param2})
 	end,
@@ -1036,7 +1022,7 @@ minetest.register_node("scifi_nodes:capsule2", {
 		"scifi_nodes_capsule2.png",
 		"scifi_nodes_capsule2.png"
 	},
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -1050,7 +1036,7 @@ minetest.register_node("scifi_nodes:capsule2", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	on_rightclick = function(pos, node, clicker, item, _)
 			minetest.set_node(pos, {name="scifi_nodes:capsule3", param2=node.param2})
 	end,
@@ -1080,7 +1066,7 @@ minetest.register_node("scifi_nodes:itemholder", {
 		}
 	},
 	groups = {cracky=1},
-	on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow,
+	on_rotate = screwdriver.disallow,
 	after_place_node = function(pos, placer, itemstack)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("owner",placer:get_player_name())
@@ -1092,9 +1078,10 @@ minetest.register_node("scifi_nodes:itemholder", {
 		local meta = minetest.get_meta(pos)
 		if name == meta:get_string("owner") or
 				minetest.check_player_privs(name, "protection_bypass") then
+			local wield_item = clicker:get_wielded_item():get_name()
 			local taken = item:take_item()
 			if taken and not taken:is_empty() then
-				minetest.add_item(pos, taken:to_string())
+				minetest.add_item(pos, wield_item)
 				return item
 			end
 		end
@@ -1124,11 +1111,11 @@ minetest.register_node("scifi_nodes:glassscreen", {
 		"scifi_nodes_glscrn.png",
 		"scifi_nodes_glscrn.png"
 	},
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
-	light_source = minetest.LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	sunlight_propagates = true,
 	node_box = {
 		type = "fixed",
@@ -1138,7 +1125,7 @@ minetest.register_node("scifi_nodes:glassscreen", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 
@@ -1210,7 +1197,7 @@ minetest.register_node("scifi_nodes:windowpanel", {
     },
     drawtype = "nodebox",
     paramtype = "light",
-    use_texture_alpha = "blend",
+    use_texture_alpha = true,
     sunlight_propagates = true,
     paramtype2 = "facedir",
     node_box = {
@@ -1221,5 +1208,5 @@ minetest.register_node("scifi_nodes:windowpanel", {
     },
     groups = {cracky=1},
     on_place = minetest.rotate_node,
-    sounds = scifi_nodes.node_sound_glass_defaults(),
+    sounds = default.node_sound_glass_defaults(),
 })

nodes.lua

@@ -35,7 +35,7 @@ minetest.register_node("scifi_nodes:rfloor", {
 	paramtype2 = "facedir",
 	light_source = 10,
 	groups = {cracky=1},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	sounds = default.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:bfloor", {
@@ -47,7 +47,7 @@ minetest.register_node("scifi_nodes:bfloor", {
 	paramtype2 = "facedir",
 	light_source = 10,
 	groups = {cracky=1},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	sounds = default.node_sound_metal_defaults()
 })
 
 
@@ -64,7 +64,7 @@ minetest.register_node("scifi_nodes:stripes2", {
 	},
 	paramtype = "light",
 	groups = {cracky=1},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	sounds = default.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:gblock", {
@@ -80,7 +80,7 @@ minetest.register_node("scifi_nodes:gblock", {
 	},
 	paramtype = "light",
 	groups = {cracky=1};
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	sounds = default.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:gblock2", {
@@ -97,7 +97,7 @@ minetest.register_node("scifi_nodes:gblock2", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {cracky=1},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	sounds = default.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:gblock3", {
@@ -114,7 +114,7 @@ minetest.register_node("scifi_nodes:gblock3", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {cracky=1},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	sounds = default.node_sound_metal_defaults()
 })
 
 
@@ -133,7 +133,7 @@ minetest.register_node("scifi_nodes:green_light", {
 	light_source = 10,
 	paramtype = "light",
 	groups = {cracky=1},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:red_light", {
@@ -150,7 +150,7 @@ minetest.register_node("scifi_nodes:red_light", {
 	light_source = 10,
 	paramtype = "light",
 	groups = {cracky=1},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:discs", {
@@ -166,7 +166,7 @@ minetest.register_node("scifi_nodes:discs", {
 	},
 	paramtype = "light",
 	groups = {cracky=1},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:disc", {
@@ -182,23 +182,6 @@ minetest.register_node("scifi_nodes:disc", {
 	groups = {cracky=1}
 })
 
-minetest.register_node("scifi_nodes:greenbar_animated", {
-	description = "animated green light bar",
-	sunlight_propagates = false,
-	tiles = {
-		"scifi_nodes_greenbar.png",
-		"scifi_nodes_greenbar.png", {
-			name="scifi_nodes_greenbar_animated.png",
-			animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.00},
-		}
-	},
-	paramtype = "light",
-	paramtype2 = "facedir",
-	groups = {cracky=1},
-	light_source = 10,
-	sounds = scifi_nodes.node_sound_glass_defaults(),
-	on_place = minetest.rotate_node
-})
 
 minetest.register_node("scifi_nodes:blink", {
 	description = "blinking light",
@@ -210,7 +193,7 @@ minetest.register_node("scifi_nodes:blink", {
 	paramtype = "light",
 	groups = {cracky=1},
 	light_source = 5,
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:black_lights", {
@@ -222,7 +205,7 @@ minetest.register_node("scifi_nodes:black_lights", {
 	}},
 	paramtype = "light",
 	groups = {cracky=1},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:black_screen", {
@@ -235,7 +218,7 @@ minetest.register_node("scifi_nodes:black_screen", {
 	paramtype = "light",
 	groups = {cracky=1},
 	light_source = 1,
-	sounds = scifi_nodes.node_sound_stone_defaults()
+	sounds = default.node_sound_stone_defaults()
 })
 
 minetest.register_node("scifi_nodes:screen", {
@@ -248,7 +231,7 @@ minetest.register_node("scifi_nodes:screen", {
 	paramtype = "light",
 	groups = {cracky=1},
 	light_source = 5,
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:screen2", {
@@ -261,7 +244,7 @@ minetest.register_node("scifi_nodes:screen2", {
 	paramtype = "light",
 	groups = {cracky=1},
 	light_source = 5,
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 
@@ -280,7 +263,7 @@ minetest.register_node("scifi_nodes:white_pad", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {cracky=1},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:white_base", {
@@ -297,7 +280,7 @@ minetest.register_node("scifi_nodes:white_base", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {cracky=1},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:grnpipe", {
@@ -314,7 +297,7 @@ minetest.register_node("scifi_nodes:grnpipe", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {cracky=1},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.node_sound_metal_defaults(),
 	on_place = minetest.rotate_node
 })
 
@@ -333,7 +316,7 @@ minetest.register_node("scifi_nodes:grnpipe2", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {cracky=1},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.node_sound_metal_defaults(),
 	on_place = minetest.rotate_node
 })
 
@@ -346,10 +329,10 @@ minetest.register_node("scifi_nodes:octrng", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	light_source = 10,
 	groups = {cracky=2},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:octgrn", {
@@ -361,10 +344,10 @@ minetest.register_node("scifi_nodes:octgrn", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	light_source = 10,
 	groups = {cracky=2},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:octbl", {
@@ -376,10 +359,10 @@ minetest.register_node("scifi_nodes:octbl", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	light_source = 10,
 	groups = {cracky=2},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:octppl", {
@@ -391,10 +374,10 @@ minetest.register_node("scifi_nodes:octppl", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	light_source = 10,
 	groups = {cracky=2},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:tower", {
@@ -409,7 +392,7 @@ minetest.register_node("scifi_nodes:tower", {
 	inventory_image = "scifi_nodes_tower.png",
 	paramtype = "light",
 	groups = {cracky=2},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	sounds = default.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:junk", {
@@ -444,7 +427,7 @@ minetest.register_node("scifi_nodes:blumetlight", {
 	light_source = 10,
 	paramtype = "light",
 	groups = {cracky=1},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 
@@ -454,10 +437,10 @@ minetest.register_node("scifi_nodes:lightstp", {
 	tiles = {
 		"scifi_nodes_lightstripe.png"
 	},
-	light_source = minetest.LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	paramtype = "light",
 	groups = {cracky=1},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:blklt2", {
@@ -469,7 +452,7 @@ minetest.register_node("scifi_nodes:blklt2", {
 	light_source = 10,
 	paramtype = "light",
 	groups = {cracky=1},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:blumetstr", {
@@ -481,7 +464,7 @@ minetest.register_node("scifi_nodes:blumetstr", {
 	light_source = 10,
 	paramtype = "light",
 	groups = {cracky=1},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:glass", {
@@ -491,10 +474,10 @@ minetest.register_node("scifi_nodes:glass", {
 	tiles = {
 		"scifi_nodes_glass.png"
 	},
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	paramtype = "light",
 	groups = {cracky=1},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:whtlightbnd", {
@@ -506,7 +489,7 @@ minetest.register_node("scifi_nodes:whtlightbnd", {
 	light_source = 10,
 	paramtype = "light",
 	groups = {cracky=1},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 --edited wool code (Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>)
@@ -517,15 +500,14 @@ minetest.register_node("scifi_nodes:whtlightbnd", {
 -- colors available. When crafting, the last recipes will be checked first.
 --add new block using texture name(without "scifi_nodes_" prefix) then the description, and then the name of the block
 local nodetypes = {
-	-- { name, description, shortname?, light, colorable }
 	{"blue",      "blue lines",        "blue"},
 	{"holes",       "metal with holes","holes"},
-	{"white2",      "plastic",         "white2", 0, true},
+	{"white2",      "plastic",         "white2"},
     {"super_white",      "Super Plastic",         "super_white", 11},
-    {"ultra_white",      "Ultra Plastic",         "ultra_white", minetest.LIGHT_MAX},
+    {"ultra_white",      "Ultra Plastic",         "ultra_white", default.LIGHT_MAX},
 	{"engine",      "engine",          "engine"},
 	{"wall",      "metal wall",        "wall"},
-	{"white",      "plastic wall",     "white", 0, true},
+	{"white",      "plastic wall",     "white"},
 	{"stripes2top",     "dirty metal block","metal2"},
 	{"rough",      "rough metal",      "rough"},
 	{"lighttop",      "metal block",      "metal"},
@@ -546,11 +528,12 @@ local nodetypes = {
 	{"bluetile",      "blue tile",       "blutl"},
 	{"greytile",      "grey tile",       "grytl"},
 	{"mesh2",      "metal floormesh",       "mesh2"},
+	{"white",      "plastic wall",       "white"},
 	{"pipe",      "wall pipe",       "pipe2"},
 	{"pipeside",      "side pipe",       "pipe3"},
 	{"tile",      "white tile",       "tile"},
-	{"whiteoct",      "white octagon",       "whiteoct", 0, true},
+	{"whiteoct",      "white octagon",       "whiteoct"},
-	{"whitetile",      "white tile2",       "whttl", 0, true},
+	{"whitetile",      "white tile2",       "whttl"},
 	{"black_detail",      "black detail",       "blckdtl"},
 	{"green_square",      "green metal block",       "grnblck"},
 	{"red_square",      "red metal block",       "redblck"},
@@ -587,10 +570,10 @@ local nodetypes = {
 	{"monitorwall",      "Wall monitors",       "monitorwall"},
 	{"screen3",      "Wall monitor",       "screen3"},
 	{"doomlight",      "Doom light",       "doomlight", 12},
-	{"bluwllight",      "Blue wall light", "capsule3", minetest.LIGHT_MAX},
+	{"bluwllight",      "Blue wall light", "capsule3", default.LIGHT_MAX},
 	{"bluegrid",      "Blue Grid", "bluegrid", 5},
 	{"fan",      "Fan",       "fan"},
-	{"ppllght",      "Purple wall light", "", minetest.LIGHT_MAX},
+	{"ppllght",      "Purple wall light", "", default.LIGHT_MAX},
 	{"pplwll",      "Purple wall", "", 0},
 	{"pplwll2",      "Purple wall2", "", 0},
 	{"pplwll3",      "Purple wall3", "", 0},
@@ -603,52 +586,18 @@ local nodetypes = {
 	{"blackplate",      "Black plate", "", 0},
 }
 
-local has_unifieddyes_mod = minetest.get_modpath("unifieddyes")
-
 for _, row in ipairs(nodetypes) do
 	local name = row[1]
 	local desc = row[2]
 	local light = row[4]
-	local is_colorable = row[5]
-
 	-- Node Definition
-	local node_def = {
+	minetest.register_node("scifi_nodes:"..name, {
 		description = desc,
 		tiles = {"scifi_nodes_"..name..".png"},
 		groups = {cracky=1},
 		paramtype = "light",
 		paramtype2 = "facedir",
 		light_source = light,
-		sounds = scifi_nodes.node_sound_glass_defaults()
+		sounds = default.node_sound_glass_defaults()
-	}
-
-	if is_colorable and has_unifieddyes_mod then
-		-- overwrite attributes on the "uncolored" node
-		node_def.palette = "unifieddyes_palette_extended.png"
-		node_def.groups.ud_param2_colorable = 1
-		node_def.airbrush_replacement_node = "scifi_nodes:"..name.."_colored"
-	end
-
-	-- register node
-	minetest.register_node("scifi_nodes:"..name, node_def)
-
-	if is_colorable and has_unifieddyes_mod then
-		-- register colored node
-		minetest.register_node("scifi_nodes:"..name.."_colored", {
-			description = desc,
-			tiles = {"scifi_nodes_"..name..".png"},
-			groups = {
-				cracky = 1,
-				ud_param2_colorable = 1,
-				not_in_creative_inventory = 1
-			},
-			palette = "unifieddyes_palette_extended.png",
-			paramtype = "light",
-			paramtype2 = "color",
-			light_source = light,
-			sounds = scifi_nodes.node_sound_glass_defaults(),
-			on_construct = unifieddyes.on_construct,
-			on_dig = unifieddyes.on_dig
 	})
-	end
 end

octagon_panes.lua

@@ -1,111 +0,0 @@
-
-local function register(basename, description, texture)
-  local nodename_single = "scifi_nodes:" .. basename .. "_pane"
-  local nodename_double = "scifi_nodes:" .. basename .. "_pane_double"
-  local nodename_offset = "scifi_nodes:" .. basename .. "_pane_offset"
-  local recipe_ingredient = "scifi_nodes:" .. basename
-
-  -- single height
-  minetest.register_node(nodename_single, {
-    description = description,
-    drawtype = "nodebox",
-    tiles = {
-      texture
-    },
-    wield_image = texture,
-    paramtype = "light",
-    paramtype2 = "facedir",
-    sunlight_propagates = true,
-    is_ground_content = false,
-    node_box = {
-      type = "fixed",
-      fixed = {{-0.5, -0.5, -0.03125, 0.5, 0.5, 0.03125}},
-    },
-    selection_box = {
-      type = "fixed",
-      fixed = {{-0.5, -0.5, -0.25, 0.5, 0.5, 0.25}},
-    },
-    groups = {cracky = 3, oddly_breakable_by_hand = 3},
-    use_texture_alpha = "blend",
-    sounds = scifi_nodes.node_sound_glass_defaults()
-  })
-
-  -- double height
-  minetest.register_node(nodename_double, {
-    description = description,
-    drawtype = "nodebox",
-    tiles = {
-      texture
-    },
-    wield_image = texture,
-    paramtype = "light",
-    paramtype2 = "facedir",
-    sunlight_propagates = true,
-    is_ground_content = false,
-    node_box = {
-      type = "fixed",
-      fixed = {{-0.5, -0.5, -0.03125, 0.5, 1.5, 0.03125}},
-    },
-    selection_box = {
-      type = "fixed",
-      fixed = {{-0.5, -0.5, -0.25, 0.5, 1.5, 0.25}},
-    },
-    groups = {cracky = 3, oddly_breakable_by_hand = 3},
-    use_texture_alpha = "blend",
-    sounds = scifi_nodes.node_sound_glass_defaults()
-  })
-
-  -- single height with offset
-  minetest.register_node(nodename_offset, {
-    description = description,
-    drawtype = "nodebox",
-    tiles = {
-      texture
-    },
-    wield_image = texture,
-    paramtype = "light",
-    paramtype2 = "facedir",
-    sunlight_propagates = true,
-    is_ground_content = false,
-    node_box = {
-      type = "fixed",
-      fixed = {{-0.5, -0.5, 0.96875, 0.5, 0.5, 1.03125}},
-    },
-    selection_box = {
-      type = "fixed",
-      fixed = {{-0.5, -0.5, 0.75, 0.5, 0.5, 1.25}},
-    },
-    groups = {cracky = 3, oddly_breakable_by_hand = 3},
-    use_texture_alpha = "blend",
-    sounds = scifi_nodes.node_sound_glass_defaults()
-  })
-
-  -- register recipes
-
-  minetest.register_craft({
-    output = nodename_single .. " 16",
-    recipe = {
-      {recipe_ingredient}
-    },
-  })
-
-  minetest.register_craft({
-    output = nodename_double .. " 16",
-    recipe = {
-      {recipe_ingredient},
-      {recipe_ingredient}
-    },
-  })
-
-  minetest.register_craft({
-    output = nodename_offset,
-    type = "shapeless",
-    recipe = {nodename_single},
-  })
-end
-
-register("octrng", "Orange Octagon Glass pane", "scifi_nodes_octrng.png")
-register("octgrn", "Green Octagon Glass pane", "scifi_nodes_octgrn.png")
-register("octbl", "Blue Octagon Glass pane", "scifi_nodes_octbl.png")
-register("octppl", "Purple Octagon Glass pane", "scifi_nodes_octppl.png")
-register("glass", "Dark Glass pane", "scifi_nodes_glass.png")

palm_scanner.lua

@@ -22,8 +22,6 @@ local function activate_palm_scanner(pos, node, player)
 
 	-- check protection
 	minetest.after(2, function()
-		if minetest.get_node(pos).name ~= node.name then return end
-
 		if minetest.is_protected(pos, name or "") then
 			-- clicker has no access to area
 			minetest.chat_send_player(name, "Access denied !")
@@ -38,7 +36,6 @@ local function activate_palm_scanner(pos, node, player)
 
 		-- reset state
 		minetest.after(1, function()
-			if minetest.get_node(pos).name ~= node.name then return end
 			node.name = "scifi_nodes:palm_scanner_off"
 			minetest.swap_node(pos, node)
 			mesecon.receptor_off(pos, scifi_nodes.get_switch_rules(node.param2))
@@ -65,7 +62,7 @@ minetest.register_node("scifi_nodes:palm_scanner_off", {
 		}
 	},
 	on_rightclick = (has_mesecons and activate_palm_scanner),
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:palm_scanner_checking", {
@@ -83,7 +80,7 @@ minetest.register_node("scifi_nodes:palm_scanner_checking", {
 	paramtype2 = "wallmounted",
 	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1, mesecon_needs_receiver = 1},
 	drop = "scifi_nodes:palm_scanner_off",
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:palm_scanner_on", {
@@ -106,7 +103,7 @@ minetest.register_node("scifi_nodes:palm_scanner_on", {
 			state = (has_mesecons and mesecon.state.on)
 		}
 	},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_craft({

plants.lua

@@ -1,11 +1,11 @@
 
 local plants = {
-	{"flower1", "Glow Flower", 1,0, minetest.LIGHT_MAX},
+	{"flower1", "Glow Flower", 1,0, default.LIGHT_MAX},
 	{"flower2", "Pink Flower", 1.5,0, 10},
 	{"flower3", "Triffid", 2,5, 0},
 	{"flower4", "Weeping flower", 1.5,0, 0},
 	{"plant1", "Bulb Plant", 1,0, 0},
-	{"plant2", "Trap Plant", 1.5,0, minetest.LIGHT_MAX},
+	{"plant2", "Trap Plant", 1.5,0, default.LIGHT_MAX},
 	{"plant3", "Blue Jelly Plant", 1.2,0, 10},
 	{"plant4", "Green Jelly Plant", 1.2,0, 10},
 	{"plant5", "Fern Plant", 1.7,0, 0},

protected_switch.lua

@@ -1,89 +0,0 @@
-
---------------
--- Switches --
---------------
-
-local has_mesecons = minetest.get_modpath("mesecons")
-
-local function toggle_switch(pos, _, player)
-	local node = minetest.get_node(pos)
-	local name = node.name
-	if name == "scifi_nodes:protected_switch_on" then
-		-- toggle off
-		minetest.sound_play("scifi_nodes_switch", {max_hear_distance = 8, pos = pos})
-		minetest.set_node(pos, {name = "scifi_nodes:protected_switch_off", param2 = node.param2})
-		mesecon.receptor_off(pos, scifi_nodes.get_switch_rules(node.param2))
-	elseif name == "scifi_nodes:protected_switch_off" then
-		-- toggle on, check protection first
-		if player and minetest.is_protected(pos, player:get_player_name()) then
-			-- position is protected, abort
-			minetest.sound_play("scifi_nodes_scanner_refused", {max_hear_distance = 8, pos = pos})
-			return
-		end
-		minetest.sound_play("scifi_nodes_switch", {max_hear_distance = 8, pos = pos})
-		minetest.set_node(pos, {name = "scifi_nodes:protected_switch_on", param2 = node.param2})
-		mesecon.receptor_on(pos, scifi_nodes.get_switch_rules(node.param2))
-		minetest.get_node_timer(pos):start(2)
-	end
-end
-
-minetest.register_node("scifi_nodes:protected_switch_on", {
-	description = "Protected wall switch",
-	sunlight_propagates = true,
-	buildable_to = false,
-	tiles = {"scifi_nodes_switch_on.png",},
-	inventory_image = "scifi_nodes_switch_on.png",
-	wield_image = "scifi_nodes_switch_on.png",
-	drawtype = "signlike",
-	node_box = {type = "wallmounted",},
-	selection_box = {type = "wallmounted",},
-	paramtype = "light",
-	paramtype2 = "wallmounted",
-	light_source = 5,
-	groups = {
-		cracky=1,
-		oddly_breakable_by_hand = 1,
-		not_in_creative_inventory = 1,
-		mesecon_needs_receiver = 1
-	},
-	mesecons = {
-		receptor = {
-			state = (has_mesecons and mesecon.state.on)
-		}
-	},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
-	on_rightclick = (has_mesecons and toggle_switch),
-	on_timer = (has_mesecons and toggle_switch)
-})
-
-minetest.register_node("scifi_nodes:protected_switch_off", {
-	description = "Protected wall switch",
-	tiles = {"scifi_nodes_switch_off.png",},
-	inventory_image = "scifi_nodes_switch_on.png",
-	wield_image = "scifi_nodes_switch_on.png",
-	drawtype = "signlike",
-	sunlight_propagates = true,
-	buildable_to = false,
-	node_box = {type = "wallmounted",},
-	selection_box = {type = "wallmounted",},
-	paramtype = "light",
-	paramtype2 = "wallmounted",
-	groups = {
-		cracky = 1,
-		oddly_breakable_by_hand = 1,
-		mesecon_needs_receiver = 1
-	},
-	mesecons = {
-		receptor = {
-			state = (has_mesecons and mesecon.state.off)
-		}
-	},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
-	on_rightclick = (has_mesecons and toggle_switch)
-})
-
-minetest.register_craft({
-	output = "scifi_nodes:protected_switch_off 2",
-	type = "shapeless",
-	recipe = {"scifi_nodes:switch_off", "default:steel_ingot"}
-})

sounds.lua

@@ -1,29 +0,0 @@
--- sound definitions
-
-function scifi_nodes.node_sound_wood_defaults()
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_wood_defaults()
-    end
-end
-
-function scifi_nodes.node_sound_glass_defaults()
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_glass_defaults()
-    end
-end
-
-function scifi_nodes.node_sound_metal_defaults()
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_metal_defaults()
-    end
-end
-
-function scifi_nodes.node_sound_stone_defaults()
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_stone_defaults()
-    end
-end

switches.lua

@@ -33,18 +33,13 @@ minetest.register_node("scifi_nodes:switch_on", {
 	paramtype = "light",
 	paramtype2 = "wallmounted",
 	light_source = 5,
-	groups = {
+	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1, mesecon_needs_receiver = 1},
-		cracky=1,
-		oddly_breakable_by_hand = 1,
-		not_in_creative_inventory = 1,
-		mesecon_needs_receiver = 1
-	},
 	mesecons = {
 		receptor = {
 			state = (has_mesecons and mesecon.state.on)
 		}
 	},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	on_rightclick = (has_mesecons and toggle_switch),
 	on_timer = (has_mesecons and toggle_switch)
 })
@@ -61,17 +56,13 @@ minetest.register_node("scifi_nodes:switch_off", {
 	selection_box = {type = "wallmounted",},
 	paramtype = "light",
 	paramtype2 = "wallmounted",
-	groups = {
+	groups = {cracky=1, oddly_breakable_by_hand=1, mesecon_needs_receiver = 1},
-		cracky = 1,
-		oddly_breakable_by_hand = 1,
-		mesecon_needs_receiver = 1
-	},
 	mesecons = {
 		receptor = {
 			state = (has_mesecons and mesecon.state.off)
 		}
 	},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	on_rightclick = (has_mesecons and toggle_switch)
 })