From cf7fb0380c84dfd4c06170b1b2052a6b28d89521 Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Wed, 5 Nov 2025 16:18:56 -0700 Subject: [PATCH] [MIRROR] Fixes being able to conjure leather by crafting steel furniture (#11910) Co-authored-by: Ryumi Co-authored-by: Cameron Lennox --- 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 c0c7fb699e..76897da6bb 100644 --- a/code/__defines/materials.dm +++ b/code/__defines/materials.dm @@ -98,6 +98,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 7a74a49e10..7b35cc15ab 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) @@ -140,7 +140,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) @@ -391,7 +391,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 @@ -432,13 +432,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 4abc64b911..135dd0b657 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 @@ -145,7 +145,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) @@ -181,7 +181,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 5c05274bbf..161d2ca610 100644 --- a/code/modules/materials/materials/organic/cloth.dm +++ b/code/modules/materials/materials/organic/cloth.dm @@ -99,6 +99,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