cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 21:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes being able to conjure leather by crafting steel furniture (#11910)

Browse Source 
Co-authored-by: Ryumi <ghosttehspychecka@gmail.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-11-05 18:18:56 -05:00
committed by GitHub
co-authored by Ryumi Cameron Lennox
parent 5e64a7e99b
commit cf7fb0380c
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__defines/materials.dm
+1
View File
@@ -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"
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+6 -6
View File
@@ -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
code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm
+2 -2
View File
@@ -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)
code/modules/materials/materials/organic/cloth.dm
+7
View File
@@ -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