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

Fixes being able to conjure leather by crafting steel furniture (#18705)

Browse Source 
* Fixes being able to conjure leather by crafting steel furniture

* woops-
This commit is contained in:
Ryumi
2025-11-05 16:30:18 -05:00
committed by GitHub
parent c23bbd33a0
commit 57a8e42441
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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)
@@ -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
code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm
+2 -2
View File
@@ -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)