- add: new crafts (#5)

* - add: Chainsaw craft

* - add: Machete and claymore craft

* - add: Knifes and cleavers can now be researched and printed

* - add: Improvised shotgun shell recipe

Content.Shared/_White/Construction/AddTag.cs

@@ -0,0 +1,18 @@
+using Content.Shared.Construction;
+using Content.Shared.Tag;
+using JetBrains.Annotations;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared._White.Construction;
+
+[UsedImplicitly, DataDefinition]
+public sealed partial class AddTag : IGraphAction
+{
+    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<TagPrototype>))]
+    public string Tag = default!;
+
+    public void PerformAction(EntityUid uid, EntityUid? userUid, IEntityManager entityManager)
+    {
+        entityManager.System<TagSystem>().AddTag(uid, Tag);
+    }
+}

Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml

@@ -218,6 +218,10 @@
     qualities:
       - Sawing
     speed: 1.5
+  - type: Construction
+    deconstructionTarget: null
+    graph: ChainsawGraph
+    node: circular
 
 - type: entity
   name: advanced circular saw
@@ -241,3 +245,7 @@
     qualities:
       - Sawing
     speed: 2.0
+  - type: Construction
+    deconstructionTarget: null
+    graph: ChainsawGraph
+    node: circular

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml

@@ -149,6 +149,10 @@
     proto: PelletShotgunImprovised
   - type: SpentAmmoVisuals
     state: "improvised"
+  - type: Construction
+    deconstructionTarget: null
+    graph: ImprovisedShellGraph
+    node: shell
 
 - type: entity
   id: ShellShotgunUranium

Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml

@@ -47,3 +47,7 @@
         maxVol: 300
   - type: UseDelay
     delay: 1
+  - type: Construction
+    deconstructionTarget: null
+    graph: ChainsawGraph
+    node: chainsaw

Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml

@@ -44,6 +44,10 @@
   - type: GuideHelp
     guides:
     - Chef
+  - type: Construction
+    deconstructionTarget: null
+    graph: SwordGraph
+    node: knife
 
 - type: entity
   name: butcher's cleaver
@@ -100,6 +104,10 @@
     sprite: Objects/Weapons/Melee/combat_knife.rsi
   - type: DisarmMalus
     malus: 0.225
+  - type: Construction
+    deconstructionTarget: null
+    graph: SwordGraph
+    node: knife
 
 - type: entity
   name: survival knife

Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml

@@ -109,6 +109,10 @@
     size: Normal
     sprite: Objects/Weapons/Melee/machete.rsi
   - type: DisarmMalus
+  - type: Construction
+    deconstructionTarget: null
+    graph: SwordGraph
+    node: machete
 
 - type: entity
   name: claymore
@@ -135,6 +139,10 @@
     slots:
     - back
   - type: DisarmMalus
+  - type: Construction
+    deconstructionTarget: null
+    graph: SwordGraph
+    node: sword
 
 - type: entity
   name: cutlass

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -318,6 +318,8 @@
       - FauxTileAstroIce
       - OreBagOfHolding
       - ClothingEyesNightVisionGoggles # WD EDIT
+      - KitchenKnife # WD EDIT
+      - ButchCleaver # WD EDIT
       - DeviceQuantumSpinInverter
   - type: EmagLatheRecipes
     emagDynamicRecipes:

Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_pipes.yml

@@ -65,6 +65,20 @@
       steps:
       - tool: Welding
         doAfter: 1
+    - to: pipe_cut
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      steps:
+      - tool: Cutting
+        doAfter: 1
+      completed:
+      - !type:SpawnPrototype
+        prototype: PipeCut
+        amount: 4
+      - !type:DeleteEntity
+
+  - node: pipe_cut
 
   - node: bend
     entity: GasPipeBend

Resources/Prototypes/Research/civilianservices.yml

@@ -50,6 +50,8 @@
   - ElectricGrillMachineCircuitboard
   - BoozeDispenserMachineCircuitboard
   - SodaDispenserMachineCircuitboard
+  - KitchenKnife
+  - ButchCleaver
 
 - type: technology
   id: AudioVisualCommunication

Resources/Prototypes/White/Entities/Objects/Misc/improvised_parts.yml

@@ -0,0 +1,37 @@
+- type: entity
+  id: PipeCut
+  name: часть трубы
+  parent: BaseItem
+  components:
+  - type: Item
+    size: Tiny
+  - type: Sprite
+    sprite: White/Misc/improvised_shell.rsi
+    state: pipeCut
+  - type: Construction
+    deconstructionTarget: null
+    graph: ImprovisedShellGraph
+    node: pipe_cut
+
+- type: entity
+  id: PipeCutClosed
+  parent: PipeCut
+  components:
+  - type: Sprite
+    state: pipeCutClosed
+  - type: Construction
+    node: pipe_cut_closed
+  - type: SolutionContainerManager
+    solutions:
+      sol:
+        maxVol: 5
+  - type: DrawableSolution
+    solution: sol
+  - type: RefillableSolution
+    solution: sol
+  - type: DrainableSolution
+    solution: sol
+  - type: Spillable
+    solution: sol
+  - type: SolutionTransfer
+    maxTransferAmount: 5

Resources/Prototypes/White/Recipes/hidden_crafts.yml

@@ -3,7 +3,6 @@
   start: esword
   graph:
   - node: esword
-    entity: EnergySword
     edges:
       - to: desword
         steps:
@@ -16,29 +15,20 @@
   start: welder
   graph:
   - node: welder
-    entity: Welder
-    edges:
-      - to: screwed-welder
-        steps:
-        - tool: Screwing
-          doAfter: 1
-  - node: screwed-welder
     edges:
       - to: no-igniter
         steps:
-          - material: MetalRod
-            amount: 5
-            doAfter: 5
+        - tool: Screwing
+          doAfter: 1
+        - material: MetalRod
+          amount: 5
+          doAfter: 5
   - node: no-igniter
     entity: WeaponFlamethrowerUnfinished
-    edges:
-      - to: unscrewed
-        steps:
-          - tag: Igniter
-  - node: unscrewed
     edges:
       - to: flamethrower
         steps:
+          - tag: Igniter
           - tool: Screwing
             doAfter: 1
   - node: flamethrower
@@ -49,48 +39,28 @@
   start: stock
   graph:
   - node: stock
-    entity: RifleStock
     edges:
       - to: unfinished
         steps:
           - material: MetalRod
             amount: 3
             doAfter: 3
-  - node: unfinished
-    edges:
-      - to: rods
   - node: unfinished
     entity: WeaponPoweredCrossbowUnfinished
-    edges:
-      - to: welded
-        steps:
-          - tool: Welding
-            doAfter: 5
-  - node: welded
-    edges:
-      - to: cables
-        steps:
-          - material: Cable
-            amount: 5
-            doAfter: 0.5
-  - node: cables
-    edges:
-      - to: plastic
-        steps:
-          - material: Plastic
-            amount: 3
-            doAfter: 0.5
-  - node: plastic
-    edges:
-      - to: unscrewed
-        steps:
-          - material: Cable
-            amount: 5
-            doAfter: 0.5
-  - node: unscrewed
     edges:
       - to: crossbow
         steps:
+          - tool: Welding
+            doAfter: 5
+          - material: Cable
+            amount: 5
+            doAfter: 0.5
+          - material: Plastic
+            amount: 3
+            doAfter: 0.5
+          - material: Cable
+            amount: 5
+            doAfter: 0.5
           - tool: Screwing
             doAfter: 1
   - node: crossbow
@@ -130,3 +100,77 @@
         - !type:SpawnPrototype
           prototype: Telecrystal1
         - !type:EmptyAllContainers
+
+- type: constructionGraph
+  id: ChainsawGraph
+  start: circular
+  graph:
+  - node: circular
+    edges:
+      - to: chainsaw
+        steps:
+          - material: Cable
+            amount: 3
+            doAfter: 0.5
+          - material: Plasteel
+            amount: 5
+            doAfter: 3
+          - tool: Welding
+            doAfter: 5
+  - node: chainsaw
+    entity: Chainsaw
+
+- type: constructionGraph
+  id: SwordGraph
+  start: knife
+  graph:
+  - node: knife
+    edges:
+      - to: machete
+        steps:
+          - tool: Welding
+            doAfter: 5
+            completed:
+            - !type:AddTag
+              tag: "WeldedKnife"
+          - tag: WeldedKnife
+  - node: machete
+    entity: Machete
+    edges:
+      - to: sword
+        steps:
+          - tool: Welding
+            doAfter: 5
+          - tag: WeldedKnife
+  - node: sword
+    entity: Claymore
+
+- type: constructionGraph
+  id: ImprovisedShellGraph
+  start: pipe_cut
+  graph:
+  - node: pipe_cut
+    edges:
+      - to: pipe_cut_closed
+        steps:
+          - material: Steel
+            amount: 1
+            doAfter: 0.5
+  - node: pipe_cut_closed
+    entity: PipeCutClosed
+    edges:
+      - to: shell
+        conditions:
+          - !type:MinSolution
+            solution: sol
+            reagent:
+              ReagentId: WeldingFuel
+            quantity: 5
+        steps:
+          - material: Cable
+            amount: 1
+            doAfter: 0.5
+          - tool: Screwing
+            doAfter: 1
+  - node: shell
+    entity: ShellShotgunImprovised

Resources/Prototypes/White/tags.yml

@@ -45,3 +45,6 @@
 
 - type: Tag
   id: SurveillanceBodyCamera
+
+- type: Tag
+  id: WeldedKnife

Resources/Textures/White/Misc/improvised_shell.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "FDev",
+    "states": [
+        {
+            "name": "pipeCut"
+        },
+        {
+            "name": "pipeCutClosed"
+        }
+    ]
+}