diff --git a/mods/minetest-3d_armor/3d_armor_stand/LICENSE.txt b/mods/minetest-3d_armor/3d_armor_stand/LICENSE.txt
new file mode 100644
index 00000000..e3cb55d6
--- /dev/null
+++ b/mods/minetest-3d_armor/3d_armor_stand/LICENSE.txt
@@ -0,0 +1,43 @@
+[mod] 3d Armor Stand [3d_armor_stand]
+=====================================
+
+License Source Code
+-------------------
+
+Copyright (C) 2012-2019 stujones11, Stuart Jones <stujones111@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Lecense Models
+--------------
+
+Copyright (C) 2016-2019 Stuart Jones - CC BY-SA 3.0
+
+UV model mapping by tobyplowy(aka toby109tt)
+
+License Textures
+----------------
+
+3d_armor_stand.png
+3d_armor_stand_locked.png
+
+Copyright (C) 2017-2019 tobyplowy - CC BY-SA 3.0
+
+3d_armor_stand_feet.png
+3d_armor_stand_head.png
+3d_armor_stand_legs.png
+3d_armor_stand_torso.png
+
+Copyright (C) 2016-2019 Stuart Jones - CC BY-SA 3.0
diff --git a/mods/minetest-3d_armor/3d_armor_stand/README.txt b/mods/minetest-3d_armor/3d_armor_stand/README.txt
new file mode 100644
index 00000000..6a98ab99
--- /dev/null
+++ b/mods/minetest-3d_armor/3d_armor_stand/README.txt
@@ -0,0 +1,21 @@
+[mod] 3d Armor Stand [3d_armor_stand]
+=====================================
+
+Depends: 3d_armor
+
+Adds a chest-like armor stand for armor storage and display.
+
+Crafting
+--------
+
+F = Wooden Fence [default:fence_wood]
+S = Steel Ingot [default:steel_ingot]
+
++---+---+---+
+|   | F |   |
++---+---+---+
+|   | F |   |
++---+---+---+
+| S | S | S |
++---+---+---+
+
diff --git a/mods/minetest-3d_armor/3d_armor_stand/init.lua b/mods/minetest-3d_armor/3d_armor_stand/init.lua
new file mode 100644
index 00000000..1dd3ef6c
--- /dev/null
+++ b/mods/minetest-3d_armor/3d_armor_stand/init.lua
@@ -0,0 +1,353 @@
+-- support for i18n
+local S = armor_i18n.gettext
+
+local armor_stand_formspec = "size[8,7]" ..
+	default.gui_bg ..
+	default.gui_bg_img ..
+	default.gui_slots ..
+	default.get_hotbar_bg(0,3) ..
+	"list[current_name;armor_head;3,0.5;1,1;]" ..
+	"list[current_name;armor_torso;4,0.5;1,1;]" ..
+	"list[current_name;armor_legs;3,1.5;1,1;]" ..
+	"list[current_name;armor_feet;4,1.5;1,1;]" ..
+	"image[3,0.5;1,1;3d_armor_stand_head.png]" ..
+	"image[4,0.5;1,1;3d_armor_stand_torso.png]" ..
+	"image[3,1.5;1,1;3d_armor_stand_legs.png]" ..
+	"image[4,1.5;1,1;3d_armor_stand_feet.png]" ..
+	"list[current_player;main;0,3;8,1;]" ..
+	"list[current_player;main;0,4.25;8,3;8]"
+
+local elements = {"head", "torso", "legs", "feet"}
+
+local function drop_armor(pos)
+	local meta = minetest.get_meta(pos)
+	local inv = meta:get_inventory()
+	for _, element in pairs(elements) do
+		local stack = inv:get_stack("armor_"..element, 1)
+		if stack and stack:get_count() > 0 then
+			armor.drop_armor(pos, stack)
+			inv:set_stack("armor_"..element, 1, nil)
+		end
+	end
+end
+
+local function get_stand_object(pos)
+	local object = nil
+	local objects = minetest.get_objects_inside_radius(pos, 0.5) or {}
+	for _, obj in pairs(objects) do
+		local ent = obj:get_luaentity()
+		if ent then
+			if ent.name == "3d_armor_stand:armor_entity" then
+				-- Remove duplicates
+				if object then
+					obj:remove()
+				else
+					object = obj
+				end
+			end
+		end
+	end
+	return object
+end
+
+local function update_entity(pos)
+	local node = minetest.get_node(pos)
+	local object = get_stand_object(pos)
+	if object then
+		if not string.find(node.name, "3d_armor_stand:") then
+			object:remove()
+			return
+		end
+	else
+		object = minetest.add_entity(pos, "3d_armor_stand:armor_entity")
+	end
+	if object then
+		local texture = "3d_armor_trans.png"
+		local textures = {}
+		local meta = minetest.get_meta(pos)
+		local inv = meta:get_inventory()
+		local yaw = 0
+		if inv then
+			for _, element in pairs(elements) do
+				local stack = inv:get_stack("armor_"..element, 1)
+				if stack:get_count() == 1 then
+					local item = stack:get_name() or ""
+					local def = stack:get_definition() or {}
+					local groups = def.groups or {}
+					if groups["armor_"..element] then
+						if def.texture then
+							table.insert(textures, def.texture)
+						else
+							table.insert(textures, item:gsub("%:", "_")..".png")
+						end
+					end
+				end
+			end
+		end
+		if #textures > 0 then
+			texture = table.concat(textures, "^")
+		end
+		if node.param2 then
+			local rot = node.param2 % 4
+			if rot == 1 then
+				yaw = 3 * math.pi / 2
+			elseif rot == 2 then
+				yaw = math.pi
+			elseif rot == 3 then
+				yaw = math.pi / 2
+			end
+		end
+		object:setyaw(yaw)
+		object:set_properties({textures={texture}})
+	end
+end
+
+local function has_locked_armor_stand_privilege(meta, player)
+	local name = ""
+	if player then
+		if minetest.check_player_privs(player, "protection_bypass") then
+			return true
+		end
+		name = player:get_player_name()
+	end
+	if name ~= meta:get_string("owner") then
+		return false
+	end
+	return true
+end
+
+local function add_hidden_node(pos, player)
+	local p = {x=pos.x, y=pos.y + 1, z=pos.z}
+	local name = player:get_player_name()
+	local node = minetest.get_node(p)
+	if node.name == "air" and not minetest.is_protected(pos, name) then
+		minetest.set_node(p, {name="3d_armor_stand:top"})
+	end
+end
+
+local function remove_hidden_node(pos)
+	local p = {x=pos.x, y=pos.y + 1, z=pos.z}
+	local node = minetest.get_node(p)
+	if node.name == "3d_armor_stand:top" then
+		minetest.remove_node(p)
+	end
+end
+
+minetest.register_node("3d_armor_stand:top", {
+	description = S("Armor stand top"),
+	paramtype = "light",
+	drawtype = "plantlike",
+	sunlight_propagates = true,
+	walkable = true,
+	pointable = false,
+	diggable = false,
+	buildable_to = false,
+	drop = "",
+	groups = {not_in_creative_inventory = 1},
+	on_blast = function() end,
+	tiles = {"3d_armor_trans.png"},
+})
+
+minetest.register_node("3d_armor_stand:armor_stand", {
+	description = S("Armor stand"),
+	drawtype = "mesh",
+	mesh = "3d_armor_stand.obj",
+	tiles = {"3d_armor_stand.png"},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {
+			{-0.25, -0.4375, -0.25, 0.25, 1.4, 0.25},
+			{-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5},
+		},
+	},
+	groups = {choppy=2, oddly_breakable_by_hand=2},
+	sounds = default.node_sound_wood_defaults(),
+	on_construct = function(pos)
+		local meta = minetest.get_meta(pos)
+		meta:set_string("formspec", armor_stand_formspec)
+		meta:set_string("infotext", S("Armor Stand"))
+		local inv = meta:get_inventory()
+		for _, element in pairs(elements) do
+			inv:set_size("armor_"..element, 1)
+		end
+	end,
+	can_dig = function(pos, player)
+		local meta = minetest.get_meta(pos)
+		local inv = meta:get_inventory()
+		for _, element in pairs(elements) do
+			if not inv:is_empty("armor_"..element) then
+				return false
+			end
+		end
+		return true
+	end,
+	after_place_node = function(pos, placer)
+		minetest.add_entity(pos, "3d_armor_stand:armor_entity")
+		add_hidden_node(pos, placer)
+	end,
+	allow_metadata_inventory_put = function(pos, listname, index, stack)
+		local def = stack:get_definition() or {}
+		local groups = def.groups or {}
+		if groups[listname] then
+			return 1
+		end
+		return 0
+	end,
+	allow_metadata_inventory_move = function(pos)
+		return 0
+	end,
+	on_metadata_inventory_put = function(pos)
+		update_entity(pos)
+	end,
+	on_metadata_inventory_take = function(pos)
+		update_entity(pos)
+	end,
+	after_destruct = function(pos)
+		update_entity(pos)
+		remove_hidden_node(pos)
+	end,
+	on_blast = function(pos)
+		drop_armor(pos)
+		armor.drop_armor(pos, "3d_armor_stand:armor_stand")
+		minetest.remove_node(pos)
+	end,
+})
+
+minetest.register_node("3d_armor_stand:locked_armor_stand", {
+	description = S("Locked Armor stand"),
+	drawtype = "mesh",
+	mesh = "3d_armor_stand.obj",
+	tiles = {"3d_armor_stand_locked.png"},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {
+			{-0.25, -0.4375, -0.25, 0.25, 1.4, 0.25},
+			{-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5},
+		},
+	},
+	groups = {choppy=2, oddly_breakable_by_hand=2},
+	sounds = default.node_sound_wood_defaults(),
+	on_construct = function(pos)
+		local meta = minetest.get_meta(pos)
+		meta:set_string("formspec", armor_stand_formspec)
+		meta:set_string("infotext", S("Armor Stand"))
+		meta:set_string("owner", "")
+		local inv = meta:get_inventory()
+		for _, element in pairs(elements) do
+			inv:set_size("armor_"..element, 1)
+		end
+	end,
+	can_dig = function(pos, player)
+		local meta = minetest.get_meta(pos)
+		local inv = meta:get_inventory()
+		for _, element in pairs(elements) do
+			if not inv:is_empty("armor_"..element) then
+				return false
+			end
+		end
+		return true
+	end,
+	after_place_node = function(pos, placer)
+		minetest.add_entity(pos, "3d_armor_stand:armor_entity")
+		local meta = minetest.get_meta(pos)
+		meta:set_string("owner", placer:get_player_name() or "")
+		meta:set_string("infotext", S("Armor Stand (owned by @1)", meta:get_string("owner")))
+		add_hidden_node(pos, placer)
+	end,
+	allow_metadata_inventory_put = function(pos, listname, index, stack, player)
+		local meta = minetest.get_meta(pos)
+		if not has_locked_armor_stand_privilege(meta, player) then
+			return 0
+		end
+		local def = stack:get_definition() or {}
+		local groups = def.groups or {}
+		if groups[listname] then
+			return 1
+		end
+		return 0
+	end,
+	allow_metadata_inventory_take = function(pos, listname, index, stack, player)
+		local meta = minetest.get_meta(pos)
+		if not has_locked_armor_stand_privilege(meta, player) then
+			return 0
+		end
+		return stack:get_count()
+	end,
+	allow_metadata_inventory_move = function(pos)
+		return 0
+	end,
+	on_metadata_inventory_put = function(pos)
+		update_entity(pos)
+	end,
+	on_metadata_inventory_take = function(pos)
+		update_entity(pos)
+	end,
+	after_destruct = function(pos)
+		update_entity(pos)
+		remove_hidden_node(pos)
+	end,
+	on_blast = function(pos)
+		-- Not affected by TNT
+	end,
+})
+
+minetest.register_entity("3d_armor_stand:armor_entity", {
+	physical = true,
+	visual = "mesh",
+	mesh = "3d_armor_entity.obj",
+	visual_size = {x=1, y=1},
+	collisionbox = {0,0,0,0,0,0},
+	textures = {"3d_armor_trans.png"},
+	pos = nil,
+	timer = 0,
+	on_activate = function(self)
+		local pos = self.object:get_pos()
+		if pos then
+			self.pos = vector.round(pos)
+			update_entity(pos)
+		end
+	end,
+	on_blast = function(self, damage)
+		local drops = {}
+		local node = minetest.get_node(self.pos)
+		if node.name == "3d_armor_stand:armor_stand" then
+			drop_armor(self.pos)
+			self.object:remove()
+		end
+		return false, false, drops
+	end,
+})
+
+minetest.register_abm({
+	nodenames = {"3d_armor_stand:locked_armor_stand", "3d_armor_stand:armor_stand"},
+	interval = 15,
+	chance = 1,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		local num
+		num = #minetest.get_objects_inside_radius(pos, 0.5)
+		if num > 0 then return end
+		update_entity(pos)
+	end
+})
+
+minetest.register_craft({
+	output = "3d_armor_stand:armor_stand",
+	recipe = {
+		{"", "group:fence", ""},
+		{"", "group:fence", ""},
+		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
+	}
+})
+
+minetest.register_craft({
+	output = "3d_armor_stand:locked_armor_stand",
+	recipe = {
+		{"3d_armor_stand:armor_stand", "default:steel_ingot"},
+	}
+})