cleanup

2017-06-08 03:39:13 -05:00
parent 9b840ae323
commit 190b47983c
5 changed files with 4 additions and 21 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"
@@ -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"
@@ -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
@@ -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