fix name typo in github action

add integration-test
2020-05-11 10:41:23 +02:00 · 2020-05-11 10:38:12 +02:00
269 changed files with 607 additions and 1304 deletions
--- a/.luacheckrc
+++ b/.luacheckrc
@ -1,5 +1,4 @@
 unused_args = false
-max_line_length = 180

 globals = {
 	"scifi_nodes"
@ -20,8 +19,6 @@ read_globals = {
 	"xpanes",
 	"screwdriver",
 	"minetest",
-	"mesecon",
-	"unifieddyes",
-	"letters",
-	"stealthnode"
+	"mesecon"
+
 }
--- a/README.md
+++ b/README.md
@ -4,15 +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.

-Lua api: see [api.md](./api.md)
+# Changes log

-# Changelog
-
-* 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)
@ -40,11 +36,6 @@ CC BY 3.0
 * scifi_nodes_palm_scanner.ogg https://freesound.org/people/THE_bizniss/sounds/39313/
 * scifi_nodes_access_granted https://freesound.org/people/TheBuilder15/sounds/415762/
 * scifi_nodes_access_refused https://freesound.org/people/RICHERlandTV/sounds/216090/
-* scifi_nodes_forcefield.png https://github.com/minetest-mods/technic/
-* scifi_nodes_dirt.png https://github.com/minetest/minetest_game
-* scifi_nodes_grass.png https://github.com/minetest/minetest_game
-* scifi_nodes_grass_side.png https://github.com/minetest/minetest_game
-* scifi_nodes_wood.png https://github.com/minetest/minetest_game

 CC0
 * scifi_nodes_digicode.ogg https://freesound.org/people/benjaminharveydesign/sounds/315921/
@ -52,14 +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
-* Niles Corder https://github.com/ncorder
--- a/api.md
+++ b/api.md
@ -1,12 +0,0 @@
-
-scifi_nodes api
-
-# Doors
-
-Open scifi_nodes door at given position
-
-```lua
-scifi_nodes.open_door(pos)
-```
-
-returns `true` on success, `false` otherwise
--- a/builder.lua
+++ b/builder.lua
@ -105,6 +105,5 @@ minetest.register_node("scifi_nodes:builder", {
 	end,
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	groups = {cracky=1, oddly_breakable_by_hand=1}
 })
--- a/chest.lua
+++ b/chest.lua
@ -1,5 +1,6 @@

 --chest code from default(Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>)
+
 local chest_formspec =
 	"size[8,9]" ..
 	default.gui_bg ..
@ -12,7 +13,10 @@ local chest_formspec =
 	"listring[current_player;main]" ..
 	default.get_hotbar_bg(0,4.85)

+
+
 -- Helper functions
+
 local function drop_chest_stuff()
 	return function(pos, oldnode, oldmetadata, digger)
 		local meta = minetest.get_meta(pos)
@ -31,57 +35,40 @@ local function drop_chest_stuff()
 	end
 end

-local function register_chest(name, custom_def)
-	assert(custom_def.description)
-	assert(custom_def.tiles)
-
-	local def = {
-		paramtype2 = "facedir",
-		legacy_facedir_simple = true,
-		is_ground_content = false,
-		sounds = scifi_nodes.node_sound_wood_defaults(),
-		after_dig_node = drop_chest_stuff(),
-		on_construct = function(pos)
-			local meta = minetest.get_meta(pos)
-			meta:set_string("formspec", chest_formspec)
-			meta:set_string("infotext", custom_def.description)
-			local inv = meta:get_inventory()
-			inv:set_size("main", 8 * 4)
-		end,
-		on_metadata_inventory_move = function(pos, from_list, from_index,
-				to_list, to_index, count, player)
-			minetest.log("action", player:get_player_name() ..
-				" moves stuff in chest at " .. minetest.pos_to_string(pos))
-		end,
-		on_metadata_inventory_put = function(pos, listname, index, stack, player)
-			minetest.log("action", player:get_player_name() ..
-				" moves stuff to chest at " .. minetest.pos_to_string(pos))
-		end,
-		on_metadata_inventory_take = function(pos, listname, index, stack, player)
-			minetest.log("action", player:get_player_name() ..
-				" takes stuff from chest at " .. minetest.pos_to_string(pos))
-		end
-	}
-
-	for k, v in pairs(custom_def) do
-		def[k] = v
-	end
-
-	minetest.register_node(name, def)
-end
-
-
-register_chest("scifi_nodes:crate", {
+--chest code Copyright (C) 2011-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+minetest.register_node("scifi_nodes:crate", {
 	description = "Crate",
 	tiles = {"scifi_nodes_crate.png"},
-	groups = {
-		cracky = 1,
-		oddly_breakable_by_hand = 2,
-		fuel = 8
-	}
+	paramtype2 = "facedir",
+	groups = {cracky = 1, oddly_breakable_by_hand = 2, fuel = 8},
+	legacy_facedir_simple = true,
+	is_ground_content = false,
+	sounds = default.node_sound_wood_defaults(),
+
+	after_dig_node = drop_chest_stuff(),
+	on_construct = function(pos)
+		local meta = minetest.get_meta(pos)
+		meta:set_string("formspec", chest_formspec)
+		meta:set_string("infotext", "Crate")
+		local inv = meta:get_inventory()
+		inv:set_size("main", 8 * 4)
+	end,
+	on_metadata_inventory_move = function(pos, from_list, from_index,
+			to_list, to_index, count, player)
+		minetest.log("action", player:get_player_name() ..
+			" moves stuff in chest at " .. minetest.pos_to_string(pos))
+	end,
+    on_metadata_inventory_put = function(pos, listname, index, stack, player)
+		minetest.log("action", player:get_player_name() ..
+			" moves stuff to chest at " .. minetest.pos_to_string(pos))
+	end,
+    on_metadata_inventory_take = function(pos, listname, index, stack, player)
+		minetest.log("action", player:get_player_name() ..
+			" takes stuff from chest at " .. minetest.pos_to_string(pos))
+	end,
 })

-register_chest("scifi_nodes:box", {
+minetest.register_node("scifi_nodes:box", {
 	description = "Storage box",
 	tiles = {
 		"scifi_nodes_box_top.png",
@ -91,7 +78,32 @@ register_chest("scifi_nodes:box", {
 		"scifi_nodes_box.png",
 		"scifi_nodes_box.png"
 	},
-	groups = {
-		cracky = 1
-	}
+	paramtype2 = "facedir",
+	groups = {cracky = 1},
+	legacy_facedir_simple = true,
+	is_ground_content = false,
+	sounds = default.node_sound_metal_defaults(),
+
+	after_dig_node = drop_chest_stuff(),
+	on_construct = function(pos)
+		local meta = minetest.get_meta(pos)
+		meta:set_string("formspec", chest_formspec)
+		meta:set_string("infotext", "Box")
+		local inv = meta:get_inventory()
+		inv:set_size("main", 8 * 4)
+	end,
+	on_metadata_inventory_move = function(pos, from_list, from_index,
+			to_list, to_index, count, player)
+		minetest.log("action", player:get_player_name() ..
+			" moves stuff in chest at " .. minetest.pos_to_string(pos))
+	end,
+    on_metadata_inventory_put = function(pos, listname, index, stack, player)
+		minetest.log("action", player:get_player_name() ..
+			" moves stuff to chest at " .. minetest.pos_to_string(pos))
+	end,
+    on_metadata_inventory_take = function(pos, listname, index, stack, player)
+		minetest.log("action", player:get_player_name() ..
+			" takes stuff from chest at " .. minetest.pos_to_string(pos))
+	end,
 })
+--end of chest code
--- a/crafts.lua
+++ b/crafts.lua
@ -1,38 +1,14 @@
 -- 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",
-        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"}
-        }
-    })
-
-    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
+-- 6 basic plastic from 9 homedecor plastic sheet
+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"}
+	}
+})

 minetest.register_craft({
 	output = "scifi_nodes:super_white",
@ -475,15 +451,6 @@ minetest.register_craft({
    }
 })

-minetest.register_craft({
-    output = "scifi_nodes:crate",
-    recipe = {
-        {"scifi_nodes:grey", "scifi_nodes:grey", "scifi_nodes:grey"},
-        {"scifi_nodes:grey", "", "scifi_nodes:grey"},
-        {"scifi_nodes:grey", "scifi_nodes:grey", "scifi_nodes:grey"}
-    }
-})
-
 -- 6 blue metal from 6 plastic, 2 blue dye, 1 dented metal block
 minetest.register_craft({
    output = "scifi_nodes:bluemetal 6",
@ -800,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",
@ -945,15 +902,6 @@ minetest.register_craft({
    }
 })

-minetest.register_craft({
-    output = "scifi_nodes:octwht 4",
-    recipe = {
-        {"dye:white", "scifi_nodes:glass", ""},
-        {"scifi_nodes:glass", "scifi_nodes:lightbar", "scifi_nodes:glass"},
-        {"", "scifi_nodes:glass", "dye:white"}
-    }
-})
-
 -- 1 purple node from 1 plastic, 1 blue dye and 1 red dye
 minetest.register_craft({
    output = "scifi_nodes:purple",
@ -1141,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",
@ -1350,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_pane","scifi_nodes:glass_pane",""},
-        {"","",""}
+        {"scifi_nodes:glass","",""}
    }
 })

@ -1504,9 +1433,9 @@ minetest.register_craft({
 minetest.register_craft({
    output = "scifi_nodes:plant8",
    recipe = {
-        {"flowers:viola","default:junglegrass", "default:grass_1"},
-        {"default:dirt","",""},
-        {"scifi_nodes:greybolts","",""}
+        {"flowers:viola","default:junglegrass"},
+        {"default:dirt",""},
+        {"scifi_nodes:greybolts",""}
    }
 })

@ -1653,6 +1582,15 @@ 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 = {
@ -1742,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"}
    }
 })
@ -1755,29 +1693,3 @@ minetest.register_craft({
    }
 })

-minetest.register_craft({
-	output = "scifi_nodes:fan",
-	recipe = {
-        {"scifi_nodes:grey", 	"", 					"scifi_nodes:grey"},
-        {"", 					"scifi_nodes:vent2", 	""},
-        {"scifi_nodes:grey", 	"", 					"scifi_nodes:grey"}
-    }
-})
-
-minetest.register_craft({
-	output = "scifi_nodes:engine",
-	recipe = {
-        {"scifi_nodes:bluwllight", 	"", 					"scifi_nodes:bluwllight"},
-        {"scifi_nodes:screen",		"scifi_nodes:fan", 	    "scifi_nodes:screen3"},
-        {"scifi_nodes:bluwllight", 	"", 					"scifi_nodes:bluwllight"}
-    }
-})
-
-minetest.register_craft({
-	output = "scifi_nodes:forcefield 4",
-	recipe = {
-        {"scifi_nodes:octbl", 	"", 					"scifi_nodes:octbl"},
-        {"", 					"scifi_nodes:engine", 	""},
-        {"scifi_nodes:octbl", 	"", 					"scifi_nodes:octbl"}
-    }
-})
--- a/depends.txt
+++ b/depends.txt
@ -0,0 +1,10 @@
+default
+basic_materials
+mesecons
+xpanes?
+moreblocks?
+mesecons_microcontroller?
+mesecons_button?
+mesecons_torch?
+mesecons_receiver?
+dye?
--- a/digicode.lua
+++ b/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_metal_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_metal_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })

 minetest.register_craft({
--- a/doors.lua
+++ b/doors.lua
@ -155,7 +155,7 @@ for _, current_door in ipairs(doors) do

 	end

-	local function open_door(pos, node)
+	local function open_door(pos, node, player, itemstack, pointed_thing)
 		-- play sound
 		minetest.sound_play(sound,{
 			max_hear_distance = 16,
@ -240,11 +240,7 @@ for _, current_door in ipairs(doors) do
 		drawtype = "nodebox",
 		paramtype = "light",
 		paramtype2 = "facedir",
-		groups = {
-			cracky = 3,
-			oddly_breakable_by_hand = 1,
-			scifi_nodes_door = 1
-		},
+		groups = {cracky = 3, oddly_breakable_by_hand = 1},
 		node_box = {
 			type = "fixed",
 			fixed = {
@ -257,12 +253,10 @@ for _, current_door in ipairs(doors) do
 				{-0.5, -0.5, -0.0625, 0.5, 1.5, 0.0625}
 			}
 		},
-		_open = open_door,
 		mesecons = mesecons_doors_def,
 		on_place = onplace,
 		after_destruct = afterdestruct,
 		on_rightclick = doors_rightclick,
-		sounds = scifi_nodes.node_sound_metal_defaults(),
 	})

 	minetest.register_node(closed_top, {
@ -277,7 +271,7 @@ for _, current_door in ipairs(doors) do
 		drawtype = "nodebox",
 		paramtype = "light",
 		paramtype2 = "facedir",
-		groups = {cracky = 1, dig_generic = 3},
+		groups = {cracky = 1},
 		node_box = {
 			type = "fixed",
 			fixed = {
@ -291,7 +285,6 @@ for _, current_door in ipairs(doors) do
 			}
 		},
 		can_dig = nodig,
-		sounds = scifi_nodes.node_sound_metal_defaults(),
 	})

 	minetest.register_node(opened, {
@ -307,7 +300,7 @@ for _, current_door in ipairs(doors) do
 		paramtype = "light",
 		paramtype2 = "facedir",
 		drop = closed,
-		groups = {cracky = 1, dig_generic = 3},
+		groups = {cracky = 1},
 		node_box = {
 			type = "fixed",
 			fixed = {
@ -323,7 +316,6 @@ for _, current_door in ipairs(doors) do
 		after_place_node = afterplace,
 		after_destruct = afterdestruct,
 		on_timer = ontimer,
-		sounds = scifi_nodes.node_sound_metal_defaults(),
 	})

 	minetest.register_node(opened_top, {
@ -338,7 +330,7 @@ for _, current_door in ipairs(doors) do
 		drawtype = "nodebox",
 		paramtype = "light",
 		paramtype2 = "facedir",
-		groups = {cracky = 1, dig_generic = 3},
+		groups = {cracky = 1},
 		node_box = {
 			type = "fixed",
 			fixed = {
@ -352,30 +344,5 @@ for _, current_door in ipairs(doors) do
 			}
 		},
 		can_dig = nodig,
-		sounds = scifi_nodes.node_sound_metal_defaults(),
 	})
 end     -- end of doors table browsing
-
-- opens the scifi-door at the given position
-function scifi_nodes.open_door(pos)
-	local node = minetest.get_node_or_nil(pos)
-	if not node then
-		-- area not loaded
-		return false
-	end
-
-	local def = minetest.registered_nodes[node.name]
-	if type(def._open) ~= "function" then
-		-- open function not found
-		return false
-	end
-
-	if not def.groups or not def.groups.scifi_nodes_door then
-		-- not a scifi_nodes door
-		return false
-	end
-
-	-- call open function
-	def._open(pos, node)
-	return true
-end
--- a/forcefield.lua
+++ b/forcefield.lua
@ -1,21 +0,0 @@
-minetest.register_node("scifi_nodes:forcefield", {
-	description = "Forcefield",
-	sunlight_propagates = true,
-	drawtype = "glasslike",
-	groups = {
-		cracky = 1,
-		level = 3
-	},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
-	paramtype = "light",
-	light_source = minetest.LIGHT_MAX,
-	tiles = {{
-		name = "scifi_nodes_forcefield.png",
-		animation = {
-			type = "vertical_frames",
-			aspect_w = 16,
-			aspect_h = 16,
-			length = 1.0,
-		}
-	}}
-})
--- a/init.lua
+++ b/init.lua
@ -4,43 +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")
-
-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.."/builder.lua")
+dofile(MP.."/chest.lua")
 dofile(MP.."/plants.lua")
-dofile(MP.."/models.lua")
 dofile(MP.."/nodes.lua")
 dofile(MP.."/doors.lua")
-dofile(MP.."/switch.lua")
-dofile(MP.."/protected_switch.lua")
+dofile(MP.."/switches.lua")
 dofile(MP.."/nodeboxes.lua")
 dofile(MP.."/palm_scanner.lua")
 dofile(MP.."/digicode.lua")
-dofile(MP.."/octagon_panes.lua")
-dofile(MP.."/forcefield.lua")
+dofile(MP.."/models.lua")
 dofile(MP.."/crafts.lua")
-
-if minetest.get_modpath("letters") then
-	-- register letter nodes
-	dofile(MP.."/letters.lua")
-end
-
-if minetest.get_modpath("mesecons_stealthnode") then
-	-- register stealthnodes
-	dofile(MP.."/stealthnodes.lua")
-end
-
-minetest.log("action", "[scifi_nodes] loaded.")
--- a/letters.lua
+++ b/letters.lua
@ -1,11 +0,0 @@
-letters.register_letters("scifi_nodes", "white2", "scifi_nodes:white2", "Plastic", "scifi_nodes_white2.png", {
-    paramtype2 = "colorwallmounted",
-    palette = "unifieddyes_palette_colorwallmounted.png",
-    groups = {
-        ud_param2_colorable = 1,
-        not_in_creative_inventory = 1,
-        not_in_craft_guide = 1,
-        oddly_breakable_by_hand = 1,
-        attached_node = 1
-    }
-})
--- a/mod.conf
+++ b/mod.conf
@ -1,17 +1,4 @@
 name = scifi_nodes
 description = Minetest mod that adds scifi themed blocks, doors, materials, plants and other assets.
-optional_depends = """
-default,
-xpanes,
-mesecons,
-moreblocks,
-mesecons_microcontroller,
-mesecons_button,
-mesecons_torch,
-mesecons_receiver,
-basic_materials,
-dye,
-unifieddyes,
-letters,
-mesecons_stealthnode
-"""
+depends = default,dye
+optional_depends = xpanes,mesecons,moreblocks,mesecons_microcontroller,mesecons_button,mesecons_torch,mesecons_receiver,basic_materials
--- a/models.lua
+++ b/models.lua
@ -2,52 +2,43 @@
 --Copyright (c) 2011-2015 Calinou and contributors.
 --Licensed under the zlib license.

-function scifi_nodes.register_slope(name, desc, texture, light, soundtype)
-	local sounds
-	if soundtype == "stone" then
-		sounds = scifi_nodes.node_sound_stone_defaults()
-	else
-		sounds = scifi_nodes.node_sound_metal_defaults()
-	end
-
-	minetest.register_node("scifi_nodes:slope_"..name, {
-		description = desc.." Slope",
-		sunlight_propagates = false,
-		drawtype = "mesh",
-		mesh = "scifi_nodes_slope.obj",
-		tiles = texture,
-			selection_box = {
-				type = "fixed",
-		fixed = {
-			{-0.5,  -0.5,  -0.5, 0.5, -0.25, 0.5},
-			{-0.5, -0.25, -0.25, 0.5,     0, 0.5},
-			{-0.5,     0,     0, 0.5,  0.25, 0.5},
-			{-0.5,  0.25,  0.25, 0.5,   0.5, 0.5}
-		}
-			},
-			collision_box = {
-				type = "fixed",
-		fixed = {
-			{-0.5,  -0.5,  -0.5, 0.5, -0.25, 0.5},
-			{-0.5, -0.25, -0.25, 0.5,     0, 0.5},
-			{-0.5,     0,     0, 0.5,  0.25, 0.5},
-			{-0.5,  0.25,  0.25, 0.5,   0.5, 0.5}
-		}
-			},
-		paramtype = "light",
-		paramtype2 = "facedir",
-		use_texture_alpha = "clip",
-		light_source = light,
-		groups = {cracky=1, dig_generic = 3},
-		on_place = minetest.rotate_node,
-		sounds = sounds,
-	})
+function scifi_nodes.register_slope(name, desc, texture, light)
+minetest.register_node("scifi_nodes:slope_"..name, {
+	description = desc.." Slope",
+	sunlight_propagates = false,
+	drawtype = "mesh",
+	mesh = "scifi_nodes_slope.obj",
+	tiles = texture,
+		selection_box = {
+			type = "fixed",
+	fixed = {
+		{-0.5,  -0.5,  -0.5, 0.5, -0.25, 0.5},
+		{-0.5, -0.25, -0.25, 0.5,     0, 0.5},
+		{-0.5,     0,     0, 0.5,  0.25, 0.5},
+		{-0.5,  0.25,  0.25, 0.5,   0.5, 0.5}
+	}
+		},
+		collision_box = {
+			type = "fixed",
+	fixed = {
+		{-0.5,  -0.5,  -0.5, 0.5, -0.25, 0.5},
+		{-0.5, -0.25, -0.25, 0.5,     0, 0.5},
+		{-0.5,     0,     0, 0.5,  0.25, 0.5},
+		{-0.5,  0.25,  0.25, 0.5,   0.5, 0.5}
+	}
+		},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	light_source = light,
+	groups = {cracky=1},
+	on_place = minetest.rotate_node
+})
 end

 -- register some blocks in stairsplus if available (part of moreblocks)
-scifi_nodes.register_slope("white2", "Plastic", {"scifi_nodes_white2.png",}, 0, "stone")
-scifi_nodes.register_slope("super_white", "Super Plastic", {"scifi_nodes_super_white.png",}, 11, "stone")
-scifi_nodes.register_slope("ultra_white", "Super Plastic", {"scifi_nodes_ultra_white.png",}, minetest.LIGHT_MAX, "stone")
+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("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)
@ -62,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("blight2", "Blue Light 2", {"scifi_nodes_capsule3.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",}, 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)
@ -73,3 +64,111 @@ scifi_nodes.register_slope("bluemetal", "Blue metal", {"scifi_nodes_bluemetal.pn
 scifi_nodes.register_slope("wall", "Metal wall", {"scifi_nodes_wall.png",}, 0)
 scifi_nodes.register_slope("rough", "Rough metal", {"scifi_nodes_rough.png",}, 0)
 scifi_nodes.register_slope("blklt2", "Black stripe light", {"scifi_nodes_black_light2.png",}, 10)
+
+-- Register Nodes for Stairsplus
+local node = {}
+
+node.types = {
+	{"blue",      "blue lines",        "blue"},
+	{"holes",       "metal with holes","holes"},
+	{"white2",      "plastic",         "white2"},
+    {"super_white",      "Super Plastic",         "super_white", 11},
+    {"ultra_white",      "Ultra Plastic",         "ultra_white", default.LIGHT_MAX},
+--	{"engine",      "engine",          "engine"},
+	{"wall",      "metal wall",        "wall"},
+	{"white",      "plastic wall",     "white"},
+	{"stripes2top",     "dirty metal block","metal2"},
+	{"rough",      "rough metal",      "rough"},
+	{"lighttop",      "metal block",      "metal"},
+	{"red",      "red lines",          "red"},
+	{"green",      "green lines",      "green"},
+	{"vent2",      "vent",              "vent"},
+	{"stripes",      "hazard stripes", "stripes"},
+	{"rust",      "rusty metal",       "rust"},
+	{"mesh",      "metal mesh",       "mesh"},
+	{"black",      "black wall",       "black"},
+	{"blackoct",      "black octagon",       "blackoct"},
+	{"blackpipe",      "black pipe",       "blackpipe"},
+	{"blacktile",      "black tile",       "blktl"},
+	{"blacktile2",      "black tile 2",       "blktl2"},
+	{"blackvent",      "black vent",       "blkvnt"},
+	{"bluebars",      "blue bars",       "bluebars"},
+	{"bluemetal",      "blue metal",       "blumtl"},
+	{"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"},
+	{"whitetile",      "white tile2",       "whttl"},
+	{"black_detail",      "black detail",       "blckdtl"},
+	{"green_square",      "green metal block",       "grnblck"},
+	{"red_square",      "red metal block",       "redblck"},
+	{"grey_square",      "grey metal block",       "greyblck"},
+	{"blue_square",      "blue metal block",       "blublck"},
+	{"black_mesh",      "black vent block",       "blckmsh"},
+	{"dent",      "dented metal block",       "dent"},
+	{"greenmetal",      "green metal wall",       "grnmetl"},
+	{"greenmetal2",      "green metal wall2",       "grnmetl2"},
+	{"greenlights",      "green wall lights",       "grnlt", 10},
+	{"greenlights2",      "green wall lights2",       "grnlt2", 10},
+	{"greenbar",      "green light bar",       "grnlghtbr", 10},
+	{"green2",      "green wall panel",       "grn2"},
+	{"greentubes",      "green pipes",       "grntubes"},
+	{"grey",      "grey wall",       "gry"},
+	{"greybolts",      "grey wall bolts",       "gryblts"},
+	{"greybars",      "grey bars",       "grybrs"},
+	{"greydots",      "grey wall dots",       "grydts"},
+	{"greygreenbar",      "gray power pipe",       "grygrnbr", 10},
+	{"octofloor",      "Doom floor",       "octofloor"},
+	{"octofloor2",      "Brown Doom floor",       "octofloor2"},
+	{"doomwall1",      "Doom wall 1",       "doomwall1"},
+	{"doomwall2",      "Doom wall 2",       "doomwall2"},
+	{"doomwall3",      "Doom wall 3",       "doomwall3"},
+	{"doomwall4",      "Doom wall 4",       "doomwall4"},
+	{"doomwall41",      "Doom wall 4.1",       "doomwall4.1"},
+	{"doomwall42",      "Doom wall 4.2",       "doomwall4.2"},
+	{"doomwall43",      "Doom wall 4.3",       "doomwall4.3"},
+	{"doomwall431",      "Doom wall 4.3.1",       "doomwall4.3.1"},
+	{"doomwall44",      "Doom wall 4.4",       "doomwall4.4"},
+	{"blackdmg",      "Damaged black wall",       "blckdmg"},
+	{"blackdmgstripe",      "Damaged black wall(stripes)",       "blckdmgstripe"},
+	{"doomengine",      "Doom engine wall",       "doomengine"},
+--	{"monitorwall",      "Wall monitors",       "monitorwall"},
+	{"screen3",      "Wall monitor",       "screen3"},
+	{"doomlight",      "Doom light",       "doomlight", 12},
+	{"bluwllight",      "Blue wall light", "capsule3", default.LIGHT_MAX},
+	{"bluegrid",      "Blue Grid", "bluegrid", 5},
+	{"fan",      "Fan",       "fan"},
+	{"ppllght",      "Purple wall light", "", default.LIGHT_MAX},
+	{"pplwll",      "Purple wall", "", 0},
+	{"pplwll2",      "Purple wall2", "", 0},
+	{"pplwll3",      "Purple wall3", "", 0},
+	{"pplwll4",      "Purple wall4", "", 0},
+	{"pplblk",      "Purple tile", "", 0},
+	{"purple",      "Purple node", "", 0},
+	{"rock",      "Moonstone", "", 0},
+	{"rock2",      "Moonstone2", "", 0},
+	{"blackvnt",      "Black vent", "", 0},
+	{"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", row[1], "scifi_nodes:"..name, {
+			description = desc,
+			tiles = {"scifi_nodes_"..name..".png"},
+			groups = {cracky=1},
+			paramtype = "light",
+			paramtype2 = "facedir",
+			light_source = light,
+		})
+	end
+end
--- a/nodeboxes.lua
+++ b/nodeboxes.lua
@ -18,7 +18,7 @@ minetest.register_node("scifi_nodes:alienslope", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
 	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 = scifi_nodes.node_sound_wood_defaults(),
+	sounds = default.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, dig_generic = 3},
+	groups = {cracky=1},
 	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 = 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", {
@ -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, dig_generic = 3},
+	groups = {cracky=1, oddly_breakable_by_hand=1, dig_immediate=2, falling_node=1},
 	light_source = 5,
 	node_box = {
 		type = "fixed",
@ -122,8 +122,8 @@ 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()
+	}
 })

 if minetest.get_modpath("scifi_mobs") then
@ -131,8 +131,8 @@ minetest.register_abm({
 	nodenames = {"scifi_nodes:egg"},
 	interval = 30, chance = 10,
 	action = function(pos, node, _, _)
-		minetest.add_entity(pos, "scifi_mobs:xenomorph")
-		minetest.remove_node(pos)
+		minetest.env:add_entity(pos, "scifi_mobs:xenomorph")
+		minetest.env:remove_node(pos)
 	end
 })
 end
@ -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)
-        local placer_name = placer:get_player_name()
+	on_construct = function(pos, node, placer)
 		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()
+	on_rightclick = function(pos, node, clicker)
 		local meta = minetest.get_meta(pos)
 		if meta:get_int("type") == 1 and position2 ~= nil and position1 ~= nil then
 		minetest.add_particlespawner(
@ -189,12 +187,12 @@ minetest.register_node("scifi_nodes:pad", {
 		if minetest.get_node({x=ppos.x, y=ppos.y, z=ppos.z}).name == "scifi_nodes:pad" then
 			clicker:setpos(position2)
 		end
-		local objs = minetest.get_objects_inside_radius(pos, 3)
+		local objs = minetest.env:get_objects_inside_radius(pos, 3)
                for _, obj in pairs(objs) do
 				if obj:get_luaentity() and not obj:is_player() then
 				if obj:get_luaentity().name == "__builtin:item" then
 				local item1 = obj:get_luaentity().itemstring
-				local obj2 = minetest.add_entity(position2, "__builtin:item")
+				local obj2 = minetest.env:add_entity(position2, "__builtin:item")
 				obj2:get_luaentity():set_item(item1)
 				obj:remove()
 				end
@ -219,16 +217,16 @@ minetest.register_node("scifi_nodes:pad", {
 			"scifi_nodes_tp_part.png" --texture
 		)
 		minetest.after(1, function()
-        local ppos = clicker:getpos()
+		local ppos = clicker:getpos()
 		if minetest.get_node({x=ppos.x, y=ppos.y, z=ppos.z}).name == "scifi_nodes:pad" then
 			clicker:setpos(position1)
 		end
-		local objs = minetest.get_objects_inside_radius(pos, 3)
+		local objs = minetest.env:get_objects_inside_radius(pos, 3)
                for _, obj in pairs(objs) do
 				if obj:get_luaentity() and not obj:is_player() then
 				if obj:get_luaentity().name == "__builtin:item" then
 				local item1 = obj:get_luaentity().itemstring
-				local obj2 = minetest.add_entity(position1, "__builtin:item")
+				local obj2 = minetest.env:add_entity(position1, "__builtin:item")
 				obj2:get_luaentity():set_item(item1)
 				obj:remove()
 				end
@ -237,13 +235,13 @@ minetest.register_node("scifi_nodes:pad", {
 		end)
 		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))
+		meta:set_int("type", 1)
+		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))
-		else minetest.chat_send_player(clicker_name, "Teleporter error!")
+		minetest.chat_send_all("Teleporter 2 connected at "..minetest.pos_to_string(pos))
+		else minetest.chat_send_all("Teleporter error!")
 		end
 	end,
 	on_destruct = function(pos, oldnode, placer)
@ -264,8 +262,8 @@ 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_metal_defaults(),
+	sounds = default.node_sound_wood_defaults()
+	}
 })

 minetest.register_node("scifi_nodes:pplwndw", {
@ -281,9 +279,9 @@ minetest.register_node("scifi_nodes:pplwndw", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = "blend",
-	groups = {cracky=3, dig_generic = 4},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	use_texture_alpha = true,
+	groups = {cracky=3},
+	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",
@ -320,69 +318,54 @@ minetest.register_node("scifi_nodes:gloshroom", {
 			{-0.1875, 0.125, -0.1875, 0.1875, 0.1875, 0.1875}, -- NodeBox5
 			{-0.375, -0.0625, -0.4375, 0.375, 0, 0.4375}, -- NodeBox6
 		}
-	},
-	sounds = scifi_nodes.node_sound_plant_defaults(),
+	}
 })

 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.4375, -1.5, 0.375, 0.4375, -0.5, 0.4375},
-			{-0.4375, -1.5, -0.375, -0.375, -0.5, 0.375},
-			{0.375, -1.5, -0.375, 0.4375, -0.5, 0.375},
-			{-0.375, -0.5, -0.375, 0.375, -0.4375, 0.375},
-			{-0.3125, -0.4375, -0.3125, 0.3125, -0.375, 0.3125},
-			{-0.25, -0.375, -0.25, 0.25, -0.3125, 0.25},
-			{-0.1875, -0.3125, -0.1875, 0.1875, -0.25, 0.1875}
+			{-0.1875, -0.5625, -0.1875, 0.1875, -0.5, 0.1875}, -- NodeBox13
+			{-0.25, -0.625, -0.25, 0.25, -0.5625, 0.25}, -- NodeBox14
+			{-0.3125, -0.6875, -0.3125, 0.3125, -0.625, 0.3125}, -- NodeBox15
+			{-0.375, -0.75, -0.375, 0.375, -0.6875, 0.375}, -- NodeBox16
+			{-0.4375, -0.75, 0.375, 0.4375, -1.5, 0.4375}, -- NodeBox17
+			{-0.4375, -0.75, -0.4375, 0.4375, -1.5, -0.375}, -- NodeBox18
+			{0.375, -0.75, -0.4375, 0.4375, -1.5, 0.4375}, -- NodeBox19
+			{-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 = {
-		"scifi_nodes_dirt.png^scifi_nodes_pot.png",
+		"scifi_nodes_pot.png",
 		"scifi_nodes_greybolts.png",
 		"scifi_nodes_greybolts.png",
 		"scifi_nodes_greybolts.png",
@ -391,32 +374,34 @@ minetest.register_node("scifi_nodes:pot", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	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}
-	},
+	groups = {cracky=1, soil=1, sand=1},
 	node_box = {
 		type = "fixed",
 		fixed = {
-			{-0.5, -0.25, -0.5, 0.5, 0.5, 0.5},
-			{0.1875, -0.5, 0.1875, 0.5, -0.25, 0.5},
-			{-0.5, -0.5, -0.5, -0.1875, -0.25, -0.1875},
-			{-0.5, -0.5, 0.1875, -0.1875, -0.25, 0.5},
-			{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}
+			{-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}, -- NodeBox2
+			{-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}, -- NodeBox4
+			{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}, -- NodeBox5
 		}
 	},
-	on_rightclick = toggle_lid,
-	on_destruct = remove_lid,
-	sounds = scifi_nodes.node_sound_metal_defaults({
-		footstep = scifi_nodes.node_sound_dirt_defaults().footstep,
-	}),
+	on_rightclick = function(pos, node, clicker, item, _)
+		local lid_node = minetest.get_node({x=pos.x, y=pos.y+2, z=pos.z})
+		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 = {
-		"scifi_nodes_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",
@ -425,26 +410,28 @@ minetest.register_node("scifi_nodes:pot2", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	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}
-	},
+	groups = {cracky=1, soil=3, wet=1},
 	node_box = {
 		type = "fixed",
 		fixed = {
-			{-0.5, -0.25, -0.5, 0.5, 0.5, 0.5},
-			{0.1875, -0.5, 0.1875, 0.5, -0.25, 0.5},
-			{-0.5, -0.5, -0.5, -0.1875, -0.25, -0.1875},
-			{-0.5, -0.5, 0.1875, -0.1875, -0.25, 0.5},
-			{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}
+			{-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}, -- NodeBox2
+			{-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}, -- NodeBox4
+			{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}, -- NodeBox5
 		}
 	},
-	on_rightclick = toggle_lid,
-	on_destruct = remove_lid,
-	sounds = scifi_nodes.node_sound_metal_defaults({
-		footstep = scifi_nodes.node_sound_dirt_defaults().footstep,
-	}),
+	on_rightclick = function(pos, node, clicker, item, _)
+		local lid_node = minetest.get_node({x=pos.x, y=pos.y+2, z=pos.z})
+		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", {
@ -456,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 = {
@ -469,8 +456,8 @@ minetest.register_node("scifi_nodes:lightbar", {
 			{-0.125, -0.5, -0.5, 0.125, -0.375, 0.5}, -- NodeBox1
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:light_dynamic", {
@ -486,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", {
@ -525,8 +506,8 @@ 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,
 	climbable = true,
@ -540,9 +521,8 @@ minetest.register_node("scifi_nodes:lightbars", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	paramtype2 = "facedir",
-	use_texture_alpha = "blend",
-	light_source = minetest.LIGHT_MAX,
+	use_texture_alpha = true,
+	light_source = default.LIGHT_MAX,
 	node_box = {
 		type = "fixed",
 		fixed = {
@ -552,8 +532,8 @@ minetest.register_node("scifi_nodes:lightbars", {
 			{0.125, -0.5, -0.375, 0.375, 0.5, -0.125}, -- NodeBox4
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:liquid_pipe", {
@ -562,33 +542,11 @@ tiles = {{
 		name = "scifi_nodes_liquid.png",
 		animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 1.00},
 	}},
-	use_texture_alpha = "blend",
-	light_source = minetest.LIGHT_MAX,
+	use_texture_alpha = true,
+	light_source = default.LIGHT_MAX,
 	drawtype = "nodebox",
 	sunlight_propagates = true,
 	paramtype = "light",
-	paramtype2 = "facedir",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.375, -0.5, -0.375, 0.375, 0.5, 0.375}, -- NodeBox1
-		}
-	},
-	groups = {cracky=1, oddly_breakable_by_hand=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults()
-})
-
-minetest.register_node("scifi_nodes:liquid_pipe2", {
-	description = "Liquid pipe 2",
-tiles = {
-		"scifi_nodes_orange.png",
-	},
-	use_texture_alpha = "blend",
-	light_source = minetest.LIGHT_MAX,
-	drawtype = "nodebox",
-	sunlight_propagates = true,
-	paramtype = "light",
-	paramtype2 = "facedir",
 	node_box = {
 		type = "fixed",
 		fixed = {
@ -596,7 +554,27 @@ 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", {
+	description = "Liquid pipe 2",
+tiles = {
+		"scifi_nodes_orange.png",
+	},
+	use_texture_alpha = true,
+	light_source = default.LIGHT_MAX,
+	drawtype = "nodebox",
+	sunlight_propagates = true,
+	paramtype = "light",
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.375, -0.5, -0.375, 0.375, 0.5, 0.375}, -- NodeBox1
+		}
+	},
+	groups = {cracky=1, oddly_breakable_by_hand=1},
+	sounds = default.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:powered_stand", {
@ -641,7 +619,6 @@ minetest.register_node("scifi_nodes:powered_stand", {
 			return item
 		end
 	end,
-	sounds = scifi_nodes.node_sound_wood_defaults()
 })

 minetest.register_node("scifi_nodes:cover", {
@ -664,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_metal_defaults(),
+	sounds = default.node_sound_wood_defaults(),
 	groups = {cracky=1, oddly_breakable_by_hand=1}
 })

@ -688,8 +665,7 @@ minetest.register_node("scifi_nodes:computer", {
 			{-0.4375, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox1
 		}
 	},
-	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	groups = {cracky=1, oddly_breakable_by_hand=1}
 })

 minetest.register_node("scifi_nodes:keysmonitor", {
@ -715,8 +691,7 @@ minetest.register_node("scifi_nodes:keysmonitor", {
 			{-0.5, -0.3125, 0.25, 0.5, 0.5, 0.375}, -- NodeBox4
 		}
 	},
-	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = scifi_nodes.node_sound_defaults(),
+	groups = {cracky=1, oddly_breakable_by_hand=1}
 })

 minetest.register_node("scifi_nodes:microscope", {
@ -743,8 +718,7 @@ minetest.register_node("scifi_nodes:microscope", {
 			{-0.125, -0.25, -0.125, 0.125, -0.1875, 0.1875}, -- NodeBox5
 		}
 	},
-	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = scifi_nodes.node_sound_defaults(),
+	groups = {cracky=1, oddly_breakable_by_hand=1}
 })

 minetest.register_node("scifi_nodes:table", {
@ -772,8 +746,8 @@ 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(),
-	groups = {cracky=1, dig_generic = 3}
+	sounds = default.node_sound_metal_defaults(),
+	groups = {cracky=1}
 })

 minetest.register_node("scifi_nodes:laptop_open", {
@ -801,7 +775,6 @@ minetest.register_node("scifi_nodes:laptop_open", {
 	on_rightclick = function(pos, node, clicker, item, _)
 			minetest.set_node(pos, {name="scifi_nodes:laptop_closed", param2=node.param2})
 	end,
-	sounds = scifi_nodes.node_sound_metal_defaults(),
 })

 minetest.register_node("scifi_nodes:laptop_closed", {
@ -828,7 +801,6 @@ minetest.register_node("scifi_nodes:laptop_closed", {
 	on_rightclick = function(pos, node, clicker, item, _)
 			minetest.set_node(pos, {name="scifi_nodes:laptop_open", param2=node.param2})
 	end,
-	sounds = scifi_nodes.node_sound_metal_defaults(),
 })

 minetest.register_node("scifi_nodes:pipen", {
@ -858,9 +830,8 @@ minetest.register_node("scifi_nodes:pipen", {
 			{-0.5, -0.4375, -0.5, 0.5, -0.375, 0.5}, -- NodeBox9
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
-	on_place = minetest.rotate_node,
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	groups = {cracky=1},
+	on_place = minetest.rotate_node
 })

 minetest.register_node("scifi_nodes:windowcorner", {
@ -875,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 = {
@ -889,9 +860,9 @@ minetest.register_node("scifi_nodes:windowcorner", {
 			{-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
+	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", {
@ -906,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 = {
@ -916,9 +887,9 @@ minetest.register_node("scifi_nodes:windowstraight", {
 			{-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
+	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", {
@ -933,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 = {
@ -947,9 +918,9 @@ minetest.register_node("scifi_nodes:windowcorner2", {
 			{-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
+	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", {
@ -964,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 = {
@ -974,9 +945,9 @@ minetest.register_node("scifi_nodes:windowstraight2", {
 			{-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
 	on_place = minetest.rotate_node,
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })


@ -991,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",
@ -1004,8 +975,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, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	groups = {cracky=1, oddly_breakable_by_hand=1},
+	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,
@ -1021,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",
@ -1035,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,
@ -1051,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",
@ -1065,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,
@ -1094,8 +1065,8 @@ minetest.register_node("scifi_nodes:itemholder", {
 			{-0.25, -0.5, -0.0625, -0.1875, -0.0625, 0.0625}, -- NodeBox5
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
-	on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow,
+	groups = {cracky=1},
+	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())
@ -1107,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
@ -1127,7 +1099,6 @@ minetest.register_node("scifi_nodes:itemholder", {
 			minetest.add_item(pos, meta:get_string("item"))
 		end
 	end,
-	sounds = scifi_nodes.node_sound_metal_defaults(),
 })

 minetest.register_node("scifi_nodes:glassscreen", {
@ -1140,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",
@ -1154,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(),
 })


@ -1185,8 +1156,7 @@ minetest.register_node("scifi_nodes:widescreen", {
 			{-0.5, 0.25, 0.375, 0.5, 0.3125, 0.5},         -- NodeBox7
 		}
 	},
-	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = scifi_nodes.node_sound_defaults(),
+	groups = {cracky=1, oddly_breakable_by_hand=1}
 })

 minetest.register_node("scifi_nodes:tallscreen", {
@ -1216,8 +1186,7 @@ minetest.register_node("scifi_nodes:tallscreen", {
 			{0.25, -0.5, 0.375, 0.3125, 0.5, 0.5}, -- NodeBox7
 		}
 	},
-	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = scifi_nodes.node_sound_defaults(),
+	groups = {cracky=1, oddly_breakable_by_hand=1}
 })

 -- https://forum.minetest.net/viewtopic.php?f=10&t=13125&p=261481#p261481
@ -1228,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 = {
@ -1237,7 +1206,7 @@ minetest.register_node("scifi_nodes:windowpanel", {
            {-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
        }
    },
-    groups = {cracky=1, dig_generic = 3},
+    groups = {cracky=1},
    on_place = minetest.rotate_node,
-    sounds = scifi_nodes.node_sound_glass_defaults(),
+    sounds = default.node_sound_glass_defaults(),
 })
--- a/nodes.json
+++ b/nodes.json
@ -1,276 +0,0 @@
-{
-    "blue": {
-        "description": "Blue lines"
-    },
-    "holes": {
-        "description": "Metal with holes"
-    },
-    "white2": {
-        "description": "plastic",
-        "colorable": true,
-        "sounds": "stone"
-    },
-    "super_white": {
-        "description": "Super Plastic",
-        "light": 11,
-        "sounds": "stone"
-    },
-    "ultra_white": {
-        "description": "Ultra Plastic",
-        "light": 14,
-        "sounds": "stone"
-    },
-    "engine": {
-        "description": "Engine"
-    },
-    "wall": {
-        "description": "metal wall"
-    },
-    "white": {
-        "description": "plastic wall",
-        "colorable": true,
-        "sounds": "stone"
-    },
-    "stripes2top": {
-        "description": "Dirty metal block"
-    },
-    "rough": {
-        "description": "rough metal"
-    },
-    "lighttop": {
-        "description": "metal block"
-    },
-    "red": {
-        "description": "red lines"
-    },
-    "green": {
-        "description": "green lines"
-    },
-    "vent2": {
-        "description": "vent"
-    },
-    "stripes": {
-        "description": "hazard stripes"
-    },
-    "rust": {
-        "description": "rusty metal"
-    },
-    "mesh": {
-        "description": "metal mesh"
-    },
-    "black": {
-        "description": "black wall"
-    },
-    "blackoct": {
-        "description": "black octagon"
-    },
-    "blackpipe": {
-        "description": "black pipe"
-    },
-    "blacktile": {
-        "description": "black tile"
-    },
-    "blacktile2": {
-        "description": "black tile 2"
-    },
-    "blackvent": {
-        "description": "black vent"
-    },
-    "bluebars": {
-        "description": "blue bars"
-    },
-    "bluemetal": {
-        "description": "blue metal"
-    },
-    "bluetile": {
-        "description": "blue tile"
-    },
-    "greytile": {
-        "description": "grey tile"
-    },
-    "mesh2": {
-        "description": "metal floormesh"
-    },
-    "pipe": {
-        "description": "wall pipe"
-    },
-    "pipeside": {
-        "description": "side pipe"
-    },
-    "tile": {
-        "description": "white tile"
-    },
-    "whiteoct": {
-        "description": "white octagon",
-        "colorable": true
-    },
-    "whitetile": {
-        "description": "white tile 2",
-        "colorable": true
-    },
-    "black_detail": {
-        "description": "black detail"
-    },
-    "green_square": {
-        "description": "green metal block"
-    },
-    "red_square": {
-        "description": "red metal block"
-    },
-    "grey_square": {
-        "description": "grey metal block"
-    },
-    "blue_square": {
-        "description": "blue metal block"
-    },
-    "black_mesh": {
-        "description": "black vent block"
-    },
-    "dent": {
-        "description": "dented metal block",
-        "colorable": true
-    },
-    "greenmetal": {
-        "description": "green metal wall"
-    },
-    "greenmetal2": {
-        "description": "green metal wall2"
-    },
-    "greenlights": {
-        "description": "green wall lights",
-        "light": 10
-    },
-    "greenlights2": {
-        "description": "green wall lights2",
-        "light": 10
-    },
-    "greenbar": {
-        "description": "green light bar",
-        "light": 10
-    },
-    "green2": {
-        "description": "green wall panel"
-    },
-    "greentubes": {
-        "description": "green pipes"
-    },
-    "grey": {
-        "description": "grey wall"
-    },
-    "greybolts": {
-        "description": "grey wall bolts"
-    },
-    "greybars": {
-        "description": "grey bars"
-    },
-    "greydots": {
-        "description": "grey wall dots"
-    },
-    "greygreenbar": {
-        "description": "gray power pipe",
-        "light": 10
-    },
-    "octofloor": {
-        "description": "Doom floor",
-        "sounds": "stone"
-    },
-    "octofloor2": {
-        "description": "Brown Doom floor",
-        "sounds": "stone"
-    },
-    "doomwall1": {
-        "description": "Doom wall 1"
-    },
-    "doomwall2": {
-        "description": "Doom wall 2"
-    },
-    "doomwall3": {
-        "description": "Doom wall 3"
-    },
-    "doomwall4": {
-        "description": "Doom wall 4"
-    },
-    "doomwall41": {
-        "description": "Doom wall 4.1"
-    },
-    "doomwall42": {
-        "description": "Doom wall 4.2"
-    },
-    "doomwall43": {
-        "description": "Doom wall 4.3"
-    },
-    "doomwall431": {
-        "description": "Doom wall 4.3.1"
-    },
-    "doomwall44": {
-        "description": "Doom wall 4.4"
-    },
-    "blackdmg": {
-        "description": "Damaged black wall"
-    },
-    "blackdmgstripe": {
-        "description": "Damaged black wall(stripes)"
-    },
-    "doomengine": {
-        "description": "Doom engine wall"
-    },
-    "monitorwall": {
-        "description": "Wall monitors"
-    },
-    "screen3": {
-        "description": "Wall monitor"
-    },
-    "doomlight": {
-        "description": "Doom light",
-        "light": 12
-    },
-    "bluwllight": {
-        "description": "Blue wall light",
-        "light": 14
-    },
-    "bluegrid": {
-        "description": "Blue Grid",
-        "light": 5
-    },
-    "fan": {
-        "description": "Fan"
-    },
-    "ppllght": {
-        "description": "Purple wall light",
-        "light": 14
-    },
-    "pplwll": {
-        "description": "Purple wall"
-    },
-    "pplwll2": {
-        "description": "Purple wall 2"
-    },
-    "pplwll3": {
-        "description": "Purple wall 3"
-    },
-    "pplwll4": {
-        "description": "Purple wall 4"
-    },
-    "pplblk": {
-        "description": "Purple tile"
-    },
-    "purple": {
-        "description": "Purple node"
-    },
-    "rock": {
-        "description": "Moonstone",
-        "sounds": "stone",
-        "colorable": true
-    },
-    "rock2": {
-        "description": "Moonstone 2",
-        "sounds": "stone",
-        "colorable": true
-    },
-    "blackvnt": {
-        "description": "Black vent"
-    },
-    "blackplate": {
-        "description": "Black plate"
-    }
-}
--- a/nodes.lua
+++ b/nodes.lua
@ -1,18 +1,13 @@
-local has_unifieddyes_mod = minetest.get_modpath("unifieddyes")
-local has_moreblocks_mod = minetest.get_modpath("moreblocks")

 --nodes

 minetest.register_node("scifi_nodes:grassblk", {
 	description = "Dirt With Alien Grass",
-	tiles = {"scifi_nodes_grass.png^[colorize:cyan:80", "scifi_nodes_dirt.png",
-		{name = "scifi_nodes_dirt.png^(scifi_nodes_grass_side.png^[colorize:cyan:80)",
+	tiles = {"default_grass.png^[colorize:cyan:80", "default_dirt.png",
+		{name = "default_dirt.png^(default_grass_side.png^[colorize:cyan:80)",
 			tileable_vertical = false}},
 	light_source = 2,
-	groups = {crumbly=1, oddly_breakable_by_hand=1, soil=1},
-	sounds = scifi_nodes.node_sound_dirt_defaults({
-		footstep = scifi_nodes.node_sound_plant_defaults().footstep,
-	})
+	groups = {crumbly=1, oddly_breakable_by_hand=1, soil=1}
 })

 minetest.register_node("scifi_nodes:light", {
@ -28,8 +23,7 @@ minetest.register_node("scifi_nodes:light", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	groups = {cracky=1}
 })

 minetest.register_node("scifi_nodes:rfloor", {
@ -40,8 +34,8 @@ minetest.register_node("scifi_nodes:rfloor", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	light_source = 10,
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_metal_defaults()
 })

 minetest.register_node("scifi_nodes:bfloor", {
@ -52,8 +46,8 @@ minetest.register_node("scifi_nodes:bfloor", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	light_source = 10,
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_metal_defaults()
 })


@ -69,8 +63,8 @@ minetest.register_node("scifi_nodes:stripes2", {
 		"scifi_nodes_stripes2.png"
 	},
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_metal_defaults()
 })

 minetest.register_node("scifi_nodes:gblock", {
@ -85,8 +79,8 @@ minetest.register_node("scifi_nodes:gblock", {
 		"scifi_nodes_gblock.png"
 	},
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3};
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1};
+	sounds = default.node_sound_metal_defaults()
 })

 minetest.register_node("scifi_nodes:gblock2", {
@ -102,8 +96,8 @@ minetest.register_node("scifi_nodes:gblock2", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_metal_defaults()
 })

 minetest.register_node("scifi_nodes:gblock3", {
@ -119,8 +113,8 @@ minetest.register_node("scifi_nodes:gblock3", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_metal_defaults()
 })


@ -138,8 +132,8 @@ minetest.register_node("scifi_nodes:green_light", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:red_light", {
@ -155,8 +149,8 @@ minetest.register_node("scifi_nodes:red_light", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:discs", {
@ -171,8 +165,8 @@ minetest.register_node("scifi_nodes:discs", {
 		"scifi_nodes_discs.png"
 	},
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:disc", {
@ -185,27 +179,9 @@ minetest.register_node("scifi_nodes:disc", {
 	inventory_image = "scifi_nodes_disc.png",
 	wield_image = "scifi_nodes_disc.png",
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_defaults(),
+	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, dig_generic = 3},
-	light_source = 10,
-	sounds = scifi_nodes.node_sound_glass_defaults(),
-	on_place = minetest.rotate_node
-})

 minetest.register_node("scifi_nodes:blink", {
 	description = "blinking light",
@ -215,9 +191,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, dig_generic = 3},
+	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", {
@ -228,8 +204,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, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:black_screen", {
@ -240,9 +216,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, dig_generic = 3},
+	groups = {cracky=1},
 	light_source = 1,
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	sounds = default.node_sound_stone_defaults()
 })

 minetest.register_node("scifi_nodes:screen", {
@ -253,9 +229,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, dig_generic = 3},
+	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", {
@ -266,9 +242,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, dig_generic = 3},
+	groups = {cracky=1},
 	light_source = 5,
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })


@ -286,8 +262,8 @@ minetest.register_node("scifi_nodes:white_pad", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:white_base", {
@ -303,8 +279,8 @@ minetest.register_node("scifi_nodes:white_base", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:grnpipe", {
@ -320,8 +296,8 @@ minetest.register_node("scifi_nodes:grnpipe", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	groups = {cracky=1},
+	sounds = default.node_sound_metal_defaults(),
 	on_place = minetest.rotate_node
 })

@ -339,8 +315,8 @@ minetest.register_node("scifi_nodes:grnpipe2", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	groups = {cracky=1},
+	sounds = default.node_sound_metal_defaults(),
 	on_place = minetest.rotate_node
 })

@ -353,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, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	groups = {cracky=2},
+	sounds = default.node_sound_glass_defaults(),
 })

 minetest.register_node("scifi_nodes:octgrn", {
@ -368,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, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	groups = {cracky=2},
+	sounds = default.node_sound_glass_defaults(),
 })

 minetest.register_node("scifi_nodes:octbl", {
@ -383,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, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	groups = {cracky=2},
+	sounds = default.node_sound_glass_defaults(),
 })

 minetest.register_node("scifi_nodes:octppl", {
@ -398,36 +374,12 @@ minetest.register_node("scifi_nodes:octppl", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	light_source = 10,
-	groups = {cracky=2, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	groups = {cracky=2},
+	sounds = default.node_sound_glass_defaults(),
 })

-if has_unifieddyes_mod then
-	minetest.register_node("scifi_nodes:octwht", {
-		description = "Octagon Glass",
-		sunlight_propagates = false,
-		drawtype = "glasslike",
-		tiles = {
-			"scifi_nodes_octwht.png",
-		},
-		palette = "unifieddyes_palette_extended.png",
-		paramtype = "light",
-		paramtype2 = "color",
-		use_texture_alpha = "blend",
-		light_source = 10,
-		groups = {
-			cracky = 2,
-			dig_generic = 3,
-			ud_param2_colorable = 1
-		},
-		sounds = scifi_nodes.node_sound_glass_defaults(),
-		on_construct = unifieddyes.on_construct,
-		on_dig = unifieddyes.on_dig
-	})
-end
-
 minetest.register_node("scifi_nodes:tower", {
 	description = "Wind tower",
 	sunlight_propagates = false,
@ -439,8 +391,8 @@ minetest.register_node("scifi_nodes:tower", {
 	visual_scale = 2,
 	inventory_image = "scifi_nodes_tower.png",
 	paramtype = "light",
-	groups = {cracky=2, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=2},
+	sounds = default.node_sound_metal_defaults()
 })

 minetest.register_node("scifi_nodes:junk", {
@ -457,7 +409,7 @@ minetest.register_node("scifi_nodes:junk", {
 	tiles = {
 		"scifi_nodes_junk.png"
 	},
-	groups = {snappy=1, oddly_breakable_by_hand=1, liquid=3, dig_immediate=1},
+	groups = {snappy=1, oddly_breakable_by_hand=1, liquid=3, dig_immediate=1}
 })


@ -474,8 +426,8 @@ minetest.register_node("scifi_nodes:blumetlight", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })


@ -485,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, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:blklt2", {
@ -499,8 +451,8 @@ minetest.register_node("scifi_nodes:blklt2", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:blumetstr", {
@ -511,8 +463,8 @@ minetest.register_node("scifi_nodes:blumetstr", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:glass", {
@ -522,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, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:whtlightbnd", {
@ -536,84 +488,116 @@ minetest.register_node("scifi_nodes:whtlightbnd", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })

-- read "nodes.json"
-local f = assert(io.open(minetest.get_modpath("scifi_nodes") .. "/nodes.json", "rb"))
-local nodes = assert(minetest.parse_json(f:read("*all")))
-f:close()
+--edited wool code (Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>)

-- register all nodes
-for name, def in pairs(nodes) do

-	-- default to "metal" sounds if not specified
-	local sounds
-	if def.sounds == "stone" then
-		sounds = scifi_nodes.node_sound_stone_defaults()
-	else
-		sounds = scifi_nodes.node_sound_metal_defaults()
-	end
-
-	-- tiles (default to nodename as texture-name)
-	local tiles = {"scifi_nodes_" .. name .. ".png"}
-	if def.texture_name then
-		tiles = {"scifi_nodes_" .. def.texture_name .. ".png"}
-	end
+-- This uses a trick: you can first define the recipes using all of the base
+-- colors, and then some recipes using more specific colors for a few non-base
+-- 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 = {
+	{"blue",      "blue lines",        "blue"},
+	{"holes",       "metal with holes","holes"},
+	{"white2",      "plastic",         "white2"},
+    {"super_white",      "Super Plastic",         "super_white", 11},
+    {"ultra_white",      "Ultra Plastic",         "ultra_white", default.LIGHT_MAX},
+	{"engine",      "engine",          "engine"},
+	{"wall",      "metal wall",        "wall"},
+	{"white",      "plastic wall",     "white"},
+	{"stripes2top",     "dirty metal block","metal2"},
+	{"rough",      "rough metal",      "rough"},
+	{"lighttop",      "metal block",      "metal"},
+	{"red",      "red lines",          "red"},
+	{"green",      "green lines",      "green"},
+	{"vent2",      "vent",              "vent"},
+	{"stripes",      "hazard stripes", "stripes"},
+	{"rust",      "rusty metal",       "rust"},
+	{"mesh",      "metal mesh",       "mesh"},
+	{"black",      "black wall",       "black"},
+	{"blackoct",      "black octagon",       "blackoct"},
+	{"blackpipe",      "black pipe",       "blackpipe"},
+	{"blacktile",      "black tile",       "blktl"},
+	{"blacktile2",      "black tile 2",       "blktl2"},
+	{"blackvent",      "black vent",       "blkvnt"},
+	{"bluebars",      "blue bars",       "bluebars"},
+	{"bluemetal",      "blue metal",       "blumtl"},
+	{"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"},
+	{"whitetile",      "white tile2",       "whttl"},
+	{"black_detail",      "black detail",       "blckdtl"},
+	{"green_square",      "green metal block",       "grnblck"},
+	{"red_square",      "red metal block",       "redblck"},
+	{"grey_square",      "grey metal block",       "greyblck"},
+	{"blue_square",      "blue metal block",       "blublck"},
+	{"black_mesh",      "black vent block",       "blckmsh"},
+	{"dent",      "dented metal block",       "dent"},
+	{"greenmetal",      "green metal wall",       "grnmetl"},
+	{"greenmetal2",      "green metal wall2",       "grnmetl2"},
+	{"greenlights",      "green wall lights",       "grnlt", 10},
+	{"greenlights2",      "green wall lights2",       "grnlt2", 10},
+	{"greenbar",      "green light bar",       "grnlghtbr", 10},
+	{"green2",      "green wall panel",       "grn2"},
+	{"greentubes",      "green pipes",       "grntubes"},
+	{"grey",      "grey wall",       "gry"},
+	{"greybolts",      "grey wall bolts",       "gryblts"},
+	{"greybars",      "grey bars",       "grybrs"},
+	{"greydots",      "grey wall dots",       "grydts"},
+	{"greygreenbar",      "gray power pipe",       "grygrnbr", 10},
+	{"octofloor",      "Doom floor",       "octofloor"},
+	{"octofloor2",      "Brown Doom floor",       "octofloor2"},
+	{"doomwall1",      "Doom wall 1",       "doomwall1"},
+	{"doomwall2",      "Doom wall 2",       "doomwall2"},
+	{"doomwall3",      "Doom wall 3",       "doomwall3"},
+	{"doomwall4",      "Doom wall 4",       "doomwall4"},
+	{"doomwall41",      "Doom wall 4.1",       "doomwall4.1"},
+	{"doomwall42",      "Doom wall 4.2",       "doomwall4.2"},
+	{"doomwall43",      "Doom wall 4.3",       "doomwall4.3"},
+	{"doomwall431",      "Doom wall 4.3.1",       "doomwall4.3.1"},
+	{"doomwall44",      "Doom wall 4.4",       "doomwall4.4"},
+	{"blackdmg",      "Damaged black wall",       "blckdmg"},
+	{"blackdmgstripe",      "Damaged black wall(stripes)",       "blckdmgstripe"},
+	{"doomengine",      "Doom engine wall",       "doomengine"},
+	{"monitorwall",      "Wall monitors",       "monitorwall"},
+	{"screen3",      "Wall monitor",       "screen3"},
+	{"doomlight",      "Doom light",       "doomlight", 12},
+	{"bluwllight",      "Blue wall light", "capsule3", default.LIGHT_MAX},
+	{"bluegrid",      "Blue Grid", "bluegrid", 5},
+	{"fan",      "Fan",       "fan"},
+	{"ppllght",      "Purple wall light", "", default.LIGHT_MAX},
+	{"pplwll",      "Purple wall", "", 0},
+	{"pplwll2",      "Purple wall2", "", 0},
+	{"pplwll3",      "Purple wall3", "", 0},
+	{"pplwll4",      "Purple wall4", "", 0},
+	{"pplblk",      "Purple tile", "", 0},
+	{"purple",      "Purple node", "", 0},
+	{"rock",      "Moonstone", "", 0},
+	{"rock2",      "Moonstone2", "", 0},
+	{"blackvnt",      "Black vent", "", 0},
+	{"blackplate",      "Black plate", "", 0},
+}

+for _, row in ipairs(nodetypes) do
+	local name = row[1]
+	local desc = row[2]
+	local light = row[4]
 	-- Node Definition
-	local node_def = {
-		description = def.description,
-		tiles = tiles,
-		groups = {cracky=1, dig_generic = 3},
+	minetest.register_node("scifi_nodes:"..name, {
+		description = desc,
+		tiles = {"scifi_nodes_"..name..".png"},
+		groups = {cracky=1},
 		paramtype = "light",
 		paramtype2 = "facedir",
-		light_source = def.light,
-		sounds = sounds,
-	}
-
-	if def.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)
-
-	-- unified dyes registration
-	if def.colorable and has_unifieddyes_mod then
-		minetest.register_node("scifi_nodes:"..name.."_colored", {
-			description = def.description,
-			tiles = tiles,
-			groups = {
-				cracky = 1,
-				ud_param2_colorable = 1,
-				not_in_creative_inventory = 1
-			},
-			palette = "unifieddyes_palette_extended.png",
-			paramtype = "light",
-			paramtype2 = "color",
-			light_source = def.light,
-			sounds = scifi_nodes.node_sound_glass_defaults(),
-			on_construct = unifieddyes.on_construct,
-			on_dig = unifieddyes.on_dig
-		})
-	end
-
-	-- moreblocks registration (default to register all except if "false" encountered)
-	if has_moreblocks_mod and def.moreblocks ~= false then
-		stairsplus:register_all("scifi_nodes", name, "scifi_nodes:"..name, {
-			description = def.description,
-			tiles = tiles,
-			use_texture_alpha = "clip",
-			groups = {cracky=1, dig_generic = 3},
-			paramtype = "light",
-			paramtype2 = "facedir",
-			light_source = def.light,
-			sounds = sounds,
-		})
-	end
-end
+		light_source = light,
+		sounds = default.node_sound_glass_defaults()
+	})
+end
--- a/octagon_panes.lua
+++ b/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")
--- a/palm_scanner.lua
+++ b/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_metal_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_metal_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_metal_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })

 minetest.register_craft({
--- a/panes.lua
+++ b/panes.lua
@ -10,7 +10,7 @@ xpanes.register_pane("doompane", {
 	diggable = false,
 	buildable_to = true,
 	air_equivalent = true,
-	textures = {"scifi_nodes_doompane.png","scifi_nodes_doompane.png","scifi_nodes_wood.png"},
+	textures = {"scifi_nodes_doompane.png","scifi_nodes_doompane.png","default_wood.png"},
 	inventory_image = "scifi_nodes_doompane.png",
 	wield_image = "scifi_nodes_doompane.png",
 	groups = {cracky=1, pane=1},
--- a/plants.lua
+++ b/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},
@ -33,6 +33,7 @@ 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 = {
@ -43,6 +44,5 @@ for _, row in ipairs(plants) do
 		},
 		is_ground_content = false,
 		light_source = light,
-		sounds = scifi_nodes.node_sound_plant_defaults(),
 	})
 end
--- a/protected_switch.lua
+++ b/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_metal_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_metal_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"}
-})
--- a/settingtypes.txt
+++ b/settingtypes.txt
@ -1,5 +1,2 @@
-# Doors can only be opened by mesecon signal
-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
+#    Doors can only be opened by mesecon signal
+scifi_nodes.doors_open_with_mesecon_only (disables right click on doors) bool true
--- a/sounds.lua
+++ b/sounds.lua
@ -1,57 +0,0 @@
-- sound definitions with fallback to empty sound-table
-
-function scifi_nodes.node_sound_defaults(param)
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_defaults(param)
-    end
-    return {}
-end
-
-function scifi_nodes.node_sound_wood_defaults(param)
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_wood_defaults(param)
-    end
-    return {}
-end
-
-function scifi_nodes.node_sound_glass_defaults(param)
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_glass_defaults(param)
-    end
-    return {}
-end
-
-function scifi_nodes.node_sound_metal_defaults(param)
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_metal_defaults(param)
-    end
-    return {}
-end
-
-function scifi_nodes.node_sound_stone_defaults(param)
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_stone_defaults(param)
-    end
-    return {}
-end
-
-function scifi_nodes.node_sound_dirt_defaults(param)
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_dirt_defaults(param)
-    end
-    return {}
-end
-
-function scifi_nodes.node_sound_plant_defaults(param)
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_leaves_defaults(param)
-    end
-    return {}
-end
--- a/stealthnodes.lua
+++ b/stealthnodes.lua
@ -1,3 +0,0 @@
-
-stealthnode.register_stealthnode("scifi_nodes", "forcefield")
-stealthnode.register_stealthnode("scifi_nodes", "wall")
--- a/switches.lua
+++ b/switches.lua
@ -33,18 +33,13 @@ minetest.register_node("scifi_nodes:switch_on", {
 	paramtype = "light",
 	paramtype2 = "wallmounted",
 	light_source = 5,
-	groups = {
-		cracky=1,
-		oddly_breakable_by_hand = 1,
-		not_in_creative_inventory = 1,
-		mesecon_needs_receiver = 1
-	},
+	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_metal_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 = {
-		cracky = 1,
-		oddly_breakable_by_hand = 1,
-		mesecon_needs_receiver = 1
-	},
+	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_metal_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	on_rightclick = (has_mesecons and toggle_switch)
 })

--- a/textures/scifi_nodes_alnslp.png
+++ b/textures/scifi_nodes_alnslp.png
--- a/textures/scifi_nodes_alnslp_top.png
+++ b/textures/scifi_nodes_alnslp_top.png
--- a/textures/scifi_nodes_alnslp_top2.png
+++ b/textures/scifi_nodes_alnslp_top2.png
--- a/textures/scifi_nodes_black.png
+++ b/textures/scifi_nodes_black.png
--- a/textures/scifi_nodes_black_detail.png
+++ b/textures/scifi_nodes_black_detail.png
--- a/textures/scifi_nodes_black_light.png
+++ b/textures/scifi_nodes_black_light.png
--- a/textures/scifi_nodes_black_light2.png
+++ b/textures/scifi_nodes_black_light2.png
--- a/textures/scifi_nodes_black_lights.png
+++ b/textures/scifi_nodes_black_lights.png
--- a/textures/scifi_nodes_black_mesh.png
+++ b/textures/scifi_nodes_black_mesh.png
--- a/textures/scifi_nodes_black_screen.png
+++ b/textures/scifi_nodes_black_screen.png
--- a/textures/scifi_nodes_blackdmg.png
+++ b/textures/scifi_nodes_blackdmg.png
--- a/textures/scifi_nodes_blackdmgstripe.png
+++ b/textures/scifi_nodes_blackdmgstripe.png
--- a/textures/scifi_nodes_blackoct.png
+++ b/textures/scifi_nodes_blackoct.png
--- a/textures/scifi_nodes_blackpipe.png
+++ b/textures/scifi_nodes_blackpipe.png
--- a/textures/scifi_nodes_blackplate.png
+++ b/textures/scifi_nodes_blackplate.png
--- a/textures/scifi_nodes_blacktile.png
+++ b/textures/scifi_nodes_blacktile.png
--- a/textures/scifi_nodes_blacktile2.png
+++ b/textures/scifi_nodes_blacktile2.png
--- a/textures/scifi_nodes_blackvent.png
+++ b/textures/scifi_nodes_blackvent.png
--- a/textures/scifi_nodes_blackvnt.png
+++ b/textures/scifi_nodes_blackvnt.png
--- a/textures/scifi_nodes_blue.png
+++ b/textures/scifi_nodes_blue.png
--- a/textures/scifi_nodes_blue_metal_light.png
+++ b/textures/scifi_nodes_blue_metal_light.png
--- a/textures/scifi_nodes_blue_metal_stripes.png
+++ b/textures/scifi_nodes_blue_metal_stripes.png
--- a/textures/scifi_nodes_blue_metal_stripes2.png
+++ b/textures/scifi_nodes_blue_metal_stripes2.png
--- a/textures/scifi_nodes_blue_square.png
+++ b/textures/scifi_nodes_blue_square.png
--- a/textures/scifi_nodes_bluebars.png
+++ b/textures/scifi_nodes_bluebars.png
--- a/textures/scifi_nodes_bluefloor.png
+++ b/textures/scifi_nodes_bluefloor.png
--- a/textures/scifi_nodes_bluegrid.png
+++ b/textures/scifi_nodes_bluegrid.png
--- a/textures/scifi_nodes_bluemetal.png
+++ b/textures/scifi_nodes_bluemetal.png
--- a/textures/scifi_nodes_bluetile.png
+++ b/textures/scifi_nodes_bluetile.png
--- a/textures/scifi_nodes_bluwllight.png
+++ b/textures/scifi_nodes_bluwllight.png
--- a/textures/scifi_nodes_box.png
+++ b/textures/scifi_nodes_box.png
--- a/textures/scifi_nodes_box_top.png
+++ b/textures/scifi_nodes_box_top.png
--- a/textures/scifi_nodes_builder.png
+++ b/textures/scifi_nodes_builder.png
--- a/textures/scifi_nodes_builder_front.png
+++ b/textures/scifi_nodes_builder_front.png
--- a/textures/scifi_nodes_builder_side.png
+++ b/textures/scifi_nodes_builder_side.png
--- a/textures/scifi_nodes_capsule.png
+++ b/textures/scifi_nodes_capsule.png
--- a/textures/scifi_nodes_capsule2.png
+++ b/textures/scifi_nodes_capsule2.png
--- a/textures/scifi_nodes_capsule3.png
+++ b/textures/scifi_nodes_capsule3.png
--- a/textures/scifi_nodes_crate.png
+++ b/textures/scifi_nodes_crate.png
--- a/textures/scifi_nodes_crateside.png
+++ b/textures/scifi_nodes_crateside.png
--- a/textures/scifi_nodes_dent.png
+++ b/textures/scifi_nodes_dent.png
--- a/textures/scifi_nodes_digicode_off.png
+++ b/textures/scifi_nodes_digicode_off.png
--- a/textures/scifi_nodes_digicode_on.png
+++ b/textures/scifi_nodes_digicode_on.png
--- a/textures/scifi_nodes_dirt.png
+++ b/textures/scifi_nodes_dirt.png
--- a/textures/scifi_nodes_disc.png
+++ b/textures/scifi_nodes_disc.png
--- a/textures/scifi_nodes_discs.png
+++ b/textures/scifi_nodes_discs.png
--- a/textures/scifi_nodes_doomengine.png
+++ b/textures/scifi_nodes_doomengine.png
--- a/textures/scifi_nodes_doomlight.png
+++ b/textures/scifi_nodes_doomlight.png
--- a/textures/scifi_nodes_doompane.png
+++ b/textures/scifi_nodes_doompane.png
--- a/textures/scifi_nodes_doomwall1.png
+++ b/textures/scifi_nodes_doomwall1.png
--- a/textures/scifi_nodes_doomwall2.png
+++ b/textures/scifi_nodes_doomwall2.png
--- a/textures/scifi_nodes_doomwall3.png
+++ b/textures/scifi_nodes_doomwall3.png
--- a/textures/scifi_nodes_doomwall4.png
+++ b/textures/scifi_nodes_doomwall4.png
--- a/textures/scifi_nodes_doomwall41.png
+++ b/textures/scifi_nodes_doomwall41.png
--- a/textures/scifi_nodes_doomwall42.png
+++ b/textures/scifi_nodes_doomwall42.png
--- a/textures/scifi_nodes_doomwall43.png
+++ b/textures/scifi_nodes_doomwall43.png
--- a/textures/scifi_nodes_doomwall431.png
+++ b/textures/scifi_nodes_doomwall431.png
--- a/textures/scifi_nodes_doomwall44.png
+++ b/textures/scifi_nodes_doomwall44.png
--- a/textures/scifi_nodes_door_Doom_bottom.png
+++ b/textures/scifi_nodes_door_Doom_bottom.png
--- a/textures/scifi_nodes_door_Doom_bottom0.png
+++ b/textures/scifi_nodes_door_Doom_bottom0.png
--- a/textures/scifi_nodes_door_Doom_edge.png
+++ b/textures/scifi_nodes_door_Doom_edge.png
--- a/textures/scifi_nodes_door_Doom_inv.png
+++ b/textures/scifi_nodes_door_Doom_inv.png
--- a/textures/scifi_nodes_door_Doom_rbottom.png
+++ b/textures/scifi_nodes_door_Doom_rbottom.png
--- a/textures/scifi_nodes_door_Doom_rbottom0.png
+++ b/textures/scifi_nodes_door_Doom_rbottom0.png
--- a/textures/scifi_nodes_door_Doom_rtop.png
+++ b/textures/scifi_nodes_door_Doom_rtop.png
--- a/textures/scifi_nodes_door_Doom_rtopo.png
+++ b/textures/scifi_nodes_door_Doom_rtopo.png
--- a/textures/scifi_nodes_door_Doom_top.png
+++ b/textures/scifi_nodes_door_Doom_top.png
--- a/textures/scifi_nodes_door_Doom_topo.png
+++ b/textures/scifi_nodes_door_Doom_topo.png
--- a/textures/scifi_nodes_door_black_bottom.png
+++ b/textures/scifi_nodes_door_black_bottom.png
--- a/textures/scifi_nodes_door_black_bottom0.png
+++ b/textures/scifi_nodes_door_black_bottom0.png
--- a/textures/scifi_nodes_door_black_edge.png
+++ b/textures/scifi_nodes_door_black_edge.png
--- a/textures/scifi_nodes_door_black_inv.png
+++ b/textures/scifi_nodes_door_black_inv.png
--- a/textures/scifi_nodes_door_black_rbottom.png
+++ b/textures/scifi_nodes_door_black_rbottom.png
--- a/textures/scifi_nodes_door_black_rbottom0.png
+++ b/textures/scifi_nodes_door_black_rbottom0.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
BuckarooBanzay	286e80edfd	fix name typo in github action	2020-05-11 10:41:23 +02:00
BuckarooBanzay	fcce42837f	add integration-test	2020-05-11 10:38:12 +02:00