From fe0039b5d0949bb9ab2e9e08108a4bc1d01f6f94 Mon Sep 17 00:00:00 2001
From: Whatstone <whatston3@gmail.com>
Date: Tue, 25 Feb 2025 09:34:07 -0500
Subject: [PATCH] NFExplosivecrafting to NFFireBomb

---
 .../Whitelist/Components/NFExplosivecraftingComponent.cs   | 7 -------
 .../_NF/Whitelist/Components/NFFireBombComponent.cs        | 7 +++++++
 .../Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml | 2 +-
 .../Construction/Graphs/weapons/improvised_bolt.yml        | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 Content.Server/_NF/Whitelist/Components/NFExplosivecraftingComponent.cs
 create mode 100644 Content.Server/_NF/Whitelist/Components/NFFireBombComponent.cs

diff --git a/Content.Server/_NF/Whitelist/Components/NFExplosivecraftingComponent.cs b/Content.Server/_NF/Whitelist/Components/NFExplosivecraftingComponent.cs
deleted file mode 100644
index 18f57c3250d..00000000000
--- a/Content.Server/_NF/Whitelist/Components/NFExplosivecraftingComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Server._NF.Whitelist.Components;
-
-/// <summary>
-/// Whitelist component for crafting explosive arrow bolts
-/// </summary>
-[RegisterComponent]
-public sealed partial class NFExplosivecraftingComponent : Component;
diff --git a/Content.Server/_NF/Whitelist/Components/NFFireBombComponent.cs b/Content.Server/_NF/Whitelist/Components/NFFireBombComponent.cs
new file mode 100644
index 00000000000..cc766b0a212
--- /dev/null
+++ b/Content.Server/_NF/Whitelist/Components/NFFireBombComponent.cs
@@ -0,0 +1,7 @@
+namespace Content.Server._NF.Whitelist.Components;
+
+/// <summary>
+/// Whitelist component for fire bombs to avoid tag redefinition and collisions
+/// </summary>
+[RegisterComponent]
+public sealed partial class NFFireBombComponent : Component;
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
index bde5086f109..ea23fa9ea1e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
@@ -7,7 +7,7 @@
   name: fire bomb
   description: A weak, improvised incendiary device.
   components:
-  - type: NFExplosivecrafting
+  - type: NFFireBomb # Frontier
   - type: WeaponCaseInsertable # Frontier
   - type: Sprite
     sprite: Objects/Weapons/Bombs/ied.rsi
diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/weapons/improvised_bolt.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/weapons/improvised_bolt.yml
index b235ff7993f..5d28f2b1489 100644
--- a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/weapons/improvised_bolt.yml
+++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/weapons/improvised_bolt.yml
@@ -127,7 +127,7 @@
           sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
           state: base
         doAfter: 1
-      - component: NFExplosivecrafting
+      - component: NFFireBomb
         name: Firebomb
         icon:
           sprite: Objects/Weapons/Bombs/ied.rsi