From 57a8e424415aff0eba1658355bf989e773820ef3 Mon Sep 17 00:00:00 2001 From: Ryumi Date: Wed, 5 Nov 2025 15:30:18 -0600 Subject: [PATCH] Fixes being able to conjure leather by crafting steel furniture (#18705) * Fixes being able to conjure leather by crafting steel furniture * woops- --- code/__defines/materials.dm | 1 + .../structures/stool_bed_chair_nest/chairs.dm | 12 ++++++------ .../structures/stool_bed_chair_nest/chairs_vr.dm | 4 ++-- code/modules/materials/materials/organic/cloth.dm | 7 +++++++ 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/code/__defines/materials.dm b/code/__defines/materials.dm index 6e6c55b65b9..6f942d87f12 100644 --- a/code/__defines/materials.dm +++ b/code/__defines/materials.dm @@ -94,6 +94,7 @@ #define MAT_CLOTH_PURPLE "purple" #define MAT_CLOTH_BLUE "blue" #define MAT_CLOTH_BEIGE "beige" +#define MAT_CLOTH_BROWN "brown" #define MAT_CLOTH_LIME "lime" #define MAT_CLOTH_YELLOW "yellow" #define MAT_CLOTH_ORANGE "orange" diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 2455148d07f..16d7839647f 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -100,7 +100,7 @@ add_overlay(I) /obj/structure/bed/chair/comfy/brown/Initialize(mapload, var/new_material, var/new_padding_material) - . = ..(mapload, MAT_STEEL, MAT_LEATHER) + . = ..(mapload, MAT_STEEL, MAT_CLOTH_BROWN) /obj/structure/bed/chair/comfy/red/Initialize(mapload, var/new_material, var/new_padding_material) . = ..(mapload, MAT_STEEL, MAT_CARPET) @@ -139,7 +139,7 @@ base_icon = "roundedchair" /obj/structure/bed/chair/comfy/rounded/brown/Initialize(mapload, var/new_material, var/new_padding_material) - . = ..(mapload, MAT_STEEL, MAT_LEATHER) + . = ..(mapload, MAT_STEEL, MAT_CLOTH_BROWN) /obj/structure/bed/chair/comfy/rounded/red/Initialize(mapload, var/new_material, var/new_padding_material) . = ..(mapload, MAT_STEEL, MAT_CARPET) @@ -387,7 +387,7 @@ sofa_material = MAT_CARPET /obj/structure/bed/chair/sofa/brown - sofa_material = MAT_LEATHER + sofa_material = MAT_CLOTH_BROWN /obj/structure/bed/chair/sofa/teal sofa_material = MAT_CLOTH_TEAL @@ -428,13 +428,13 @@ icon_state = "sofacorner" /obj/structure/bed/chair/sofa/left/brown - sofa_material = MAT_LEATHER + sofa_material = MAT_CLOTH_BROWN /obj/structure/bed/chair/sofa/right/brown - sofa_material = MAT_LEATHER + sofa_material = MAT_CLOTH_BROWN /obj/structure/bed/chair/sofa/corner/brown - sofa_material = MAT_LEATHER + sofa_material = MAT_CLOTH_BROWN /obj/structure/bed/chair/sofa/left/teal sofa_material = MAT_CLOTH_TEAL diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm index 4b0830328a5..3e7e9cc6633 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm @@ -126,7 +126,7 @@ . = ..(mapload, new_material, MAT_CARPET) /obj/structure/bed/chair/bay/chair/padded/brown/Initialize(mapload, var/new_material, var/new_padding_material) - . = ..(mapload, new_material, MAT_LEATHER) + . = ..(mapload, new_material, MAT_CLOTH_BROWN) /obj/structure/bed/chair/bay/chair/padded/teal/Initialize(mapload, var/new_material, var/new_padding_material) . = ..(mapload, new_material, MAT_CLOTH_TEAL) @@ -162,7 +162,7 @@ . = ..(mapload, new_material, MAT_CARPET) /obj/structure/bed/chair/bay/comfy/brown/Initialize(mapload, var/new_material, var/new_padding_material) - . = ..(mapload, new_material, MAT_LEATHER) + . = ..(mapload, new_material, MAT_CLOTH_BROWN) /obj/structure/bed/chair/bay/comfy/teal/Initialize(mapload, var/new_material, var/new_padding_material) . = ..(mapload, new_material, MAT_CLOTH_TEAL) diff --git a/code/modules/materials/materials/organic/cloth.dm b/code/modules/materials/materials/organic/cloth.dm index 98cd7b329f7..6ed7fab3330 100644 --- a/code/modules/materials/materials/organic/cloth.dm +++ b/code/modules/materials/materials/organic/cloth.dm @@ -98,6 +98,13 @@ icon_colour = "#E8E7C8" wiki_flag = WIKI_SPOILER +/datum/material/cloth/brown + name = MAT_CLOTH_BROWN + display_name = MAT_CLOTH_BROWN + use_name = "brown cloth" + icon_colour = "#5C4831" + wiki_flag = WIKI_SPOILER + /datum/material/cloth/lime name = MAT_CLOTH_LIME display_name = MAT_CLOTH_LIME