From: Pronana <66055347+Pronana@users.noreply.github.com>
Date: Tue, 18 Feb 2025 15:16:47 +0000 (-0800)
Subject: Crusher Dagger Knife Component (#35259)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=0df6bfb0e9a2dde4c0fc75860ebb4a6f455b8570;p=space-station-14.git

Crusher Dagger Knife Component (#35259)

* Added Knife Component to Crusher dagger, allowing
it to be used in a few new crafting recipes such
as baseball bats.

* Changed BaseKnife to CombatKnife, reordered parents

* now inherits from baseknife, throwing and disarm added manually
---

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index 5b565127a2..7ae4480d85 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -154,7 +154,7 @@
   - type: Prying
 
 - type: entity
-  parent: [ BaseWeaponCrusher, BaseSecurityCargoContraband]
+  parent: [ BaseKnife, BaseWeaponCrusher, BaseSecurityCargoContraband]
   id: WeaponCrusherDagger
   name: crusher dagger
   description: A scaled down version of a proto-kinetic crusher. Uses kinetic energy to vibrate the blade at high speeds.
@@ -169,9 +169,18 @@
     damage:
       types:
         Slash: 15
-  - type: Tag
-    tags:
-    - Knife
+  - type: EmbeddableProjectile
+    sound: /Audio/Weapons/star_hit.ogg
+    offset: -0.15,0.0
+  - type: LandAtCursor
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Slash: 10
+  - type: DisarmMalus
+    malus: 0.225
+  - type: ThrowingAngle
+    angle: 225
 
 # Like a crusher... but better
 - type: entity