Fixes black carpet recipe and sprite

2017-06-01 08:38:41 -05:00
parent ffd2d6fd0a
commit d53044aa10
2 changed files with 20 additions and 0 deletions
@@ -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"
@@ -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