From fd55eba17cb71d9f0e028045900672bdbf1300ea Mon Sep 17 00:00:00 2001 From: Velcroboy Date: Sat, 28 Dec 2024 15:08:43 -0600 Subject: [PATCH 1/6] Remove filters from joint crafting --- Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml index 419d7bff339d..3fa60a231dc1 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml @@ -7,12 +7,11 @@ - to: joint steps: - material: PaperRolling - - material: CigaretteFilter - material: GroundCannabis doAfter: 2 - node: joint entity: Joint - + - type: constructionGraph id: smokeableJointRainbow start: start @@ -22,7 +21,6 @@ - to: jointRainbow steps: - material: PaperRolling - - material: CigaretteFilter - material: GroundCannabisRainbow doAfter: 2 - node: jointRainbow From e8756aeae41c90fa60b17cbdd145db4e66e1880f Mon Sep 17 00:00:00 2001 From: Velcroboy Date: Sat, 28 Dec 2024 15:17:38 -0600 Subject: [PATCH 2/6] err --- Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml index 3fa60a231dc1..419d7bff339d 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml @@ -7,11 +7,12 @@ - to: joint steps: - material: PaperRolling + - material: CigaretteFilter - material: GroundCannabis doAfter: 2 - node: joint entity: Joint - + - type: constructionGraph id: smokeableJointRainbow start: start @@ -21,6 +22,7 @@ - to: jointRainbow steps: - material: PaperRolling + - material: CigaretteFilter - material: GroundCannabisRainbow doAfter: 2 - node: jointRainbow From 4f24d11b414a5fee759e562ba665416d1babeea3 Mon Sep 17 00:00:00 2001 From: Velcroboy Date: Sat, 28 Dec 2024 15:18:49 -0600 Subject: [PATCH 3/6] hmmm --- Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml index 419d7bff339d..3fa60a231dc1 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml @@ -7,12 +7,11 @@ - to: joint steps: - material: PaperRolling - - material: CigaretteFilter - material: GroundCannabis doAfter: 2 - node: joint entity: Joint - + - type: constructionGraph id: smokeableJointRainbow start: start @@ -22,7 +21,6 @@ - to: jointRainbow steps: - material: PaperRolling - - material: CigaretteFilter - material: GroundCannabisRainbow doAfter: 2 - node: jointRainbow From ef859ec850214aed3875b97634f06542823701c2 Mon Sep 17 00:00:00 2001 From: Velcroboy Date: Sat, 28 Dec 2024 15:21:10 -0600 Subject: [PATCH 4/6] guhhh --- Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml index 3fa60a231dc1..92c56b09b88d 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml @@ -21,6 +21,7 @@ - to: jointRainbow steps: - material: PaperRolling + - material: CigaretteFilter - material: GroundCannabisRainbow doAfter: 2 - node: jointRainbow From cc416603c851e285a41b672bc3214b2985fc8091 Mon Sep 17 00:00:00 2001 From: Velcroboy Date: Sat, 28 Dec 2024 15:22:18 -0600 Subject: [PATCH 5/6] yyyy --- Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml index 92c56b09b88d..3fa60a231dc1 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml @@ -21,7 +21,6 @@ - to: jointRainbow steps: - material: PaperRolling - - material: CigaretteFilter - material: GroundCannabisRainbow doAfter: 2 - node: jointRainbow From 828d4352fbc33aea86959a089c882806fb9931d3 Mon Sep 17 00:00:00 2001 From: Velcroboy Date: Sat, 28 Dec 2024 20:15:03 -0600 Subject: [PATCH 6/6] whitespace --- Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml index 3fa60a231dc1..fd613ae0a1fc 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml @@ -11,7 +11,7 @@ doAfter: 2 - node: joint entity: Joint - + - type: constructionGraph id: smokeableJointRainbow start: start