From 05250939c6b551ccbbf43f327a0daa668e7da77f Mon Sep 17 00:00:00 2001 From: lolman360 <22850904+lolman360@users.noreply.github.com> Date: Sun, 23 Aug 2020 23:58:04 +1000 Subject: [PATCH 1/6] e --- code/game/objects/items/stacks/sheets/sheet_types.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 4cb898d51f..100a705f15 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -689,6 +689,7 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \ new/datum/stack_recipe("bronze boots", /obj/item/clothing/shoes/bronze), \ null, new/datum/stack_recipe("bronze chair", /obj/structure/chair/bronze, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("bronze anvil", /obj/structure/anvil/obtainable/bronze, 20, time = 110, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("bronze bar stool", /obj/structure/chair/stool/bar/bronze, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("bronze stool", /obj/structure/chair/stool/bronze, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \ From 289280f0ecc56524a6539f1eadddb050dca9b55d Mon Sep 17 00:00:00 2001 From: lolman360 <22850904+lolman360@users.noreply.github.com> Date: Mon, 24 Aug 2020 00:00:39 +1000 Subject: [PATCH 2/6] Update recipes_misc.dm --- .../components/crafting/recipes/recipes_misc.dm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/code/datums/components/crafting/recipes/recipes_misc.dm b/code/datums/components/crafting/recipes/recipes_misc.dm index f47a879a9a..7166813ff5 100644 --- a/code/datums/components/crafting/recipes/recipes_misc.dm +++ b/code/datums/components/crafting/recipes/recipes_misc.dm @@ -119,6 +119,17 @@ subcategory = CAT_MISCELLANEOUS category = CAT_MISC always_availible = FALSE // Disabled til learned + +/datum/crafting_recipe/furnace + name = "Sandstone Furnace" + result = /obj/structure/furnace + time = 300 + reqs = list(/obj/item/stack/sheet/mineral/sandstone = 15, + /obj/item/stack/sheet/metal = 4, + /obj/item/stack/rods = 2) + tools = list(TOOL_CROWBAR) + subcategory = CAT_MISCELLANEOUS + category = CAT_MISC /datum/crafting_recipe/tableanvil name = "Table Anvil" @@ -134,7 +145,7 @@ name = "Sandstone Anvil" result = /obj/structure/anvil/obtainable/sandstone time = 300 - reqs = list(/obj/item/stack/sheet/mineral/sandstone = 4) + reqs = list(/obj/item/stack/sheet/mineral/sandstone = 24) tools = list(TOOL_CROWBAR) subcategory = CAT_MISCELLANEOUS category = CAT_MISC From d45ac6323a455c1eaaca2b2cf96dd2f67169ad86 Mon Sep 17 00:00:00 2001 From: lolman360 <22850904+lolman360@users.noreply.github.com> Date: Mon, 24 Aug 2020 00:09:58 +1000 Subject: [PATCH 3/6] Update smithed_items.dm --- code/modules/smithing/smithed_items.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/smithing/smithed_items.dm b/code/modules/smithing/smithed_items.dm index 5a9770218b..e55ea96f75 100644 --- a/code/modules/smithing/smithed_items.dm +++ b/code/modules/smithing/smithed_items.dm @@ -24,7 +24,7 @@ /obj/item/ingot/on_attack_hand(mob/user) var/mob/living/carbon/human/H - if(!workability == "shapeable") + if(!(workability == "shapeable")) return ..() var/prot = 0 if(ishuman(user)) From 1f576dfd124c12d91bc2cb0cef73874002058ea1 Mon Sep 17 00:00:00 2001 From: lolman360 <22850904+lolman360@users.noreply.github.com> Date: Mon, 24 Aug 2020 00:15:27 +1000 Subject: [PATCH 4/6] Update smithed_items.dm --- code/modules/smithing/smithed_items.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/smithing/smithed_items.dm b/code/modules/smithing/smithed_items.dm index e55ea96f75..0224069431 100644 --- a/code/modules/smithing/smithed_items.dm +++ b/code/modules/smithing/smithed_items.dm @@ -19,12 +19,12 @@ icon = 'icons/obj/smith.dmi' icon_state = "ingot" material_flags = MATERIAL_COLOR | MATERIAL_ADD_PREFIX - var/workability = "cold" + var/workability = 0 /obj/item/ingot/on_attack_hand(mob/user) var/mob/living/carbon/human/H - if(!(workability == "shapeable")) + if(!workability) return ..() var/prot = 0 if(ishuman(user)) From 460c92de74f43931f4e5134fd67a870817221f60 Mon Sep 17 00:00:00 2001 From: lolman360 <22850904+lolman360@users.noreply.github.com> Date: Mon, 24 Aug 2020 00:20:04 +1000 Subject: [PATCH 5/6] 3 --- code/game/objects/items/stacks/sheets/sheet_types.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 100a705f15..3fb72b8191 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -695,7 +695,7 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \ new/datum/stack_recipe("bronze ingot", /obj/item/ingot/bronze, 6, time = 100), \ new/datum/stack_recipe("bronze floor tiles", /obj/item/stack/tile/bronze, 1, 4, 20), \ -)) +) /obj/item/stack/sheet/bronze name = "brass"