From cddd46fce3327ddb7fdfe03b5347cd15e94c4402 Mon Sep 17 00:00:00 2001 From: The0bserver Date: Sat, 5 Sep 2020 18:52:20 -0400 Subject: [PATCH 1/3] Maybe this will work. Maybe it won't. --- code/datums/materials/basemats.dm | 11 +++++++++++ code/game/objects/items/stacks/sheets/sheet_types.dm | 2 +- code/modules/smithing/smithed_items.dm | 4 ++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/code/datums/materials/basemats.dm b/code/datums/materials/basemats.dm index 30a04d7382..51b82d22bc 100644 --- a/code/datums/materials/basemats.dm +++ b/code/datums/materials/basemats.dm @@ -285,6 +285,17 @@ Unless you know what you're doing, only use the first three numbers. They're in beauty_modifier = -0.15 texture_layer_icon_state = "runed" +/datum/material/brass + name = "brass" + desc = "Tybel gb-Ratvar" + color = "#9B7E24" + categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE) + strength_modifier = 1.2 + sheet_type = /obj/item/stack/tile/brass + value_per_unit = 0.75 + armor_modifiers = list("melee" = 1.4, "bullet" = 1.4, "laser" = 0, "energy" = 0, "bomb" = 1.4, "bio" = 1.2, "rad" = 1.5, "fire" = 1.5, "acid" = 1.5) //Brass has.. a few problems that can't easily be compensated for. + beauty_modifier = 0.3 //It really beats the cold plain plating of the station, doesn't it? + /datum/material/bronze name = "bronze" desc = "Clock Cult? Never heard of it." diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 9ed930b8c7..c3028c2fd5 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -636,7 +636,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \ null, \ new/datum/stack_recipe("brass flask", /obj/item/reagent_containers/food/drinks/bottle/holyoil/empty), \ new/datum/stack_recipe("brass smith's hammer", /obj/item/melee/smith/hammer/ratvar, 6), \ - new/datum/stack_recipe("brass ingot", /obj/item/ingot/bronze/ratvar, 6, time = 100), \ + new/datum/stack_recipe("brass ingot", /obj/item/ingot/ratvar, 6, time = 100), \ )) /obj/item/stack/tile/brass diff --git a/code/modules/smithing/smithed_items.dm b/code/modules/smithing/smithed_items.dm index df30a01f8c..da619bf935 100644 --- a/code/modules/smithing/smithed_items.dm +++ b/code/modules/smithing/smithed_items.dm @@ -79,10 +79,10 @@ /obj/item/ingot/bronze custom_materials = list(/datum/material/bronze=12000) -/obj/item/ingot/bronze/ratvar +/obj/item/ingot/ratvar material_flags = MATERIAL_COLOR name = "brass ingnot" - desc = "On closer inspection, what appears to be wholly-unsuitable-for-smithing brass is actually more structurally stable bronze. Ratvar must have transformed the brass into bronze. Somehow." + desc = "On closer inspection, what appears to be wholly-unsuitable-for-smithing brass is actually primarily replicant alloy. Nezbere must have switched it while you weren't looking." /obj/item/smithing/attackby(obj/item/I, mob/user) From de8ed28f2c6f07487232a69ee8b8f357d9d10cd8 Mon Sep 17 00:00:00 2001 From: The0bserver Date: Sat, 5 Sep 2020 19:14:51 -0400 Subject: [PATCH 2/3] cat roomba.jpg --- 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 da619bf935..3416ea3bb2 100644 --- a/code/modules/smithing/smithed_items.dm +++ b/code/modules/smithing/smithed_items.dm @@ -80,8 +80,8 @@ custom_materials = list(/datum/material/bronze=12000) /obj/item/ingot/ratvar - material_flags = MATERIAL_COLOR - name = "brass ingnot" + custom_materials = list(/datum/material/brass=12000) + name = "brass ingot" desc = "On closer inspection, what appears to be wholly-unsuitable-for-smithing brass is actually primarily replicant alloy. Nezbere must have switched it while you weren't looking." From 4dacbbb0a954ae13b22a2f9c5adc40e2085519d6 Mon Sep 17 00:00:00 2001 From: The0bserver Date: Sat, 5 Sep 2020 20:34:49 -0400 Subject: [PATCH 3/3] =?UTF-8?q?deeper=20brass=20color=E2=84=A2=20(and=20da?= =?UTF-8?q?mage)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/datums/materials/basemats.dm | 6 +++--- code/modules/smithing/smithed_items.dm | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/datums/materials/basemats.dm b/code/datums/materials/basemats.dm index 51b82d22bc..76e60bc6dc 100644 --- a/code/datums/materials/basemats.dm +++ b/code/datums/materials/basemats.dm @@ -288,12 +288,12 @@ Unless you know what you're doing, only use the first three numbers. They're in /datum/material/brass name = "brass" desc = "Tybel gb-Ratvar" - color = "#9B7E24" + color = "#917010" categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE) - strength_modifier = 1.2 + strength_modifier = 1.3 // Replicant Alloy is very good for skull beatings.. sheet_type = /obj/item/stack/tile/brass value_per_unit = 0.75 - armor_modifiers = list("melee" = 1.4, "bullet" = 1.4, "laser" = 0, "energy" = 0, "bomb" = 1.4, "bio" = 1.2, "rad" = 1.5, "fire" = 1.5, "acid" = 1.5) //Brass has.. a few problems that can't easily be compensated for. + armor_modifiers = list("melee" = 1.4, "bullet" = 1.4, "laser" = 0, "energy" = 0, "bomb" = 1.4, "bio" = 1.2, "rad" = 1.5, "fire" = 1.5, "acid" = 1.5) //But it has.. a few problems that can't easily be compensated for. beauty_modifier = 0.3 //It really beats the cold plain plating of the station, doesn't it? /datum/material/bronze diff --git a/code/modules/smithing/smithed_items.dm b/code/modules/smithing/smithed_items.dm index 3416ea3bb2..7396e1fb7e 100644 --- a/code/modules/smithing/smithed_items.dm +++ b/code/modules/smithing/smithed_items.dm @@ -81,7 +81,6 @@ /obj/item/ingot/ratvar custom_materials = list(/datum/material/brass=12000) - name = "brass ingot" desc = "On closer inspection, what appears to be wholly-unsuitable-for-smithing brass is actually primarily replicant alloy. Nezbere must have switched it while you weren't looking."