diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index de0cdaf494..01a0940e53 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -112,6 +112,9 @@
 	icon_state = "tile-carpet-black"
 	turf_type = /turf/open/floor/carpet/black
 
+/obj/item/stack/tile/carpet/black/fifty
+	amount = 50
+
 
 /obj/item/stack/tile/fakespace
 	name = "astral carpet"
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm.rej b/code/game/objects/items/stacks/tiles/tile_types.dm.rej
deleted file mode 100644
index 2f47c12b65..0000000000
--- a/code/game/objects/items/stacks/tiles/tile_types.dm.rej
+++ /dev/null
@@ -1,10 +0,0 @@
-diff a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm	(rejected hunks)
-@@ -111,6 +111,8 @@
- 	icon_state = "tile-carpet-black"
- 	turf_type = /turf/open/floor/carpet/black
- 
-+/obj/item/stack/tile/carpet/black/fifty
-+	amount = 50
- 
- /obj/item/stack/tile/fakespace
- 	name = "astral carpet"
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index 67464adc12..d84d806a00 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -382,7 +382,7 @@
 /datum/crafting_recipe/blackcarpet
 	name = "Black Carpet"
 	reqs = list(/obj/item/stack/tile/carpet = 50, /obj/item/toy/crayon/black = 1)
-	result = /obj/item/stack/tile/carpet/black
+	result = /obj/item/stack/tile/carpet/black/fifty
 	category = CAT_MISC
 
 /datum/crafting_recipe/showercurtain
diff --git a/code/modules/crafting/recipes.dm.rej b/code/modules/crafting/recipes.dm.rej
deleted file mode 100644
index 39167bca83..0000000000
--- a/code/modules/crafting/recipes.dm.rej
+++ /dev/null
@@ -1,10 +0,0 @@
-diff a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm	(rejected hunks)
-@@ -347,7 +347,7 @@
- /datum/crafting_recipe/blackcarpet
- 	name = "Black Carpet"
- 	reqs = list(/obj/item/stack/tile/carpet = 50, /obj/item/toy/crayon/black = 1)
--	result = /obj/item/stack/tile/carpet/black
-+	result = /obj/item/stack/tile/carpet/black/fifty
- 	category = CAT_MISC
- 
- /datum/crafting_recipe/showercurtain
diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi
index 5372e24c05..1c0ac03abe 100644
Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ