From 2059f265300ba77a79302e1fe6b7cebb3ac843f1 Mon Sep 17 00:00:00 2001
From: zekins3366 <zekins3366@gmail.com>
Date: Sat, 4 May 2024 09:21:48 +0300
Subject: [PATCH] Fix extra damage at melee

---
 .../Prototypes/Entities/Objects/Materials/crystal_shard.yml     | 2 --
 Resources/Prototypes/Entities/Objects/Materials/shards.yml      | 2 --
 Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml    | 2 --
 .../Prototypes/Entities/Objects/Weapons/Melee/armblade.yml      | 2 --
 Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml | 2 --
 Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml   | 2 --
 Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml   | 2 --
 7 files changed, 14 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
index 47828ed8f58..8f522abce42 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
@@ -6,8 +6,6 @@
   description:  A small piece of crystal.
   components:
   - type: Sharp
-  - type: Execution
-    doAfterDuration: 4.0
   - type: Sprite
     layers:
       - sprite: Objects/Materials/Shards/crystal.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index 57777240a3c..621a3b1c389 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -5,8 +5,6 @@
   description: It's a shard of some unknown material.
   components:
   - type: Sharp
-  - type: Execution
-    doAfterDuration: 4.0
   - type: Sprite
     layers:
       - sprite: Objects/Materials/Shards/shard.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
index 32af3100f2a..4abd31738ee 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
@@ -5,8 +5,6 @@
   description: In Space Glasgow this is called a conversation starter.
   components:
   - type: Sharp
-  - type: Execution
-    doAfterDuration: 4.0
   - type: MeleeWeapon
     attackRate: 1.5
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
index a20ae207b08..9e1134195d5 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
@@ -5,8 +5,6 @@
   description: A grotesque blade made out of bone and flesh that cleaves through people as a hot knife through butter.
   components:
   - type: Sharp
-  - type: Execution
-    doAfterDuration: 4.0
   - type: Sprite
     sprite: Objects/Weapons/Melee/armblade.rsi
     state: icon
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
index 6589088f7ac..857a48351a6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -8,8 +8,6 @@
     tags:
     - FireAxe
   - type: Sharp
-  - type: Execution
-    doAfterDuration: 4.0
   - type: Sprite
     sprite: Objects/Weapons/Melee/fireaxe.rsi
     state: icon
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index 56bb4c39e27..9cd1bb29408 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -7,8 +7,6 @@
     tags:
     - Knife
   - type: Sharp
-  - type: Execution
-    doAfterDuration: 4.0
   - type: Utensil
     types:
       - Knife
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index 73508ebdea7..7981b4914fc 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -6,8 +6,6 @@
   abstract: true
   components:
     - type: Sharp
-    - type: Execution
-      doAfterDuration: 4.0
     - type: DisarmMalus
 
 - type: entity