From d53044aa104067a0affee5aff0e41205e9c29f28 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 1 Jun 2017 08:38:41 -0500 Subject: [PATCH 1/2] 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 From 190b47983c0d7f54c3b7b5317e6f2335cc5b6304 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Thu, 8 Jun 2017 03:39:13 -0500 Subject: [PATCH 2/2] cleanup --- .../objects/items/stacks/tiles/tile_types.dm | 3 +++ .../items/stacks/tiles/tile_types.dm.rej | 10 ---------- code/modules/crafting/recipes.dm | 2 +- code/modules/crafting/recipes.dm.rej | 10 ---------- icons/obj/tiles.dmi | Bin 11987 -> 11985 bytes 5 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 code/game/objects/items/stacks/tiles/tile_types.dm.rej delete mode 100644 code/modules/crafting/recipes.dm.rej diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index de0cdaf494..01a0940e53 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -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" diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm.rej b/code/game/objects/items/stacks/tiles/tile_types.dm.rej deleted file mode 100644 index 2f47c12b65..0000000000 --- a/code/game/objects/items/stacks/tiles/tile_types.dm.rej +++ /dev/null @@ -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" diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 67464adc12..d84d806a00 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -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 diff --git a/code/modules/crafting/recipes.dm.rej b/code/modules/crafting/recipes.dm.rej deleted file mode 100644 index 39167bca83..0000000000 --- a/code/modules/crafting/recipes.dm.rej +++ /dev/null @@ -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 diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi index 5372e24c05df6f67f4410cf00eac932000f96e51..1c0ac03abecac62849a5c8e295804c5b2f609157 100644 GIT binary patch delta 10895 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 Dx;t>4 delta 10990 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 l|8Fb%f0&)_KMn4od)%{>2@r