From 2b6fe4a1eb45050317c7e9ff4baeaf5fc2a2276e Mon Sep 17 00:00:00 2001
From: sh4zik <lorenczahar516@gmail.com>
Date: Sat, 21 Dec 2024 15:03:46 +0100
Subject: [PATCH] =?UTF-8?q?[FIX]=20=D0=91=D1=8B=D1=81=D1=82=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8C=D0=BA=D0=B8=D0=B5=20=D0=BF=D0=BE=D1=87=D0=B8=D0=BD?=
 =?UTF-8?q?=D0=BA=D0=B8=20(#903)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Описание PR
Починка всего, что было сломанно

## Почему / Баланс
Починка разнообразного контента

## Требования
<!--
В связи с наплывом ПР'ов нам необходимо убедиться, что ПР'ы следуют
правильным рекомендациям.

Пожалуйста, уделите время прочтению, если делаете пулл реквест (ПР)
впервые.

Отметьте поля ниже, чтобы подтвердить, что Вы действительно видели их
(поставьте X в скобках, например [X]):
-->
- [x] Я прочитал(а) и следую [Руководство по созданию пулл
реквестов](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению
мейнтейнера.
- [x] Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие
его изменения в игре, **или** этот пулл реквест не требует демонстрации
в игре

**Чейнджлог**
<!-- Изменения и прочие фиксы моих же новвоведений🆑 Sh4zik
-->

:cl: Sh4zik
- tweak: Были переработаны кинжалы
- fix: Были починены крафты кинжалов
- fix: Был починен вес новогодних саней
---
 .../ADT/Entities/Objects/Fun/misc.yml         |  26 ++++-
 .../Entities/Objects/Weapons/Melee/swords.yml | 106 +++++++++++++++++-
 .../Crafting/Graphs/Improvised/daggers.yml    |  36 +++++-
 3 files changed, 158 insertions(+), 10 deletions(-)

diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml
index 39c4b105f86..5e7d11f74fe 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml
@@ -2,7 +2,7 @@
 - type: entity
   parent: [BaseBallBat, ClothingHandsBase]
   id: ADTHalloweenBroom
-  name: witch broom
+  name: witch broom 
   description: time to fly
   suffix: Halloween
   components:
@@ -72,9 +72,31 @@
 - type: entity
   name: New Year gurney
   id: ADTNewYearKatalka
-  parent: ChairBase
+  parent: BaseStructure
   description: Yea.
+  placement:
+    mode: PlaceFree
   components:
   - type: Sprite
     sprite: ADT/Structures/Specific/newyearkatalki.rsi
     state: newyearkatalka
+  - type: Anchorable
+  - type: Rotatable
+  - type: Physics # ADT CHANGE START sleep
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+        density: 10
+        mask:
+        - TableMask
+  - type: HealOnBuckle
+    damage:
+      types:
+        Poison: -0.1
+        Blunt: -0.1
+  - type: Strap
+    position: Down
+    rotation: 0 # ADT CHANGE END sleep
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml
index 5951f1a0334..0ff1bec9869 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml
@@ -110,7 +110,31 @@
     attackRate: 1.75
     damage:
       types:
-        Slash: 6.3
+        Piercing: 8
+  - type: SolutionContainerManager
+    solutions:
+      melee:
+        maxVol: 1
+  - type: MeleeChemicalInjector
+    solution: melee
+  - type: RefillableSolution
+    solution: melee
+  - type: InjectableSolution
+    solution: melee
+  - type: SolutionInjectOnEmbed
+    transferAmount: 1
+    solution: melee
+  - type: SolutionTransfer
+    maxTransferAmount: 1
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Piercing: 15
+  - type: EmbeddableProjectile
+    offset: -0.15,0.0
+  - type: ThrowingAngle
+    angle: 225
+  - type: LandAtCursor
 
 - type: entity
   name: dagger reinforced
@@ -140,7 +164,31 @@
     attackRate: 1.75
     damage:
       types:
-        Slash: 6
+        Piercing: 7
+  - type: SolutionContainerManager
+    solutions:
+      melee:
+        maxVol: 1
+  - type: MeleeChemicalInjector
+    solution: melee
+  - type: RefillableSolution
+    solution: melee
+  - type: InjectableSolution
+    solution: melee
+  - type: SolutionInjectOnEmbed
+    transferAmount: 1
+    solution: melee
+  - type: SolutionTransfer
+    maxTransferAmount: 1
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Piercing: 12
+  - type: EmbeddableProjectile
+    offset: -0.15,0.0
+  - type: ThrowingAngle
+    angle: 225
+  - type: LandAtCursor
 
 - type: entity
   name: dagger glass
@@ -170,7 +218,31 @@
     attackRate: 1.75
     damage:
       types:
-        Slash: 5
+        Piercing: 6
+  - type: SolutionContainerManager
+    solutions:
+      melee:
+        maxVol: 1
+  - type: MeleeChemicalInjector
+    solution: melee
+  - type: RefillableSolution
+    solution: melee
+  - type: InjectableSolution
+    solution: melee
+  - type: SolutionInjectOnEmbed
+    transferAmount: 1
+    solution: melee
+  - type: SolutionTransfer
+    maxTransferAmount: 1
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Piercing: 10
+  - type: EmbeddableProjectile
+    offset: -0.15,0.0
+  - type: ThrowingAngle
+    angle: 225
+  - type: LandAtCursor
 
 - type: entity
   name: dagger uranium
@@ -200,7 +272,33 @@
     attackRate: 1.75
     damage:
       types:
-        Slash: 9
+        Piercing: 5
+        Radiation: 5
+  - type: SolutionContainerManager
+    solutions:
+      melee:
+        maxVol: 1
+  - type: MeleeChemicalInjector
+    solution: melee
+  - type: RefillableSolution
+    solution: melee
+  - type: InjectableSolution
+    solution: melee
+  - type: SolutionInjectOnEmbed
+    transferAmount: 1
+    solution: melee
+  - type: SolutionTransfer
+    maxTransferAmount: 1
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Piercing: 9
+        Radiation: 9
+  - type: EmbeddableProjectile
+    offset: -0.15,0.0
+  - type: ThrowingAngle
+    angle: 225
+  - type: LandAtCursor
 
 - type: entity
   name: wooden sword
diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml
index 87e28b684c4..04e9d3039ff 100644
--- a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml
+++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml
@@ -6,8 +6,15 @@
     edges:
     - to: ADTCompGlassDager
       steps:
-      - material: Cloth
+      - material: MetalRod
         amount: 1
+      - material: Cable
+        amount: 1
+      - tag: GlassShard
+        name: glass shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
         doAfter: 1
   - node: ADTCompGlassDager
     entity: ADTGlassDagger
@@ -20,8 +27,15 @@
     edges:
     - to: ADTCompGlassRefDager
       steps:
-      - material: Cloth
+      - material: MetalRod
+        amount: 1
+      - material: Cable
         amount: 1
+      - tag: ReinforcedGlassShard
+        name: reinforced glass shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
         doAfter: 1
   - node: ADTCompGlassRefDager
     entity: ADTGlassReinDagger
@@ -34,8 +48,15 @@
     edges:
     - to: ADTCompUranDager
       steps:
-      - material: Cloth
+      - material: MetalRod
         amount: 1
+      - material: Cable
+        amount: 1
+      - tag: UraniumGlassShard
+        name: uranium glass shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
         doAfter: 1
   - node: ADTCompUranDager
     entity: ADTGlassUranDagger
@@ -48,8 +69,15 @@
     edges:
     - to: ADTCompPlasmaDager
       steps:
-      - material: Cloth
+      - material: MetalRod
+        amount: 1
+      - material: Cable
         amount: 1
+      - tag: PlasmaGlassShard
+        name: plasma glass shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
         doAfter: 1
   - node: ADTCompPlasmaDager
     entity: ADTPlasmaDagger