From a8c741a6b5f3d3245c05b89da9a74a00657c23e9 Mon Sep 17 00:00:00 2001
From: Sefaia <sefaia.kitsune@gmail.com>
Date: Tue, 24 Jun 2025 16:08:20 -0500
Subject: [PATCH] Merge pull request #1468 from Sefaia/Leftover-Executions

Added Executions for Non-Modular Weapon Base and Ice Dagger.
---
 .../Entities/Actions/Spells/Water/ice_dagger.yml |  1 +
 .../Entities/Objects/Weapons/Melee/base.yml      | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_dagger.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_dagger.yml
index 85920c58bf..f9ac007568 100644
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_dagger.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_dagger.yml
@@ -135,6 +135,7 @@
         acts: ["Destruction"]
   - type: TimedDespawn
     lifetime: 60
+  - type: Execution
 
 - type: entity
   parent: CP14BaseSpellScrollWater
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/base.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/base.yml
index 85a1321ef5..5b64386c23 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/base.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/base.yml
@@ -83,6 +83,7 @@
     types:
       - Knife
   - type: CP14WallpaperRemover
+  - type: Execution
 
 - type: entity
   abstract: true
@@ -115,3 +116,18 @@
     damageToSelf:
       types:
         Blunt: 0.5 # 100 hits
+
+- type: entity
+  abstract: true
+  id: CP14BaseWeaponExecution
+  categories: [ HideSpawnMenu, ForkFiltered ]
+  components:
+  - type: Execution
+    internalMeleeExecutionMessage: "cp14-execution-popup-melee-initial-internal"
+    externalMeleeExecutionMessage: "cp14-execution-popup-melee-initial-external"
+    completeInternalMeleeExecutionMessage: "cp14-execution-popup-melee-complete-internal"
+    completeExternalMeleeExecutionMessage: "cp14-execution-popup-melee-complete-external"
+    internalSelfExecutionMessage: "cp14-execution-popup-self-initial-internal"
+    externalSelfExecutionMessage: "cp14-execution-popup-self-initial-external"
+    completeInternalSelfExecutionMessage: "cp14-execution-popup-self-complete-internal"
+    completeExternalSelfExecutionMessage: "cp14-execution-popup-self-complete-external"