From daa7c3d3eb36da0a1236057a1f0e0ef9968b5ee0 Mon Sep 17 00:00:00 2001 From: Pivo24 <42682553+Pivo24@users.noreply.github.com> Date: Mon, 24 Feb 2025 22:47:07 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BA=D1=80=D0=B0?= =?UTF-8?q?=D1=84=D1=82=D0=BE=D0=B2=20=D0=B8=D0=B7=20=D0=B7=D0=BE=D0=BB?= =?UTF-8?q?=D0=BE=D1=82=D0=B0=20=D0=B8=20=D0=BF=D0=BB=D0=B0=D1=81=D1=82?= =?UTF-8?q?=D0=B8=D0=BA=D0=B0=20(#3308)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/fancy_sofas/code/roundedchair.dm | 4 ++++ mods/fancy_sofas/code/sofa.dm | 7 ------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/mods/fancy_sofas/code/roundedchair.dm b/mods/fancy_sofas/code/roundedchair.dm index 31f78529577de..527c7b24ac0e0 100644 --- a/mods/fancy_sofas/code/roundedchair.dm +++ b/mods/fancy_sofas/code/roundedchair.dm @@ -72,6 +72,10 @@ ROUNDEDCHAIR(light) #undef ROUNDEDCHAIR /material/generate_recipes() + .=..() if(integrity >= 50 && hardness >= MATERIAL_FLEXIBLE + 10) .=..() . += new/datum/stack_recipe_list("padded [display_name] rounded chairs", create_recipe_list(/datum/stack_recipe/furniture/chair/rounded)) + . += new/datum/stack_recipe_list("padded [display_name] right sofas", create_recipe_list(/datum/stack_recipe/furniture/sofa/r)) + . += new/datum/stack_recipe_list("padded [display_name] middle sofas", create_recipe_list(/datum/stack_recipe/furniture/sofa/m)) + . += new/datum/stack_recipe_list("padded [display_name] left sofas", create_recipe_list(/datum/stack_recipe/furniture/sofa/l)) diff --git a/mods/fancy_sofas/code/sofa.dm b/mods/fancy_sofas/code/sofa.dm index 38c86ab78e9a2..2139505a763c8 100644 --- a/mods/fancy_sofas/code/sofa.dm +++ b/mods/fancy_sofas/code/sofa.dm @@ -264,10 +264,3 @@ RIGHT_SOFA(green) RIGHT_SOFA(yellow) RIGHT_SOFA(light) #undef RIGHT_SOFA - -/material/generate_recipes() - if(integrity >= 50 && hardness >= MATERIAL_FLEXIBLE + 10) - .=..() - . += new/datum/stack_recipe_list("padded [display_name] right sofas", create_recipe_list(/datum/stack_recipe/furniture/sofa/r)) - . += new/datum/stack_recipe_list("padded [display_name] middle sofas", create_recipe_list(/datum/stack_recipe/furniture/sofa/m)) - . += new/datum/stack_recipe_list("padded [display_name] left sofas", create_recipe_list(/datum/stack_recipe/furniture/sofa/l))