diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm
index 0d58e8bd9c..7ad07de1ac 100644
--- a/code/modules/tables/tables.dm
+++ b/code/modules/tables/tables.dm
@@ -91,7 +91,26 @@
 			update_material()
 		return 1
 
-	if(!reinforced && material && istype(W, /obj/item/weapon/wrench))
+	if(carpeted && istype(W, /obj/item/weapon/crowbar))
+		user.visible_message("<span class='notice'>\The [user] removes the carpet from \the [src].</span>",
+		                              "<span class='notice'>You remove the carpet from \the [src].</span>")
+		new /obj/item/stack/tile/carpet(loc)
+		carpeted = 0
+		update_icon()
+		return 1
+
+	if(!carpeted && material && istype(W, /obj/item/stack/tile/carpet))
+		var/obj/item/stack/tile/carpet/C = W
+		if(C.use(1))
+			user.visible_message("<span class='notice'>\The [user] adds \the [C] to \the [src].</span>",
+			                              "<span class='notice'>You add \the [C] to \the [src].</span>")
+			carpeted = 1
+			update_icon()
+			return 1
+		else
+			user << "<span class='warning'>You don't have enough carpet!</span>"
+
+	if(!reinforced && !carpeted && material && istype(W, /obj/item/weapon/wrench))
 		remove_material(W, user)
 		if(!material)
 			update_connections(1)
@@ -102,7 +121,7 @@
 			update_material()
 		return 1
 
-	if(!reinforced && !material && istype(W, /obj/item/weapon/wrench))
+	if(!carpeted && !reinforced && !material && istype(W, /obj/item/weapon/wrench))
 		dismantle(W, user)
 		return 1
 
@@ -212,6 +231,8 @@
 		new reinforced.stack_type(src.loc)
 	if(material && material.stack_type && (full_return || prob(50)))
 		new material.stack_type(src.loc)
+	if(carpeted && (full_return || prob(50)))
+		new /obj/item/stack/tile/carpet(src.loc)
 	if(full_return || prob(50))
 		new /obj/item/stack/sheet/metal(src.loc)
 	qdel(src)
diff --git a/html/changelogs/GinjaNinja32_new_tables.yml b/html/changelogs/GinjaNinja32_new_tables.yml
index 31126155b1..5668126e2e 100644
--- a/html/changelogs/GinjaNinja32_new_tables.yml
+++ b/html/changelogs/GinjaNinja32_new_tables.yml
@@ -2,4 +2,4 @@ author: GinjaNinja32
 delete-after: True
 
 changes:
-  - rscadd: "Rewrote tables. To construct a table, use steel to make a table frame, then plate the frame with a material such as steel, gold, wood, etc. Hold a stack in your hand and drag it to the table to reinforce it. To deconstruct a table, use a screwdriver to remove the reinforcements (if present), then a wrench to remove the plating, and a wrench again to dismantle the frame. Use a welder to repair any damage."
+  - rscadd: "Rewrote tables. To construct a table, use steel to make a table frame, then plate the frame with a material such as steel, gold, wood, etc. Hold a stack in your hand and drag it to the table to reinforce it. To deconstruct a table, use a screwdriver to remove the reinforcements (if present), then a wrench to remove the plating, and a wrench again to dismantle the frame. Use a welder to repair any damage. Use a carpet tile on a table to add felt, and a crowbar to remove it."