From d53044aa104067a0affee5aff0e41205e9c29f28 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Thu, 1 Jun 2017 08:38:41 -0500
Subject: [PATCH] Fixes black carpet recipe and sprite

---
 code/game/objects/items/stacks/tiles/tile_types.dm.rej | 10 ++++++++++
 code/modules/crafting/recipes.dm.rej                   | 10 ++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 code/game/objects/items/stacks/tiles/tile_types.dm.rej
 create mode 100644 code/modules/crafting/recipes.dm.rej

diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm.rej b/code/game/objects/items/stacks/tiles/tile_types.dm.rej
new file mode 100644
index 0000000000..2f47c12b65
--- /dev/null
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm.rej
@@ -0,0 +1,10 @@
+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.rej b/code/modules/crafting/recipes.dm.rej
new file mode 100644
index 0000000000..39167bca83
--- /dev/null
+++ b/code/modules/crafting/recipes.dm.rej
@@ -0,0 +1,10 @@
+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