From ee4fad7966c3544a5872dba5d0b68e461559e13a Mon Sep 17 00:00:00 2001 From: CuteMoff <81271196+CuteMoff@users.noreply.github.com> Date: Tue, 23 Mar 2021 20:34:17 -0400 Subject: [PATCH 1/7] Update basemats.dm --- code/datums/materials/basemats.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/materials/basemats.dm b/code/datums/materials/basemats.dm index 76e60bc6dc..e157121a24 100644 --- a/code/datums/materials/basemats.dm +++ b/code/datums/materials/basemats.dm @@ -52,7 +52,7 @@ Unless you know what you're doing, only use the first three numbers. They're in name = "diamond" desc = "Highly pressurized carbon" color = list(48/255, 272/255, 301/255,0, 0,0,0,0, 0,0,0,0, 0,0,0,1, 0,0,0,0) - strength_modifier = 1.1 + strength_modifier = 1.2 alpha = 132 categories = list(MAT_CATEGORY_ORE = TRUE, MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE) sheet_type = /obj/item/stack/sheet/mineral/diamond From 428591c4525fe497bd678faba60e3a778602092b Mon Sep 17 00:00:00 2001 From: CuteMoff <81271196+CuteMoff@users.noreply.github.com> Date: Tue, 23 Mar 2021 20:36:48 -0400 Subject: [PATCH 2/7] Update mineral.dm --- code/game/objects/items/stacks/sheets/mineral.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 426958b99a..7deda6818b 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -117,7 +117,7 @@ GLOBAL_LIST_INIT(diamond_recipes, list ( \ new/datum/stack_recipe("Captain Statue", /obj/structure/statue/diamond/captain, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("AI Hologram Statue", /obj/structure/statue/diamond/ai1, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("AI Core Statue", /obj/structure/statue/diamond/ai2, 5, one_per_turf = 1, on_floor = 1), \ -// new/datum/stack_recipe("diamond brick", /obj/item/ingot/diamond, 6, time = 100), \ not yet + new/datum/stack_recipe("diamond brick", /obj/item/ingot/diamond, 6, time = 100), \ Diamond Sword is a'go )) /obj/item/stack/sheet/mineral/diamond/get_main_recipes() From 048b8548ad2a851bebfe38f035146ee51697c05a Mon Sep 17 00:00:00 2001 From: CuteMoff <81271196+CuteMoff@users.noreply.github.com> Date: Tue, 23 Mar 2021 20:53:07 -0400 Subject: [PATCH 3/7] Update mineral.dm --- code/game/objects/items/stacks/sheets/mineral.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 7deda6818b..ceed8b8333 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -117,7 +117,7 @@ GLOBAL_LIST_INIT(diamond_recipes, list ( \ new/datum/stack_recipe("Captain Statue", /obj/structure/statue/diamond/captain, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("AI Hologram Statue", /obj/structure/statue/diamond/ai1, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("AI Core Statue", /obj/structure/statue/diamond/ai2, 5, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("diamond brick", /obj/item/ingot/diamond, 6, time = 100), \ Diamond Sword is a'go + new/datum/stack_recipe("diamond brick", /obj/item/ingot/diamond, 6, time = 100), \ )) /obj/item/stack/sheet/mineral/diamond/get_main_recipes() From 99caab1ec8bef5f50ef661889daf2e08fe004bc9 Mon Sep 17 00:00:00 2001 From: CuteMoff <81271196+CuteMoff@users.noreply.github.com> Date: Tue, 23 Mar 2021 21:08:11 -0400 Subject: [PATCH 4/7] 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 aff296b684..4c024a20e6 100644 --- a/code/modules/smithing/smithed_items.dm +++ b/code/modules/smithing/smithed_items.dm @@ -50,7 +50,7 @@ custom_materials = list(/datum/material/iron=12000) /obj/item/ingot/diamond - custom_materials = list(/datum/material/diamond=12000) //yeah ok + custom_materials = list(/datum/material/diamond=12000) /obj/item/ingot/uranium custom_materials = list(/datum/material/uranium=12000) From a51a1ae68f93528ba6994b586d710a2d21c28439 Mon Sep 17 00:00:00 2001 From: CuteMoff <81271196+CuteMoff@users.noreply.github.com> Date: Tue, 23 Mar 2021 21:24:11 -0400 Subject: [PATCH 5/7] Update mineral.dm --- code/game/objects/items/stacks/sheets/mineral.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index ceed8b8333..171b48fd05 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -117,7 +117,7 @@ GLOBAL_LIST_INIT(diamond_recipes, list ( \ new/datum/stack_recipe("Captain Statue", /obj/structure/statue/diamond/captain, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("AI Hologram Statue", /obj/structure/statue/diamond/ai1, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("AI Core Statue", /obj/structure/statue/diamond/ai2, 5, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("diamond brick", /obj/item/ingot/diamond, 6, time = 100), \ + new/datum/stack_recipe("diamond ingot", /obj/item/ingot/diamond, 6, time = 100), \ )) /obj/item/stack/sheet/mineral/diamond/get_main_recipes() From 9d8c7dff3583bc614dfffe49ea77665d543005d5 Mon Sep 17 00:00:00 2001 From: CuteMoff <81271196+CuteMoff@users.noreply.github.com> Date: Tue, 23 Mar 2021 23:15:03 -0400 Subject: [PATCH 6/7] Update code/modules/smithing/smithed_items.dm Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com> --- 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 4c024a20e6..71e35ba989 100644 --- a/code/modules/smithing/smithed_items.dm +++ b/code/modules/smithing/smithed_items.dm @@ -50,7 +50,7 @@ custom_materials = list(/datum/material/iron=12000) /obj/item/ingot/diamond - custom_materials = list(/datum/material/diamond=12000) + custom_materials = list(/datum/material/diamond=12000) /obj/item/ingot/uranium custom_materials = list(/datum/material/uranium=12000) From ea200acd9fea46e4cd44100c7bc154bbd4ab77d8 Mon Sep 17 00:00:00 2001 From: CuteMoff <81271196+CuteMoff@users.noreply.github.com> Date: Tue, 23 Mar 2021 23:17:24 -0400 Subject: [PATCH 7/7] Update code/game/objects/items/stacks/sheets/mineral.dm Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com> --- code/game/objects/items/stacks/sheets/mineral.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 171b48fd05..8dbe4456af 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -117,7 +117,7 @@ GLOBAL_LIST_INIT(diamond_recipes, list ( \ new/datum/stack_recipe("Captain Statue", /obj/structure/statue/diamond/captain, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("AI Hologram Statue", /obj/structure/statue/diamond/ai1, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("AI Core Statue", /obj/structure/statue/diamond/ai2, 5, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("diamond ingot", /obj/item/ingot/diamond, 6, time = 100), \ + new/datum/stack_recipe("diamond ingot", /obj/item/ingot/diamond, 6, time = 100), \ )) /obj/item/stack/sheet/mineral/diamond/get_main_recipes()