Merge pull request #1327 from Citadel-Station-13/upstream-merge-27891

[MIRROR] Fixes black carpet recipe and sprite
2017-06-09 09:10:08 -05:00
parent 9babd38dc5 190b47983c
commit c3ebcf9d69
3 changed files with 4 additions and 1 deletions
@@ -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"
@@ -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