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

[MIRROR] Fixes black carpet recipe and sprite
This commit is contained in:
LetterJay
2017-06-09 09:10:08 -05:00
committed by GitHub
3 changed files with 4 additions and 1 deletions

View File

@@ -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