From 3bb14db18ed86cc84ea281e7014ef6d7a400f7ee Mon Sep 17 00:00:00 2001
From: deltanedas <@deltanedas:kde.org>
Date: Sun, 23 Mar 2025 16:38:08 +0000
Subject: [PATCH] update bottle ids

---
 .../Nyanotrasen/Catalog/Fills/Boxes/general.yml     |  3 +--
 .../_DV/Catalog/Fills/Items/Backpacks/duffelbag.yml |  2 +-
 .../Objects/Specific/Mail/mail_civilian.yml         |  4 ++--
 .../Entities/Objects/Specific/chemistry-bottles.yml |  6 +++---
 Resources/Prototypes/_NF/Mail/Items/misc.yml        | 13 -------------
 5 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/general.yml
index d45e562b962..698209f8b62 100644
--- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/general.yml
@@ -59,8 +59,7 @@
       - id: DrinkWineCan
         amount: 2
       - id: SprayBottle
-        amount: 1
-      - id: MercuryChemistryBottle
+      - id: ChemistryBottleMercury
         amount: 2
   - type: Sprite
     layers:
diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Items/Backpacks/duffelbag.yml b/Resources/Prototypes/_DV/Catalog/Fills/Items/Backpacks/duffelbag.yml
index 57ca75c921c..724d6549dd2 100644
--- a/Resources/Prototypes/_DV/Catalog/Fills/Items/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/_DV/Catalog/Fills/Items/Backpacks/duffelbag.yml
@@ -27,5 +27,5 @@
     - id: AutodocSyndieFlatpack
     - id: OperatingTableFlatpack
     - id: Multitool
-    - id: ChloralHydrateChemistryBottle # stronger than n2o as you can be awake during safe operation
+    - id: ChemistryBottleChloralHydrate # stronger than n2o as you can be awake during safe operation
     - id: Syringe
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail_civilian.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail_civilian.yml
index 5c0248f02fd..cf0f942e764 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail_civilian.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail_civilian.yml
@@ -59,7 +59,7 @@
   components:
   - type: Mail
     contents:
-    - id: RobustHarvestChemistryBottle
+    - id: ChemistryBottleRobustHarvest
       orGroup: Chemical
       prob: 0.6
     - id: WeedSpray
@@ -75,7 +75,7 @@
     isFragile: true
     isPriority: true
     contents:
-    - id: UnstableMutagenChemistryBottle
+    - id: ChemistryBottleUnstableMutagen
 
 - type: entity
   parent: BaseMail
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/chemistry-bottles.yml
index 98f72e5a585..bc5dd3f7aca 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Specific/chemistry-bottles.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Specific/chemistry-bottles.yml
@@ -1,6 +1,6 @@
 - type: entity
   parent: BaseChemistryBottleFilled
-  id: NapalmChemistryBottle
+  id: ChemistryBottleNapalm
   suffix: napalm
   components:
   - type: Label
@@ -15,7 +15,7 @@
 
 - type: entity
   parent: BaseChemistryBottleFilled
-  id: UltravasculineChemistryBottle
+  id: ChemistryBottleUltravasculine
   suffix: ultravasculine
   components:
   - type: Label
@@ -30,7 +30,7 @@
 
 - type: entity
   parent: BaseChemistryBottleFilled
-  id: ChloralHydrateChemistryBottle
+  id: ChemistryBottleChloralHydrate
   suffix: chloral hydrate
   components:
   - type: Label
diff --git a/Resources/Prototypes/_NF/Mail/Items/misc.yml b/Resources/Prototypes/_NF/Mail/Items/misc.yml
index e504cd9c40f..c3d3eba9162 100644
--- a/Resources/Prototypes/_NF/Mail/Items/misc.yml
+++ b/Resources/Prototypes/_NF/Mail/Items/misc.yml
@@ -65,19 +65,6 @@
         - ReagentId: Opporozidone
           Quantity: 15
 
-- type: entity
-  id: NecrosolChemistryBottle
-  parent: BaseChemistryBottleFilled
-  name: necrosol bottle
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 30
-        reagents:
-        - ReagentId: Necrosol
-          Quantity: 30
-
 # Premium Alcohol: wait, it's just marketing?
 # TODO: different sprites would be nice.
 - type: entity