Merge remote-tracking branch 'upstream/master'

aligns with all other plant-mods

README.md

@@ -55,3 +55,4 @@ CC0
 * OgelGames https://github.com/OgelGames
 * leftshift https://github.com/leftshift
 * fluxionary https://github.com/fluxionary
+* Niles Corder https://github.com/ncorder

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 = default.node_sound_wood_defaults(),
+	sounds = scifi_nodes.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 = default.node_sound_metal_defaults(),
+	sounds = scifi_nodes.node_sound_metal_defaults(),
 
 	after_dig_node = drop_chest_stuff(),
 	on_construct = function(pos)

crafts.lua

@@ -1,5 +1,6 @@
 -- CRAFTING RECIPES FOR SCIFI NODES
 
+if minetest.get_modpath("basic_materials") then
     -- 6 basic plastic from 9 homedecor plastic sheet
     minetest.register_craft({
         output = "scifi_nodes:white2 6",
@@ -10,6 +11,29 @@ minetest.register_craft({
         }
     })
 
+    if minetest.settings:get_bool("scifi_nodes.teleporter_enable_crafting", false) then
+        -- enable the teleporter pad crafting recipe only if the setting is enabled
+        minetest.register_craft({
+            output = "scifi_nodes:pad",
+            recipe = {
+                {"homedecor:plastic_sheeting", "quartz:block", "homedecor:plastic_sheeting"},
+                {"default:mese_crystal", "quartz:block", "default:mese_crystal"},
+                {"homedecor:plastic_sheeting", "quartz:block", "homedecor:plastic_sheeting"}
+            }
+        })
+    end
+
+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",
 	recipe = {
@@ -1099,6 +1123,22 @@ 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",
@@ -1446,9 +1486,9 @@ minetest.register_craft({
 minetest.register_craft({
     output = "scifi_nodes:plant8",
     recipe = {
-        {"flowers:viola","default:junglegrass"},
+        {"flowers:viola","default:junglegrass", "default:grass_1"},
-        {"default:dirt",""},
+        {"default:dirt","",""},
-        {"scifi_nodes:greybolts",""}
+        {"scifi_nodes:greybolts","",""}
     }
 })
 
@@ -1595,15 +1635,6 @@ minetest.register_craft({
     }
 })
 
-minetest.register_craft({
-    output = 'scifi_nodes:doomwall43 6',
-    recipe = {
-        {"scifi_nodes:white","dye:black","scifi_nodes:white"},
-        {"scifi_nodes:black","dye:dark_green","scifi_nodes:black"},
-        {"scifi_nodes:white","dye:yellow","scifi_nodes:white"}
-    }
-})
-
 minetest.register_craft({
     output = 'scifi_nodes:doomwall43 6',
     recipe = {

depends.txt

@@ -1,10 +0,0 @@
-default
-basic_materials
-mesecons
-xpanes?
-moreblocks?
-mesecons_microcontroller?
-mesecons_button?
-mesecons_torch?
-mesecons_receiver?
-dye?

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 = {items = {"scifi_nodes:digicode_off"}},
+	drop = "scifi_nodes:digicode_off",
 	mesecons = {
 		receptor = {
 			state = (has_mesecons and mesecon.state.on)
 		}
 	},
 	on_timer = toggle_digicode,
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.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 = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
 
 minetest.register_craft({

doors.lua

@@ -271,7 +271,7 @@ for _, current_door in ipairs(doors) do
 		drawtype = "nodebox",
 		paramtype = "light",
 		paramtype2 = "facedir",
-		groups = {cracky = 1},
+		groups = {cracky = 1, dig_generic = 3},
 		node_box = {
 			type = "fixed",
 			fixed = {
@@ -300,7 +300,7 @@ for _, current_door in ipairs(doors) do
 		paramtype = "light",
 		paramtype2 = "facedir",
 		drop = closed,
-		groups = {cracky = 1},
+		groups = {cracky = 1, dig_generic = 3},
 		node_box = {
 			type = "fixed",
 			fixed = {
@@ -330,7 +330,7 @@ for _, current_door in ipairs(doors) do
 		drawtype = "nodebox",
 		paramtype = "light",
 		paramtype2 = "facedir",
-		groups = {cracky = 1},
+		groups = {cracky = 1, dig_generic = 3},
 		node_box = {
 			type = "fixed",
 			fixed = {

init.lua

@@ -4,13 +4,22 @@ 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")
+
+if minetest.get_modpath("default") then
+	-- 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")
@@ -22,3 +31,4 @@ dofile(MP.."/digicode.lua")
 dofile(MP.."/models.lua")
 dofile(MP.."/octagon_panes.lua")
 dofile(MP.."/crafts.lua")
+minetest.log("action", "[scifi_nodes] loaded.")

mod.conf

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

models.lua

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

nodeboxes.lua

@@ -18,7 +18,7 @@ minetest.register_node("scifi_nodes:alienslope", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -32,7 +32,7 @@ minetest.register_node("scifi_nodes:alienslope", {
 			{-0.125, 0.375, -0.5, 0.5, 0.5, 0.5}, -- NodeBox17
 		}
 	},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = scifi_nodes.node_sound_wood_defaults(),
 	on_place = minetest.rotate_node
 })
 
@@ -49,7 +49,7 @@ minetest.register_node("scifi_nodes:wallpipe", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -62,7 +62,7 @@ minetest.register_node("scifi_nodes:wallpipe", {
 			{-0.5, -0.125, 0, 0.5, 0, 0.0625}, -- NodeBox24
 		}
 	},
-	sounds = default.node_sound_wood_defaults()
+	sounds = scifi_nodes.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 = default.node_sound_wood_defaults(),
+	sounds = scifi_nodes.node_sound_wood_defaults(),
 })
 
 minetest.register_node("scifi_nodes:egg", {
@@ -107,7 +107,7 @@ minetest.register_node("scifi_nodes:egg", {
 	sunlight_propagates = false,
 	drawtype = "nodebox",
 	paramtype = "light",
-	groups = {cracky=1, oddly_breakable_by_hand=1, dig_immediate=2, falling_node=1},
+	groups = {cracky=1, oddly_breakable_by_hand=1, dig_immediate=2, falling_node=1, dig_generic = 3},
 	light_source = 5,
 	node_box = {
 		type = "fixed",
@@ -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 = default.node_sound_wood_defaults()
+	sounds = scifi_nodes.node_sound_wood_defaults()
 	}
 })
 
@@ -264,7 +264,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 = default.node_sound_wood_defaults()
+	sounds = scifi_nodes.node_sound_wood_defaults()
 	}
 })
 
@@ -281,9 +281,9 @@ minetest.register_node("scifi_nodes:pplwndw", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
-	groups = {cracky=3},
+	groups = {cracky=3, dig_generic = 4},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -304,11 +304,11 @@ minetest.register_node("scifi_nodes:gloshroom", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	light_source = default.LIGHT_MAX,
+	light_source = minetest.LIGHT_MAX,
 	walkable = false,
 	buildable_to = true,
 	sunlight_propagates = false,
-	use_texture_alpha =  true,
+	use_texture_alpha = "blend",
 	groups = {fleshy=1, oddly_breakable_by_hand=1, dig_immediate=3},
 	node_box = {
 		type = "fixed",
@@ -324,50 +324,67 @@ minetest.register_node("scifi_nodes:gloshroom", {
 })
 
 minetest.register_node("scifi_nodes:pot_lid", {
-	description = "plant pot lid(place above plant)",
+	description = "Plant Pot Lid",
 	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 = true,
+	use_texture_alpha = "blend",
 	drawtype = "nodebox",
 	paramtype = "light",
-	groups = {cracky=1, not_in_creative_inventory=1},
+	groups = {not_in_creative_inventory = 1},
 	sunlight_propagates = true,
+	diggable = false,
+	drop = "",
 	selection_box = {
 		type = "fixed",
-		fixed = {0, 0, 0, 0, 0, 0}
+		fixed = {-0.5, -1.5, -0.5, 0.5, -0.25, 0.5}
-	},
-	collision_box = {
-		type = "fixed",
-		fixed = {-0.5, -1.5, -0.5, 0.5, -0.5, 0.5}
 	},
 	node_box = {
 		type = "fixed",
 		fixed = {
-			{-0.1875, -0.5625, -0.1875, 0.1875, -0.5, 0.1875}, -- NodeBox13
+			{-0.4375, -1.5, -0.4375, 0.4375, -0.5, -0.375},
-			{-0.25, -0.625, -0.25, 0.25, -0.5625, 0.25}, -- NodeBox14
+			{-0.4375, -1.5, 0.375, 0.4375, -0.5, 0.4375},
-			{-0.3125, -0.6875, -0.3125, 0.3125, -0.625, 0.3125}, -- NodeBox15
+			{-0.4375, -1.5, -0.375, -0.375, -0.5, 0.375},
-			{-0.375, -0.75, -0.375, 0.375, -0.6875, 0.375}, -- NodeBox16
+			{0.375, -1.5, -0.375, 0.4375, -0.5, 0.375},
-			{-0.4375, -0.75, 0.375, 0.4375, -1.5, 0.4375}, -- NodeBox17
+			{-0.375, -0.5, -0.375, 0.375, -0.4375, 0.375},
-			{-0.4375, -0.75, -0.4375, 0.4375, -1.5, -0.375}, -- NodeBox18
+			{-0.3125, -0.4375, -0.3125, 0.3125, -0.375, 0.3125},
-			{0.375, -0.75, -0.4375, 0.4375, -1.5, 0.4375}, -- NodeBox19
+			{-0.25, -0.375, -0.25, 0.25, -0.3125, 0.25},
-			{-0.4375, -0.75, -0.4375, -0.375, -1.5, 0.4375}, -- NodeBox20
+			{-0.1875, -0.3125, -0.1875, 0.1875, -0.25, 0.1875}
 		}
 	},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.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
+
+local dirt_tex = "default_dirt.png"
+if not minetest.get_modpath("default") then dirt_tex = "[combine:16x16^[noalpha^[colorize:#654321" end
+
 minetest.register_node("scifi_nodes:pot", {
-	description = "metal plant pot (right click for lid, shift+rightclick to plant)",
+	description = "Metal Plant Pot (right-click for lid, sneak + right-click to plant)",
 	tiles = {
-		"scifi_nodes_pot.png",
+		dirt_tex .. "^scifi_nodes_pot.png",
 		"scifi_nodes_greybolts.png",
 		"scifi_nodes_greybolts.png",
 		"scifi_nodes_greybolts.png",
@@ -376,34 +393,30 @@ minetest.register_node("scifi_nodes:pot", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	groups = {cracky=1, soil=1, sand=1},
+	groups = {cracky = 1, soil = 1, sand = 1, dig_generic = 3},
+	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}, -- NodeBox1
+			{-0.5, -0.25, -0.5, 0.5, 0.5, 0.5},
-			{0.1875, -0.5, 0.1875, 0.5, -0.25, 0.5}, -- NodeBox2
+			{0.1875, -0.5, 0.1875, 0.5, -0.25, 0.5},
-			{-0.5, -0.5, -0.5, -0.1875, -0.25, -0.1875}, -- NodeBox3
+			{-0.5, -0.5, -0.5, -0.1875, -0.25, -0.1875},
-			{-0.5, -0.5, 0.1875, -0.1875, -0.25, 0.5}, -- NodeBox4
+			{-0.5, -0.5, 0.1875, -0.1875, -0.25, 0.5},
-			{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}, -- NodeBox5
+			{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}
 		}
 	},
-	on_rightclick = function(pos, node, clicker, item, _)
+	on_rightclick = toggle_lid,
-		local lid_node = minetest.get_node({x=pos.x, y=pos.y+2, z=pos.z})
+	on_destruct = remove_lid,
-		if lid_node.name == "scifi_nodes:pot_lid" then
+	sounds = scifi_nodes.node_sound_metal_defaults(),
-			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 wet plant pot(right click for lid, shift+rightclick to plant)",
+	description = "Metal Plant Pot Wet (right-click for lid, sneak + right-click to plant)",
 	tiles = {
-		"scifi_nodes_pot.png^[colorize:black:100",
+		dirt_tex .. "^scifi_nodes_pot2.png",
 		"scifi_nodes_greybolts.png",
 		"scifi_nodes_greybolts.png",
 		"scifi_nodes_greybolts.png",
@@ -412,28 +425,24 @@ minetest.register_node("scifi_nodes:pot2", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	groups = {cracky=1, soil=3, wet=1},
+	groups = {cracky = 1, soil = 3, wet = 1, dig_generic = 3},
+	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}, -- NodeBox1
+			{-0.5, -0.25, -0.5, 0.5, 0.5, 0.5},
-			{0.1875, -0.5, 0.1875, 0.5, -0.25, 0.5}, -- NodeBox2
+			{0.1875, -0.5, 0.1875, 0.5, -0.25, 0.5},
-			{-0.5, -0.5, -0.5, -0.1875, -0.25, -0.1875}, -- NodeBox3
+			{-0.5, -0.5, -0.5, -0.1875, -0.25, -0.1875},
-			{-0.5, -0.5, 0.1875, -0.1875, -0.25, 0.5}, -- NodeBox4
+			{-0.5, -0.5, 0.1875, -0.1875, -0.25, 0.5},
-			{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}, -- NodeBox5
+			{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}
 		}
 	},
-	on_rightclick = function(pos, node, clicker, item, _)
+	on_rightclick = toggle_lid,
-		local lid_node = minetest.get_node({x=pos.x, y=pos.y+2, z=pos.z})
+	on_destruct = remove_lid,
-		if lid_node.name == "scifi_nodes:pot_lid" then
+	sounds = scifi_nodes.node_sound_metal_defaults(),
-			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", {
@@ -445,7 +454,7 @@ minetest.register_node("scifi_nodes:lightbar", {
 	paramtype = "light",
 	paramtype2 = "wallmounted",
 	sunlight_propagates = true,
-	light_source = default.LIGHT_MAX,
+	light_source = minetest.LIGHT_MAX,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -458,8 +467,8 @@ minetest.register_node("scifi_nodes:lightbar", {
 			{-0.125, -0.5, -0.5, 0.125, -0.375, 0.5}, -- NodeBox1
 		}
 	},
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:light_dynamic", {
@@ -482,9 +491,9 @@ minetest.register_node("scifi_nodes:light_dynamic", {
 		}
 	},
 	paramtype2 = "wallmounted",
-	light_source = default.LIGHT_MAX,
+	light_source = minetest.LIGHT_MAX,
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:ladder", {
@@ -514,7 +523,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 = default.node_sound_metal_defaults()
+	sounds = scifi_nodes.node_sound_metal_defaults()
 	},
 	paramtype2 = "wallmounted",
 	walkable = false,
@@ -529,8 +538,8 @@ minetest.register_node("scifi_nodes:lightbars", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
-	light_source = default.LIGHT_MAX,
+	light_source = minetest.LIGHT_MAX,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -540,8 +549,8 @@ minetest.register_node("scifi_nodes:lightbars", {
 			{0.125, -0.5, -0.375, 0.375, 0.5, -0.125}, -- NodeBox4
 		}
 	},
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:liquid_pipe", {
@@ -550,8 +559,8 @@ tiles = {{
 		name = "scifi_nodes_liquid.png",
 		animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 1.00},
 	}},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
-	light_source = default.LIGHT_MAX,
+	light_source = minetest.LIGHT_MAX,
 	drawtype = "nodebox",
 	sunlight_propagates = true,
 	paramtype = "light",
@@ -561,8 +570,8 @@ tiles = {{
 			{-0.375, -0.5, -0.375, 0.375, 0.5, 0.375}, -- NodeBox1
 		}
 	},
-	groups = {cracky=1, oddly_breakable_by_hand=1},
+	groups = {cracky=1, oddly_breakable_by_hand=1, dig_generic = 3},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:liquid_pipe2", {
@@ -570,8 +579,8 @@ minetest.register_node("scifi_nodes:liquid_pipe2", {
 tiles = {
 		"scifi_nodes_orange.png",
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
-	light_source = default.LIGHT_MAX,
+	light_source = minetest.LIGHT_MAX,
 	drawtype = "nodebox",
 	sunlight_propagates = true,
 	paramtype = "light",
@@ -582,7 +591,7 @@ tiles = {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:powered_stand", {
@@ -649,7 +658,7 @@ minetest.register_node("scifi_nodes:cover", {
 			{-0.3125, -0.375, -0.3125, 0.3125, -0.3125, 0.3125}, -- NodeBox6
 		}
 	},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = scifi_nodes.node_sound_wood_defaults(),
 	groups = {cracky=1, oddly_breakable_by_hand=1}
 })
 
@@ -754,8 +763,8 @@ minetest.register_node("scifi_nodes:table", {
 			{-0.0625, 0.25, -0.125, 0.0625, 0.4375, -0.0625}, -- NodeBox7
 		}
 	},
-	sounds = default.node_sound_metal_defaults(),
+	sounds = scifi_nodes.node_sound_metal_defaults(),
-	groups = {cracky=1}
+	groups = {cracky=1, dig_generic = 3}
 })
 
 minetest.register_node("scifi_nodes:laptop_open", {
@@ -838,7 +847,7 @@ minetest.register_node("scifi_nodes:pipen", {
 			{-0.5, -0.4375, -0.5, 0.5, -0.375, 0.5}, -- NodeBox9
 		}
 	},
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
 	on_place = minetest.rotate_node
 })
 
@@ -854,7 +863,7 @@ minetest.register_node("scifi_nodes:windowcorner", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -868,9 +877,9 @@ minetest.register_node("scifi_nodes:windowcorner", {
 			{-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
 		}
 	},
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
 	on_place = minetest.rotate_node,
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:windowstraight", {
@@ -885,7 +894,7 @@ minetest.register_node("scifi_nodes:windowstraight", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -895,9 +904,9 @@ minetest.register_node("scifi_nodes:windowstraight", {
 			{-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
 		}
 	},
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
 	on_place = minetest.rotate_node,
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:windowcorner2", {
@@ -912,7 +921,7 @@ minetest.register_node("scifi_nodes:windowcorner2", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -926,9 +935,9 @@ minetest.register_node("scifi_nodes:windowcorner2", {
 			{-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
 		}
 	},
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
 	on_place = minetest.rotate_node,
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:windowstraight2", {
@@ -943,7 +952,7 @@ minetest.register_node("scifi_nodes:windowstraight2", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -953,9 +962,9 @@ minetest.register_node("scifi_nodes:windowstraight2", {
 			{-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
 		}
 	},
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
 	on_place = minetest.rotate_node,
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
 
 
@@ -970,7 +979,7 @@ minetest.register_node("scifi_nodes:capsule", {
 		"scifi_nodes_capsule.png",
 		"scifi_nodes_capsule.png"
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -983,8 +992,8 @@ minetest.register_node("scifi_nodes:capsule", {
 			{-0.3125, -0.4375, -0.1875, 0.3125, -0.0625, 0.1875}, -- NodeBox3
 		}
 	},
-	groups = {cracky=1, oddly_breakable_by_hand=1},
+	groups = {cracky=1, oddly_breakable_by_hand=1, dig_generic = 3},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 	on_rightclick = function(pos, node, clicker, item, _)
 			minetest.set_node(pos, {name="scifi_nodes:capsule2", param2=node.param2})
 	end,
@@ -1000,7 +1009,7 @@ minetest.register_node("scifi_nodes:capsule3", {
 		"scifi_nodes_capsule3.png",
 		"scifi_nodes_capsule3.png"
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -1014,7 +1023,7 @@ minetest.register_node("scifi_nodes:capsule3", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 	on_rightclick = function(pos, node, clicker, item, _)
 			minetest.set_node(pos, {name="scifi_nodes:capsule", param2=node.param2})
 	end,
@@ -1030,7 +1039,7 @@ minetest.register_node("scifi_nodes:capsule2", {
 		"scifi_nodes_capsule2.png",
 		"scifi_nodes_capsule2.png"
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -1044,7 +1053,7 @@ minetest.register_node("scifi_nodes:capsule2", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 	on_rightclick = function(pos, node, clicker, item, _)
 			minetest.set_node(pos, {name="scifi_nodes:capsule3", param2=node.param2})
 	end,
@@ -1073,8 +1082,8 @@ minetest.register_node("scifi_nodes:itemholder", {
 			{-0.25, -0.5, -0.0625, -0.1875, -0.0625, 0.0625}, -- NodeBox5
 		}
 	},
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
-	on_rotate = screwdriver.disallow,
+	on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow,
 	after_place_node = function(pos, placer, itemstack)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("owner",placer:get_player_name())
@@ -1118,11 +1127,11 @@ minetest.register_node("scifi_nodes:glassscreen", {
 		"scifi_nodes_glscrn.png",
 		"scifi_nodes_glscrn.png"
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
-	light_source = default.LIGHT_MAX,
+	light_source = minetest.LIGHT_MAX,
 	sunlight_propagates = true,
 	node_box = {
 		type = "fixed",
@@ -1132,7 +1141,7 @@ minetest.register_node("scifi_nodes:glassscreen", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
 
 
@@ -1204,7 +1213,7 @@ minetest.register_node("scifi_nodes:windowpanel", {
     },
     drawtype = "nodebox",
     paramtype = "light",
-    use_texture_alpha = true,
+    use_texture_alpha = "blend",
     sunlight_propagates = true,
     paramtype2 = "facedir",
     node_box = {
@@ -1213,7 +1222,7 @@ minetest.register_node("scifi_nodes:windowpanel", {
             {-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
         }
     },
-    groups = {cracky=1},
+    groups = {cracky=1, dig_generic = 3},
     on_place = minetest.rotate_node,
-    sounds = default.node_sound_glass_defaults(),
+    sounds = scifi_nodes.node_sound_glass_defaults(),
 })

nodes.lua

@@ -1,6 +1,7 @@
 
 --nodes
 
+if minetest.get_modpath("default") then
 	minetest.register_node("scifi_nodes:grassblk", {
 		description = "Dirt With Alien Grass",
 		tiles = {"default_grass.png^[colorize:cyan:80", "default_dirt.png",
@@ -9,6 +10,7 @@ minetest.register_node("scifi_nodes:grassblk", {
 		light_source = 2,
 		groups = {crumbly=1, oddly_breakable_by_hand=1, soil=1}
 	})
+end
 
 minetest.register_node("scifi_nodes:light", {
 	description = "blue lightbox",
@@ -23,7 +25,7 @@ minetest.register_node("scifi_nodes:light", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1}
+	groups = {cracky=1, dig_generic = 3}
 })
 
 minetest.register_node("scifi_nodes:rfloor", {
@@ -34,8 +36,8 @@ minetest.register_node("scifi_nodes:rfloor", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	light_source = 10,
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
-	sounds = default.node_sound_metal_defaults()
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:bfloor", {
@@ -46,8 +48,8 @@ minetest.register_node("scifi_nodes:bfloor", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	light_source = 10,
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
-	sounds = default.node_sound_metal_defaults()
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 
@@ -63,8 +65,8 @@ minetest.register_node("scifi_nodes:stripes2", {
 		"scifi_nodes_stripes2.png"
 	},
 	paramtype = "light",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
-	sounds = default.node_sound_metal_defaults()
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:gblock", {
@@ -79,8 +81,8 @@ minetest.register_node("scifi_nodes:gblock", {
 		"scifi_nodes_gblock.png"
 	},
 	paramtype = "light",
-	groups = {cracky=1};
+	groups = {cracky=1, dig_generic = 3};
-	sounds = default.node_sound_metal_defaults()
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:gblock2", {
@@ -96,8 +98,8 @@ minetest.register_node("scifi_nodes:gblock2", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
-	sounds = default.node_sound_metal_defaults()
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:gblock3", {
@@ -113,8 +115,8 @@ minetest.register_node("scifi_nodes:gblock3", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
-	sounds = default.node_sound_metal_defaults()
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 
@@ -132,8 +134,8 @@ minetest.register_node("scifi_nodes:green_light", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:red_light", {
@@ -149,8 +151,8 @@ minetest.register_node("scifi_nodes:red_light", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:discs", {
@@ -165,8 +167,8 @@ minetest.register_node("scifi_nodes:discs", {
 		"scifi_nodes_discs.png"
 	},
 	paramtype = "light",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:disc", {
@@ -179,7 +181,7 @@ minetest.register_node("scifi_nodes:disc", {
 	inventory_image = "scifi_nodes_disc.png",
 	wield_image = "scifi_nodes_disc.png",
 	paramtype = "light",
-	groups = {cracky=1}
+	groups = {cracky=1, dig_generic = 3}
 })
 
 minetest.register_node("scifi_nodes:greenbar_animated", {
@@ -194,9 +196,9 @@ minetest.register_node("scifi_nodes:greenbar_animated", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
 	light_source = 10,
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 	on_place = minetest.rotate_node
 })
 
@@ -208,9 +210,9 @@ minetest.register_node("scifi_nodes:blink", {
 		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.00},
 	}},
 	paramtype = "light",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
 	light_source = 5,
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:black_lights", {
@@ -221,8 +223,8 @@ minetest.register_node("scifi_nodes:black_lights", {
 		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=0.50},
 	}},
 	paramtype = "light",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:black_screen", {
@@ -233,9 +235,9 @@ minetest.register_node("scifi_nodes:black_screen", {
 		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.00},
 	}},
 	paramtype = "light",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
 	light_source = 1,
-	sounds = default.node_sound_stone_defaults()
+	sounds = scifi_nodes.node_sound_stone_defaults()
 })
 
 minetest.register_node("scifi_nodes:screen", {
@@ -246,9 +248,9 @@ minetest.register_node("scifi_nodes:screen", {
 		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=0.50},
 	}},
 	paramtype = "light",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
 	light_source = 5,
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:screen2", {
@@ -259,9 +261,9 @@ minetest.register_node("scifi_nodes:screen2", {
 		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=0.50},
 	}},
 	paramtype = "light",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
 	light_source = 5,
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 
@@ -279,8 +281,8 @@ minetest.register_node("scifi_nodes:white_pad", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:white_base", {
@@ -296,8 +298,8 @@ minetest.register_node("scifi_nodes:white_base", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:grnpipe", {
@@ -313,8 +315,8 @@ minetest.register_node("scifi_nodes:grnpipe", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
-	sounds = default.node_sound_metal_defaults(),
+	sounds = scifi_nodes.node_sound_metal_defaults(),
 	on_place = minetest.rotate_node
 })
 
@@ -332,8 +334,8 @@ minetest.register_node("scifi_nodes:grnpipe2", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
-	sounds = default.node_sound_metal_defaults(),
+	sounds = scifi_nodes.node_sound_metal_defaults(),
 	on_place = minetest.rotate_node
 })
 
@@ -346,10 +348,10 @@ minetest.register_node("scifi_nodes:octrng", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	light_source = 10,
-	groups = {cracky=2},
+	groups = {cracky=2, dig_generic = 3},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:octgrn", {
@@ -361,10 +363,10 @@ minetest.register_node("scifi_nodes:octgrn", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	light_source = 10,
-	groups = {cracky=2},
+	groups = {cracky=2, dig_generic = 3},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:octbl", {
@@ -376,10 +378,10 @@ minetest.register_node("scifi_nodes:octbl", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	light_source = 10,
-	groups = {cracky=2},
+	groups = {cracky=2, dig_generic = 3},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:octppl", {
@@ -391,10 +393,10 @@ minetest.register_node("scifi_nodes:octppl", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	light_source = 10,
-	groups = {cracky=2},
+	groups = {cracky=2, dig_generic = 3},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:tower", {
@@ -408,8 +410,8 @@ minetest.register_node("scifi_nodes:tower", {
 	visual_scale = 2,
 	inventory_image = "scifi_nodes_tower.png",
 	paramtype = "light",
-	groups = {cracky=2},
+	groups = {cracky=2, dig_generic = 3},
-	sounds = default.node_sound_metal_defaults()
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:junk", {
@@ -443,8 +445,8 @@ minetest.register_node("scifi_nodes:blumetlight", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 
@@ -454,10 +456,10 @@ minetest.register_node("scifi_nodes:lightstp", {
 	tiles = {
 		"scifi_nodes_lightstripe.png"
 	},
-	light_source = default.LIGHT_MAX,
+	light_source = minetest.LIGHT_MAX,
 	paramtype = "light",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:blklt2", {
@@ -468,8 +470,8 @@ minetest.register_node("scifi_nodes:blklt2", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:blumetstr", {
@@ -480,8 +482,8 @@ minetest.register_node("scifi_nodes:blumetstr", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:glass", {
@@ -491,10 +493,10 @@ minetest.register_node("scifi_nodes:glass", {
 	tiles = {
 		"scifi_nodes_glass.png"
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	paramtype = "light",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:whtlightbnd", {
@@ -505,8 +507,8 @@ minetest.register_node("scifi_nodes:whtlightbnd", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 --edited wool code (Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>)
@@ -522,7 +524,7 @@ local nodetypes = {
 	{"holes",       "metal with holes","holes"},
 	{"white2",      "plastic",         "white2", 0, true},
     {"super_white",      "Super Plastic",         "super_white", 11},
-    {"ultra_white",      "Ultra Plastic",         "ultra_white", default.LIGHT_MAX},
+    {"ultra_white",      "Ultra Plastic",         "ultra_white", minetest.LIGHT_MAX},
 	{"engine",      "engine",          "engine"},
 	{"wall",      "metal wall",        "wall"},
 	{"white",      "plastic wall",     "white", 0, true},
@@ -587,10 +589,10 @@ local nodetypes = {
 	{"monitorwall",      "Wall monitors",       "monitorwall"},
 	{"screen3",      "Wall monitor",       "screen3"},
 	{"doomlight",      "Doom light",       "doomlight", 12},
-	{"bluwllight",      "Blue wall light", "capsule3", default.LIGHT_MAX},
+	{"bluwllight",      "Blue wall light", "capsule3", minetest.LIGHT_MAX},
 	{"bluegrid",      "Blue Grid", "bluegrid", 5},
 	{"fan",      "Fan",       "fan"},
-	{"ppllght",      "Purple wall light", "", default.LIGHT_MAX},
+	{"ppllght",      "Purple wall light", "", minetest.LIGHT_MAX},
 	{"pplwll",      "Purple wall", "", 0},
 	{"pplwll2",      "Purple wall2", "", 0},
 	{"pplwll3",      "Purple wall3", "", 0},
@@ -615,11 +617,11 @@ for _, row in ipairs(nodetypes) do
 	local node_def = {
 		description = desc,
 		tiles = {"scifi_nodes_"..name..".png"},
-		groups = {cracky=1},
+		groups = {cracky=1, dig_generic = 3},
 		paramtype = "light",
 		paramtype2 = "facedir",
 		light_source = light,
-		sounds = default.node_sound_glass_defaults()
+		sounds = scifi_nodes.node_sound_glass_defaults()
 	}
 
 	if is_colorable and has_unifieddyes_mod then
@@ -646,7 +648,7 @@ for _, row in ipairs(nodetypes) do
 			paramtype = "light",
 			paramtype2 = "color",
 			light_source = light,
-			sounds = default.node_sound_glass_defaults(),
+			sounds = scifi_nodes.node_sound_glass_defaults(),
 			on_construct = unifieddyes.on_construct,
 			on_dig = unifieddyes.on_dig
 		})

octagon_panes.lua

@@ -26,8 +26,8 @@ local function register(basename, description, texture)
       fixed = {{-0.5, -0.5, -0.25, 0.5, 0.5, 0.25}},
     },
     groups = {cracky = 3, oddly_breakable_by_hand = 3},
-    use_texture_alpha = true,
+    use_texture_alpha = "blend",
-    sounds = default.node_sound_glass_defaults()
+    sounds = scifi_nodes.node_sound_glass_defaults()
   })
 
   -- double height
@@ -51,8 +51,8 @@ local function register(basename, description, texture)
       fixed = {{-0.5, -0.5, -0.25, 0.5, 1.5, 0.25}},
     },
     groups = {cracky = 3, oddly_breakable_by_hand = 3},
-    use_texture_alpha = true,
+    use_texture_alpha = "blend",
-    sounds = default.node_sound_glass_defaults()
+    sounds = scifi_nodes.node_sound_glass_defaults()
   })
 
   -- single height with offset
@@ -76,8 +76,8 @@ local function register(basename, description, texture)
       fixed = {{-0.5, -0.5, 0.75, 0.5, 0.5, 1.25}},
     },
     groups = {cracky = 3, oddly_breakable_by_hand = 3},
-    use_texture_alpha = true,
+    use_texture_alpha = "blend",
-    sounds = default.node_sound_glass_defaults()
+    sounds = scifi_nodes.node_sound_glass_defaults()
   })
 
   -- register recipes

palm_scanner.lua

@@ -22,6 +22,8 @@ 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 !")
@@ -36,6 +38,7 @@ 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))
@@ -62,7 +65,7 @@ minetest.register_node("scifi_nodes:palm_scanner_off", {
 		}
 	},
 	on_rightclick = (has_mesecons and activate_palm_scanner),
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:palm_scanner_checking", {
@@ -80,7 +83,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 = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:palm_scanner_on", {
@@ -103,7 +106,7 @@ minetest.register_node("scifi_nodes:palm_scanner_on", {
 			state = (has_mesecons and mesecon.state.on)
 		}
 	},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
 
 minetest.register_craft({

plants.lua

@@ -1,11 +1,11 @@
 
 local plants = {
-	{"flower1", "Glow Flower", 1,0, default.LIGHT_MAX},
+	{"flower1", "Glow Flower", 1,0, minetest.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, default.LIGHT_MAX},
+	{"plant2", "Trap Plant", 1.5,0, minetest.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},
@@ -33,7 +33,6 @@ for _, row in ipairs(plants) do
 		groups = {snappy=1, oddly_breakable_by_hand=1, dig_immediate=3, flora=1},
 		paramtype = "light",
 		visual_scale = size,
-		buildable_to = true,
 		walkable = false,
 		damage_per_second = dmg,
 		selection_box = {

protected_switch.lua

@@ -51,7 +51,7 @@ minetest.register_node("scifi_nodes:protected_switch_on", {
 			state = (has_mesecons and mesecon.state.on)
 		}
 	},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 	on_rightclick = (has_mesecons and toggle_switch),
 	on_timer = (has_mesecons and toggle_switch)
 })
@@ -78,7 +78,7 @@ minetest.register_node("scifi_nodes:protected_switch_off", {
 			state = (has_mesecons and mesecon.state.off)
 		}
 	},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 	on_rightclick = (has_mesecons and toggle_switch)
 })
 

settingtypes.txt

@@ -1,2 +1,5 @@
 # Doors can only be opened by mesecon signal
-scifi_nodes.doors_open_with_mesecon_only (disables right click on doors) bool true
+scifi_nodes.doors_open_with_mesecon_only (disables right click on doors) bool false
+
+# Teleporter recipe flag
+scifi_nodes.teleporter_enable_crafting (enables the teleporter recipe) bool false

sounds.lua

@@ -0,0 +1,29 @@
+-- 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

switch.lua

@@ -44,7 +44,7 @@ minetest.register_node("scifi_nodes:switch_on", {
 			state = (has_mesecons and mesecon.state.on)
 		}
 	},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 	on_rightclick = (has_mesecons and toggle_switch),
 	on_timer = (has_mesecons and toggle_switch)
 })
@@ -71,7 +71,7 @@ minetest.register_node("scifi_nodes:switch_off", {
 			state = (has_mesecons and mesecon.state.off)
 		}
 	},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 	on_rightclick = (has_mesecons and toggle_switch)
 })