From 246cd3ec9e36983f49a2897ab20e6a9bf113b3a3 Mon Sep 17 00:00:00 2001
From: Sab Pyrope <99945024+Uwuewsky@users.noreply.github.com>
Date: Sun, 12 Jan 2025 14:46:52 +0800
Subject: [PATCH] Remove some unused CBM snippets

---
 .../npcs/snippets/talk_tags_follower.json     | 43 -------------------
 .../talk_tags_obsolete.json                   | 10 +++++
 2 files changed, 10 insertions(+), 43 deletions(-)

diff --git a/data/json/npcs/snippets/talk_tags_follower.json b/data/json/npcs/snippets/talk_tags_follower.json
index fae060e7c245c..4219c63b43c64 100644
--- a/data/json/npcs/snippets/talk_tags_follower.json
+++ b/data/json/npcs/snippets/talk_tags_follower.json
@@ -840,26 +840,6 @@
       "Waiter!  I need a refill, my ethanol burner is running out of charge!"
     ]
   },
-  {
-    "type": "snippet",
-    "category": "<need_junk>",
-    "//": "NPC complaint when they are low on CBM power and have an internal furnace.  Additional versions should continue to specify that the NPC needs junk (withered plants, paper, or wood) and they need them to recharge their power CBMs.",
-    "text": [
-      "Any fuel to stoke these embers?",
-      "Fuel for the furnace?  Yes please.",
-      "Fuel reserves are burnt through, got anymore?",
-      "Gotta stoke the furnace, need some fuel.",
-      "Hey, <name_g>, can I get some waste paper or withered plants?  I need to recharge.",
-      "I can't recharge my CBMs without some firewood for my internal furnace.",
-      "I'll be all burned out soon enough, need some fuel.",
-      "I'm running on embers, got any fuel?",
-      "I need some junk to power my internal furnace.",
-      "I need something to burn for my furnace.  Can you help?",
-      "I need something to use as fuel for my furnace.",
-      "Need to get my burn on, got any fuel?",
-      "No fuel?  No power."
-    ]
-  },
   {
     "type": "snippet",
     "category": "<need_fuel>",
@@ -878,29 +858,6 @@
       "Without some fuel, I'm gonna be obsolete."
     ]
   },
-  {
-    "type": "snippet",
-    "category": "<need_radioactives>",
-    "//": "NPC complaint when they are low on CBM power and have an internal reactor.  Additional versions should continue to specify that the NPC needs radioactive slurry and they need it to recharge their power CBMs.  Also, mostly obsolete since internal reactors got removed.",
-    "text": [
-      "Beta radiation can be blocked by clothing, but is really dangerous if you ingest it.  So can I have some plutonium slurry to power my reactor and give me cancer?",
-      "Critical slurry supply, need to top up the reactor.",
-      "Empty reactor coming up, unless I get some slurry.",
-      "Gotta slurp some slurry in a hurry here!",
-      "Hey, <name_g>, pass me some plutonium slurry if you have any, I need to refuel my internal reactor.",
-      "I can't believe I'm saying this, but I need radioactive plutonium slurry for my internal reactor.",
-      "I can't use my internal reactor to recharge my CBMs without some plutonium slurry.",
-      "I can't use my internal reactor to recharge my CBMs without some plutonium slurry.  Which wouldn't be a problem if I had anything else that would recharge my CBMs!",
-      "I need some radioactive slurry to power my reactor.  Or a less dangerous power source, that would be even better!",
-      "I sure could use a highly radioactive slurry shake for my power supply right now.",
-      "I'm pretty slurriless right now, need a top up.",
-      "If I don't get some slurry, we'll have a miniature China Syndrome on our hands.",
-      "No slurry?  No power.",
-      "Please, <name_g>, get me some radioactive slurry to fuel my internal reactor.  Or get me another way to recharge my CBMs!",
-      "Supplies of slurry are low, could do with some more.",
-      "Systems saying slurry reserves are low."
-    ]
-  },
   {
     "type": "snippet",
     "category": "<ally_rule_cbm_recharge_all_text>",
diff --git a/data/json/obsoletion_and_migration_0.I/talk_tags_obsolete.json b/data/json/obsoletion_and_migration_0.I/talk_tags_obsolete.json
index 61582e97b961b..31b2f4f636203 100644
--- a/data/json/obsoletion_and_migration_0.I/talk_tags_obsolete.json
+++ b/data/json/obsoletion_and_migration_0.I/talk_tags_obsolete.json
@@ -72,5 +72,15 @@
     "category": "<ill_die>",
     "//": "A snippet use in the context of another complaint, like I'll die without your help",
     "text": "I won't last much longer"
+  },
+  {
+    "type": "snippet",
+    "category": "<need_junk>",
+    "text": "I need some junk to power my internal furnace."
+  },
+  {
+    "type": "snippet",
+    "category": "<need_radioactives>",
+    "text": "Hey, <name_g>, pass me some plutonium slurry if you have any, I need to refuel my internal reactor."
   }
 ]