diff --git a/mods/ITEMS/REDSTONE/mesecons_delayer/init.lua b/mods/ITEMS/REDSTONE/mesecons_delayer/init.lua
index bf08849a3..ee72b7d08 100644
--- a/mods/ITEMS/REDSTONE/mesecons_delayer/init.lua
+++ b/mods/ITEMS/REDSTONE/mesecons_delayer/init.lua
@@ -215,8 +215,116 @@ minetest.register_node("mesecons_delayer:delayer_on_"..tostring(i), {
 	},
 	on_rotate = on_rotate,
 })
+
 end
 
+minetest.register_node("mesecons_delayer:delayer_off_locked", {
+	description = "Redstone Repeater (Locked)",
+	inventory_image = icon,
+	wield_image = icon,
+	_doc_items_create_entry = false,
+	drawtype = "nodebox",
+	-- FIXME: Textures of torch and the lock bar overlap. Nodeboxes are (sadly) not suitable for this.
+	-- So this needs to be turned into a mesh.
+	tiles = {
+		"mesecons_delayer_locked_off.png",
+		"mcl_stairs_stone_slab_top.png",
+		"mesecons_delayer_sides_locked_off.png",
+		"mesecons_delayer_sides_locked_off.png^[transformFX",
+		"mesecons_delayer_front_locked_off.png",
+		"mesecons_delayer_end_locked_off.png",
+		},
+	wield_image = "mesecons_delayer_locked_off.png",
+	walkable = true,
+	selection_box = {
+		type = "fixed",
+		fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 },
+	},
+	collision_box = {
+		type = "fixed",
+		fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 },
+	},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{ -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 }, -- the main slab
+			{ -1/16, -6/16, 6/16, 1/16, -1/16, 4/16}, -- still torch
+			{ -6/16, -6/16, 0/16, 6/16, -4/16, 2/16}, -- lock
+		}
+	},
+	groups = {dig_immediate = 3, dig_by_water=1,destroy_by_lava_flow=1, dig_by_piston=1, attached_node=1, not_in_creative_inventory = 1},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	sunlight_propagates = false,
+	is_ground_content = false,
+	drop = 'mesecons_delayer:delayer_off_1',
+	delayer_time = delaytime,
+	delayer_onstate = "mesecons_delayer:delayer_on_"..tostring(i),
+	sounds = mcl_sounds.node_sound_stone_defaults(),
+	mesecons = {
+		receptor =
+		{
+			state = mesecon.state.off,
+			rules = delayer_get_output_rules
+		},
+		effector =
+		{
+			rules = delayer_get_input_rules,
+		}
+	},
+	on_rotate = on_rotate,
+})
+
+minetest.register_node("mesecons_delayer:delayer_on_locked", {
+	description = "Redstone Repeater (Locked, Powered)",
+	_doc_items_create_entry = false,
+	drawtype = "nodebox",
+	tiles = {
+		"mesecons_delayer_locked_on.png",
+		"mcl_stairs_stone_slab_top.png",
+		"mesecons_delayer_sides_locked_on.png",
+		"mesecons_delayer_sides_locked_on.png^[transformFX",
+		"mesecons_delayer_front_locked_on.png",
+		"mesecons_delayer_end_locked_on.png",
+		},
+	walkable = true,
+	selection_box = {
+		type = "fixed",
+		fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 },
+	},
+	collision_box = {
+		type = "fixed",
+		fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 },
+	},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{ -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 }, -- the main slab
+			{ -1/16, -6/16, 6/16, 1/16, -1/16, 4/16}, -- still torch
+			{ -6/16, -6/16, 0/16, 6/16, -4/16, 2/16}, -- lock
+		}
+	},
+	groups = {dig_immediate = 3, dig_by_water=1,destroy_by_lava_flow=1, dig_by_piston=1, attached_node=1, not_in_creative_inventory = 1},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	sunlight_propagates = false,
+	is_ground_content = false,
+	drop = 'mesecons_delayer:delayer_off_1',
+	sounds = mcl_sounds.node_sound_stone_defaults(),
+	mesecons = {
+		receptor =
+		{
+			state = mesecon.state.on,
+			rules = delayer_get_output_rules
+		},
+		effector =
+		{
+			rules = delayer_get_input_rules,
+		}
+	},
+	on_rotate = on_rotate,
+})
+
 minetest.register_craft({
 	output = "mesecons_delayer:delayer_off_1",
 	recipe = {
@@ -230,8 +338,10 @@ if minetest.get_modpath("doc") then
 	doc.add_entry_alias("nodes", "mesecons_delayer:delayer_off_1", "nodes", "mesecons_delayer:delayer_off_2")
 	doc.add_entry_alias("nodes", "mesecons_delayer:delayer_off_1", "nodes", "mesecons_delayer:delayer_off_3")
 	doc.add_entry_alias("nodes", "mesecons_delayer:delayer_off_1", "nodes", "mesecons_delayer:delayer_off_4")
+	doc.add_entry_alias("nodes", "mesecons_delayer:delayer_off_1", "nodes", "mesecons_delayer:delayer_off_locked")
 	doc.add_entry_alias("nodes", "mesecons_delayer:delayer_off_1", "nodes", "mesecons_delayer:delayer_on_1")
 	doc.add_entry_alias("nodes", "mesecons_delayer:delayer_off_1", "nodes", "mesecons_delayer:delayer_on_2")
 	doc.add_entry_alias("nodes", "mesecons_delayer:delayer_off_1", "nodes", "mesecons_delayer:delayer_on_3")
 	doc.add_entry_alias("nodes", "mesecons_delayer:delayer_off_1", "nodes", "mesecons_delayer:delayer_on_4")
+	doc.add_entry_alias("nodes", "mesecons_delayer:delayer_off_1", "nodes", "mesecons_delayer:delayer_on_locked")
 end
diff --git a/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_end_locked_off.png b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_end_locked_off.png
new file mode 100644
index 000000000..bee3eeb07
Binary files /dev/null and b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_end_locked_off.png differ
diff --git a/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_end_locked_on.png b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_end_locked_on.png
new file mode 100644
index 000000000..3347f1b62
Binary files /dev/null and b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_end_locked_on.png differ
diff --git a/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_ends_off.png b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_ends_off.png
index 1b71813a9..ed6f4a030 100644
Binary files a/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_ends_off.png and b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_ends_off.png differ
diff --git a/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_ends_on.png b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_ends_on.png
index a5613764c..8569fcd2f 100644
Binary files a/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_ends_on.png and b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_ends_on.png differ
diff --git a/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_front_locked_off.png b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_front_locked_off.png
new file mode 100644
index 000000000..e8cff329a
Binary files /dev/null and b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_front_locked_off.png differ
diff --git a/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_front_locked_on.png b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_front_locked_on.png
new file mode 100644
index 000000000..59ca93822
Binary files /dev/null and b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_front_locked_on.png differ
diff --git a/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_locked_off.png b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_locked_off.png
new file mode 100644
index 000000000..909efc1a6
Binary files /dev/null and b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_locked_off.png differ
diff --git a/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_locked_on.png b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_locked_on.png
new file mode 100644
index 000000000..0bcb3ae5a
Binary files /dev/null and b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_locked_on.png differ
diff --git a/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_off.png b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_off.png
index 2bb7a170e..ed33c4224 100644
Binary files a/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_off.png and b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_off.png differ
diff --git a/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_on.png b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_on.png
index 3fd2c4e5c..2456cf022 100644
Binary files a/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_on.png and b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_on.png differ
diff --git a/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_sides_locked_off.png b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_sides_locked_off.png
new file mode 100644
index 000000000..6a01a2a27
Binary files /dev/null and b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_sides_locked_off.png differ
diff --git a/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_sides_locked_on.png b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_sides_locked_on.png
new file mode 100644
index 000000000..e2102f205
Binary files /dev/null and b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_sides_locked_on.png differ
diff --git a/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_sides_off.png b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_sides_off.png
index bb67ae692..326dbe63e 100644
Binary files a/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_sides_off.png and b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_sides_off.png differ
diff --git a/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_sides_on.png b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_sides_on.png
index 80dca4d77..bab909eb3 100644
Binary files a/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_sides_on.png and b/mods/ITEMS/REDSTONE/mesecons_delayer/textures/mesecons_delayer_sides_on.png differ