From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Mon, 12 Feb 2024 02:35:45 +0000 (+0100)
Subject: Re-added shivs to crafting menus (#25094)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=e2c1f45cdfd48a80c7a4fdf217935ee8f8a15abc;p=space-station-14.git

Re-added shivs to crafting menus (#25094)

Added a recipe for crafting menu
---

diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index dca5f2c5d3..fa57f90c18 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -106,7 +106,7 @@
         - ReagentId: Silicon
           Quantity: 5 #Half of the value of regular glass. TECHNICALLY, welding a single shard of glass gives you the full thing back with just 1 sheet, but that is stupid so I am making it half.
   - type: Construction
-    graph: Shiv
+    graph: ShivConstruct
     node: start
 
 - type: entity
@@ -138,7 +138,7 @@
         - ReagentId: Silicon
           Quantity: 5 #I don't care enough to divide all of the reinforced glass materials by 2 because reinforced glass shards are due for removal anyways.
   - type: Construction
-    graph: ReinforcedShiv
+    graph: ReinforcedShivConstruct
     node: start
 
 - type: entity
@@ -172,7 +172,7 @@
         - ReagentId: Plasma
           Quantity: 5
   - type: Construction
-    graph: PlasmaShiv
+    graph: PlasmaShivConstruct
     node: start
 
 - type: entity
@@ -207,5 +207,5 @@
         - ReagentId: Uranium
           Quantity: 5
   - type: Construction
-    graph: UraniumShiv
+    graph: UraniumShivConstruct
     node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml
index 54e518fd78..28de8e7f7d 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: Shiv
+  id: ShivConstruct
   start: start
   graph:
   - node: start
@@ -14,7 +14,27 @@
     entity: Shiv
 
 - type: constructionGraph
-  id: ReinforcedShiv
+  id: Shiv
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: icon
+      steps:
+      - tag: GlassShard
+        name: Glass Shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
+        doAfter: 1
+      - material: Cloth
+        amount: 1
+        doAfter: 1
+  - node: icon
+    entity: Shiv
+
+- type: constructionGraph
+  id: ReinforcedShivConstruct
   start: start
   graph:
   - node: start
@@ -29,7 +49,27 @@
     entity: ReinforcedShiv
 
 - type: constructionGraph
-  id: PlasmaShiv
+  id: ReinforcedShiv
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: icon
+      steps:
+      - tag: ReinforcedGlassShard
+        name: Reinforced Glass Shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
+        doAfter: 1
+      - material: Cloth
+        amount: 1
+        doAfter: 1
+  - node: icon
+    entity: ReinforcedShiv
+
+- type: constructionGraph
+  id: PlasmaShivConstruct
   start: start
   graph:
   - node: start
@@ -44,7 +84,27 @@
     entity: PlasmaShiv
 
 - type: constructionGraph
-  id: UraniumShiv
+  id: PlasmaShiv
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: icon
+      steps:
+      - tag: PlasmaGlassShard
+        name: Plasma Glass Shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
+        doAfter: 1
+      - material: Cloth
+        amount: 1
+        doAfter: 1
+  - node: icon
+    entity: PlasmaShiv
+
+- type: constructionGraph
+  id: UraniumShivConstruct
   start: start
   graph:
   - node: start
@@ -57,3 +117,23 @@
         doAfter: 1
   - node: icon
     entity: UraniumShiv
+
+- type: constructionGraph
+  id: UraniumShiv
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: icon
+      steps:
+      - tag: UraniumGlassShard
+        name: Uranium Glass Shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
+        doAfter: 1
+      - material: Cloth
+        amount: 1
+        doAfter: 1
+  - node: icon
+    entity: UraniumShiv
diff --git a/Resources/Prototypes/Recipes/Construction/weapons.yml b/Resources/Prototypes/Recipes/Construction/weapons.yml
index 868a5cb186..2efc3f01a4 100644
--- a/Resources/Prototypes/Recipes/Construction/weapons.yml
+++ b/Resources/Prototypes/Recipes/Construction/weapons.yml
@@ -1,3 +1,47 @@
+- type: construction
+  name: glass shiv
+  id: Shiv
+  graph: Shiv
+  startNode: start
+  targetNode: icon
+  category: construction-category-weapons
+  description: A glass shard with a piece of cloth wrapped around it.
+  icon: { sprite: Objects/Weapons/Melee/shiv.rsi, state: icon }
+  objectType: Item
+
+- type: construction
+  name: reinforced shiv
+  id: ReinforcedShiv
+  graph: ReinforcedShiv
+  startNode: start
+  targetNode: icon
+  category: construction-category-weapons
+  description: A reinforced glass shard with a piece of cloth wrapped around it.
+  icon: { sprite: Objects/Weapons/Melee/reinforced_shiv.rsi, state: icon }
+  objectType: Item
+
+- type: construction
+  name: plasma shiv
+  id: PlasmaShiv
+  graph: PlasmaShiv
+  startNode: start
+  targetNode: icon
+  category: construction-category-weapons
+  description: A plasma shard with a piece of cloth wrapped around it.
+  icon: { sprite: Objects/Weapons/Melee/plasma_shiv.rsi, state: icon }
+  objectType: Item
+
+- type: construction
+  name: uranium shiv
+  id: UraniumShiv
+  graph: UraniumShiv
+  startNode: start
+  targetNode: icon
+  category: construction-category-weapons
+  description: A uranium shard with a piece of cloth wrapped around it.
+  icon: { sprite: Objects/Weapons/Melee/uranium_shiv.rsi, state: icon }
+  objectType: Item
+
 - type: construction
   name: crude spear
   id: Spear