diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua
index bd80eaab..60374dd3 100644
--- a/homedecor/crafts.lua
+++ b/homedecor/crafts.lua
@@ -2593,3 +2593,12 @@ minetest.register_craft({
 	},
 })
 
+minetest.register_craft({
+	output = "homedecor:coffee_maker",
+	recipe = {
+	    {"homedecor:plastic_sheeting", "bucket:bucket_water", "homedecor:plastic_sheeting"},
+	    {"homedecor:plastic_sheeting", "default:glass", "homedecor:plastic_sheeting"},
+	    {"homedecor:plastic_sheeting", "homedecor:heating_element", "homedecor:plastic_sheeting"}
+	},
+})
+
diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua
index 8ba8c093..5eb01f5c 100644
--- a/homedecor/misc-nodes.lua
+++ b/homedecor/misc-nodes.lua
@@ -1166,8 +1166,8 @@ minetest.register_node("homedecor:cutlery_set", {
 		type = "fixed",
 		fixed = {
 			{-0.125, -0.5, -0.4375, 0.125, -0.49, -0.1875}, -- NodeBox1
-                        {0.035, -0.5, -0.12, 0.042, -0.375, -0.036}, -- NodeBox2
-                        {-0.042, -0.5, -0.12, -0.035, -0.375, -0.036}, -- NodeBox3
+			{0.035, -0.5, -0.12, 0.042, -0.375, -0.036}, -- NodeBox2
+			{-0.042, -0.5, -0.12, -0.035, -0.375, -0.036}, -- NodeBox3
 			{-0.042, -0.5, -0.12, 0.042, -0.375, -0.112}, -- NodeBox4
 			{-0.042, -0.5, -0.044, 0.042, -0.375, -0.036}, -- NodeBox5
 			{-0.042, -0.40, -0.12, 0.042, -0.5, -0.036}, -- NodeBox6
@@ -1184,10 +1184,10 @@ minetest.register_node("homedecor:cutlery_set", {
 			{-0.1095, -0.5, -0.453, 0.1095, -0.48, -0.4375}, -- NodeBox17
 			{-0.14, -0.5, -0.422, -0.125, -0.48, -0.203}, -- NodeBox18
 			{0.125, -0.5, -0.422, 0.14, -0.48, -0.203}, -- NodeBox19
-                        {-0.125, -0.5, -0.203, -0.1095, -0.48, -0.1875}, -- NodeBox20
-                        {0.1095, -0.5, -0.203, 0.125, -0.48, -0.1875}, -- NodeBox21
-                        {-0.125, -0.5, -0.4375, -0.1095, -0.48, -0.422}, -- NodeBox22
-                        {0.1095, -0.5, -0.4375, 0.125, -0.48, -0.422}, -- NodeBox23
+			{-0.125, -0.5, -0.203, -0.1095, -0.48, -0.1875}, -- NodeBox20
+			{0.1095, -0.5, -0.203, 0.125, -0.48, -0.1875}, -- NodeBox21
+			{-0.125, -0.5, -0.4375, -0.1095, -0.48, -0.422}, -- NodeBox22
+			{0.1095, -0.5, -0.4375, 0.125, -0.48, -0.422}, -- NodeBox23
 		}
 	},
 	selection_box = {
@@ -1211,10 +1211,10 @@ minetest.register_node("homedecor:bottle_brown", {
 	node_box = {
 		type = "fixed",
 		fixed = {
-                         {-0.032, -0.50, -0.11, 0.032, -0.3, -0.046}, -- NodeBox1
-                         {-0.016, -0.30, -0.094, 0.016, -0.2, -0.062}, -- NodeBox2
+			{-0.032, -0.50, -0.11, 0.032, -0.3, -0.046}, -- NodeBox1
+			{-0.016, -0.30, -0.094, 0.016, -0.2, -0.062}, -- NodeBox2
 		}
-}
+	}
 })
 
 minetest.register_node("homedecor:bottle_green", {
@@ -1232,8 +1232,46 @@ minetest.register_node("homedecor:bottle_green", {
 	node_box = {
 		type = "fixed",
 		fixed = {
-                         {-0.032, -0.50, -0.11, 0.032, -0.3, -0.046}, -- NodeBox1
-                         {-0.016, -0.30, -0.094, 0.016, -0.2, -0.062}, -- NodeBox2
+			{-0.032, -0.50, -0.11, 0.032, -0.3, -0.046}, -- NodeBox1
+			{-0.016, -0.30, -0.094, 0.016, -0.2, -0.062}, -- NodeBox2
 		}
-}
+	}
 })
+
+minetest.register_node("homedecor:coffee_maker", {
+	tiles = {
+		"homedecor_coffeemaker_top.png",
+		"homedecor_coffeemaker_bottom.png",
+		"homedecor_coffeemaker_right.png",
+		"homedecor_coffeemaker_left.png",
+		"homedecor_coffeemaker_back.png",
+		"homedecor_coffeemaker_front.png"
+	},
+	description = "Coffee Maker",
+	inventory_image = "homedecor_coffeemaker_inv.png",
+	drawtype = "nodebox",
+	paramtype = "light",
+	paramtype2 = "facedir",
+	groups = {snappy=3},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{0.0625, -0.5, -0.025, 0.375, -0.375, 0.5}, -- NodeBox1
+			{0.0625, -0.375, 0.3125, 0.375, 0, 0.5}, -- NodeBox2
+			{0.0625, -0.052, 0.02, 0.375, 0.19, 0.5}, -- NodeBox3
+			{0.078, -0.375, 0, 0.36, -0.0625, 0.3125}, -- NodeBox4
+			{0.1875, -0.098, -0.0525, 0.25, -0.078, 0}, -- NodeBox5
+			{0.1875, -0.36, -0.090, 0.25, -0.078, -0.0525}, -- NodeBox6
+			{0.1875, -0.36, -0.0525, 0.25, -0.34, 0}, -- NodeBox7
+			{-0.1875, -0.5, -0.3125, -0.1, -0.4, -0.225}, -- NodeBox8
+			{-0.1975, -0.5, -0.3225, -0.1, -0.375, -0.3125}, -- NodeBox9
+			{-0.1975, -0.5, -0.235, -0.1, -0.375, -0.225}, -- NodeBox10
+			{-0.1975, -0.5, -0.3225, -0.1875, -0.375, -0.225}, -- NodeBox11
+			{-0.11, -0.5, -0.3225, -0.1, -0.375, -0.225}, -- NodeBox12
+			{-0.1, -0.485, -0.2838, -0.06, -0.475, -0.2638}, -- NodeBox13
+			{-0.1, -0.4, -0.2838, -0.06, -0.39, -0.2638}, -- NodeBox14
+			{-0.075, -0.485, -0.2838, -0.06, -0.39, -0.2638}, -- NodeBox15
+		}
+	}
+})
+
diff --git a/homedecor/textures/homedecor_coffeemaker_back.png b/homedecor/textures/homedecor_coffeemaker_back.png
new file mode 100644
index 00000000..f5c241cc
Binary files /dev/null and b/homedecor/textures/homedecor_coffeemaker_back.png differ
diff --git a/homedecor/textures/homedecor_coffeemaker_bottom.png b/homedecor/textures/homedecor_coffeemaker_bottom.png
new file mode 100644
index 00000000..c41ea55c
Binary files /dev/null and b/homedecor/textures/homedecor_coffeemaker_bottom.png differ
diff --git a/homedecor/textures/homedecor_coffeemaker_front.png b/homedecor/textures/homedecor_coffeemaker_front.png
new file mode 100644
index 00000000..bcd68580
Binary files /dev/null and b/homedecor/textures/homedecor_coffeemaker_front.png differ
diff --git a/homedecor/textures/homedecor_coffeemaker_inv.png b/homedecor/textures/homedecor_coffeemaker_inv.png
new file mode 100644
index 00000000..7db60435
Binary files /dev/null and b/homedecor/textures/homedecor_coffeemaker_inv.png differ
diff --git a/homedecor/textures/homedecor_coffeemaker_left.png b/homedecor/textures/homedecor_coffeemaker_left.png
new file mode 100644
index 00000000..225f0d78
Binary files /dev/null and b/homedecor/textures/homedecor_coffeemaker_left.png differ
diff --git a/homedecor/textures/homedecor_coffeemaker_right.png b/homedecor/textures/homedecor_coffeemaker_right.png
new file mode 100644
index 00000000..3a7532af
Binary files /dev/null and b/homedecor/textures/homedecor_coffeemaker_right.png differ
diff --git a/homedecor/textures/homedecor_coffeemaker_top.png b/homedecor/textures/homedecor_coffeemaker_top.png
new file mode 100644
index 00000000..ee0aa3b8
Binary files /dev/null and b/homedecor/textures/homedecor_coffeemaker_top.png differ