From 7a6c7d7eb2ffbf8a4fc8648652660333c67affe1 Mon Sep 17 00:00:00 2001
From: Nova <stellar_novas@riseup.net>
Date: Tue, 19 Mar 2024 17:45:52 -0400
Subject: [PATCH] Damage: Merge DeltaV modifier sets with EE ones.

---
 Resources/Prototypes/Damage/modifier_sets.yml        | 12 ++++++++++++
 Resources/Prototypes/DeltaV/Damage/modifier_sets.yml | 11 -----------
 2 files changed, 12 insertions(+), 11 deletions(-)
 delete mode 100644 Resources/Prototypes/DeltaV/Damage/modifier_sets.yml

diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml
index 31dd47a9e16..195aac1fc3c 100644
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -336,3 +336,15 @@
   flatReductions:
     # can't punch the endoskeleton to death
     Blunt: 5
+
+- type: damageModifierSet
+  id: Vulpkanin
+  coefficients:
+    Heat: 1.15
+
+- type: damageModifierSet
+  id: Harpy
+  coefficients:
+    Blunt: 1.15
+    Slash: 1.15
+    Piercing: 1.15
diff --git a/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml b/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml
deleted file mode 100644
index a2b8be8bf6a..00000000000
--- a/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- type: damageModifierSet
-  id: Vulpkanin
-  coefficients:
-    Heat: 1.15
-
-- type: damageModifierSet
-  id: Harpy
-  coefficients:
-    Blunt: 1.15
-    Slash: 1.15
-    Piercing: 1.15