Chemistry bottle cleanup (#35911)

* init * clean * god save me * fuck relic * i HATE HATE HATE relic * make it stop * please make it stop * CEASE * PLEASE * Revert "PLEASE" This reverts commit 47d34f3c1e657adf869d84a5349f9c18fc33bfea. * Revert "CEASE" This reverts commit 147ab6697807b98e24b0e1ee05571a1995f3c41c. * Revert "please make it stop" This reverts commit f2a4f63e5f5b017f2b4ad3511e8c77700abed58b. * Revert "make it stop" This reverts commit b10c6344bd9e9e3f1989b29fc46a8de7829e382e. * Revert "i HATE HATE HATE relic" This reverts commit a05d60c0055fa003f7746be7aec2ebf4acd6e136. * Revert "fuck relic" This reverts commit e44f3368bc8aa5938095dc5a60e9390fbaf8aba3.
2025-03-23 13:24:55 +01:00
parent d4c8ddb0ac
commit 1859975ae6
20 changed files with 403 additions and 157 deletions
--- a/Resources/Prototypes/Catalog/Fills/Boxes/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/service.yml
@@ -23,11 +23,11 @@
    contents:
    - id: PaperAgrichemManual
    - id: ChemistryEmptyBottle01
-    - id: PotassiumChemistryBottle
-    - id: PhosphorusChemistryBottle
-    - id: NitrogenChemistryBottle
-    - id: HydrogenChemistryBottle
-    - id: EthanolChemistryBottle
+    - id: ChemistryBottlePotassium
+    - id: ChemistryBottlePhosphorus
+    - id: ChemistryBottleNitrogen
+    - id: ChemistryBottleHydrogen
+    - id: ChemistryBottleEthanol
    - id: RadiumChemistryVial
    - id: ChlorineChemistryVial
  - type: Sprite
--- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
@@ -58,7 +58,7 @@
      - id: HydroponicsToolHatchet
      - id: ClothingOuterApronBotanist
      - id: ClothingHandsGlovesLeather
-      - id: EZNutrientChemistryBottle
+      - id: ChemistryBottleEZNutrient
        amount: 2

 - type: entity
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -125,7 +125,7 @@
    - id: HydroponicsToolMiniHoe
    - id: HydroponicsToolSpade
    - id: HydroponicsToolClippers
-    - id: RobustHarvestChemistryBottle
+    - id: ChemistryBottleRobustHarvest

 - type: entity
  id: ClothingBeltSheathFilled
@@ -165,11 +165,11 @@
  components:
  - type: StorageFill
    contents:
-      - id: EpinephrineChemistryBottle
+      - id: ChemistryBottleEpinephrine
        amount: 2
-      - id: EphedrineChemistryBottle
+      - id: ChemistryBottleEphedrine
        amount: 2
-      - id: OmnizineChemistryBottle
+      - id: ChemistryBottleOmnizine
      - id: MedkitCombatFilled

 - type: entity
--- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -6,7 +6,7 @@
  - type: StorageFill
    contents:
      - id: BoxSyringe
-      - id: EpinephrineChemistryBottle
+      - id: ChemistryBottleEpinephrine
        amount: 1
      - id: Brutepack
        amount: 2
@@ -25,7 +25,7 @@
  - type: StorageFill
    contents:
      - id: BoxSyringe
-      - id: EpinephrineChemistryBottle
+      - id: ChemistryBottleEpinephrine
        amount: 1
      - id: Brutepack
        amount: 2
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -101,7 +101,7 @@
      - id: ClothingHandsGlovesLeather
      - id: ClothingOuterApronBotanist
      - id: ClothingHeadBandBotany
-      - id: RobustHarvestChemistryBottle
+      - id: ChemistryBottleRobustHarvest
        prob: 0.3
      - id: ClothingBeltPlant
      - id: PlantBag ##Some maps don't have nutrivend
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
@@ -47,7 +47,7 @@
    DrinkBeerCan: 5
    DrinkWineCan: 5
  contrabandInventory:
-    EthanolChemistryBottle: 3
+    ChemistryBottleEthanol: 3
    DrinkBottleOfNothingFull: 1
  emaggedInventory:
    DrinkPoisonWinebottleFull: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
@@ -26,7 +26,7 @@
    DrinkLithiumFlask: 1
    StrangePill: 3
  emaggedInventory:
-    ToxinChemistryBottle: 1
+    ChemistryBottleToxin: 1

 - type: vendingMachineInventory
  id: ChemVendInventorySyndicate
@@ -57,8 +57,8 @@
    DrinkLithiumFlask: 1
    StrangePill: 3
  emaggedInventory:
-    PaxChemistryBottle: 3
-    MuteToxinChemistryBottle: 3
-    LeadChemistryBottle: 2
-    ToxinChemistryBottle: 1
-    
+    ChemistryBottlePax: 3
+    ChemistryBottleMuteToxin: 3
+    ChemistryBottleLead: 2
+    ChemistryBottleToxin: 1
+
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
@@ -5,7 +5,7 @@
    Brutepack: 5
    Ointment: 5
    Bloodpack: 5
-    EpinephrineChemistryBottle: 3
+    ChemistryBottleEpinephrine: 3
    Syringe: 5
    BoxBottle: 3
    ClothingEyesHudMedical: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
@@ -12,15 +12,15 @@
    WeedSpray: 20
    PestSpray: 20
    Syringe: 5
-    RobustHarvestChemistryBottle: 3
-    EZNutrientChemistryBottle: 3
+    ChemistryBottleRobustHarvest: 3
+    ChemistryBottleEZNutrient: 3
    Bucket: 3
    DiseaseSwab: 20
    BoxAgrichem: 1
    #TO DO:
    #plant analyzer
  contrabandInventory:
-    UnstableMutagenChemistryBottle: 1
+    ChemistryBottleUnstableMutagen: 1
    Joint: 1
  emaggedInventory:
-    Left4ZedChemistryBottle: 1
+    ChemistryBottleLeft4Zed: 1
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml
@@ -4,7 +4,7 @@
    Brutepack: 3
    Ointment: 3
    Bloodpack: 3
-    EpinephrineChemistryBottle: 3
+    ChemistryBottleEpinephrine: 3
    Syringe: 3
  contrabandInventory:
    PowerCellSmall: 2
--- a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
+++ b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml
@@ -47,7 +47,7 @@
  content:
  - StorageImplanter
  - DnaScramblerImplanter
-  - EphedrineChemistryBottle
+  - ChemistryBottleEphedrine
  - SoapOmega
  - Syringe
  - DrinkShaker
@@ -76,8 +76,8 @@
    sprite: Objects/Tanks/anesthetic.rsi
    state: icon
  content:
-  - NocturineChemistryBottle
-  - NocturineChemistryBottle
+  - ChemistryBottleNocturine
+  - ChemistryBottleNocturine
  - HypopenBox
  - NitrousOxideTankFilled

--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -618,7 +618,7 @@
  id: UplinkNocturineChemistryBottle
  name: uplink-nocturine-chemistry-bottle-name
  description: uplink-nocturine-chemistry-bottle-desc
-  productEntity: NocturineChemistryBottle
+  productEntity: ChemistryBottleNocturine
  discountCategory: usualDiscounts
  discountDownTo:
    Telecrystal: 3
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/medical.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/medical.yml
@@ -54,7 +54,7 @@
        - Ointment
        - Gauze
        - EmergencyMedipen
-        - EpinephrineChemistryBottle
+        - ChemistryBottleEpinephrine
        - PillCanisterTricordrazine
        - PillCanisterCharcoal
        - PillCanisterHyronalin
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
@@ -251,7 +251,7 @@
    - id: BlueprintSeismicCharge
    - id: WeaponCrusherGlaive
    - id: ClothingOuterHardsuitSalvage
-    - id: OmnizineChemistryBottle
+    - id: ChemistryBottleOmnizine
    - !type:GroupSelector
      children:
      - id: JetpackBlueFilled
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
@@ -16,10 +16,10 @@
  - type: Sprite
    sprite: Objects/Specific/Chemistry/bottle.rsi
    layers:
-      - state: bottle-1
-      - state: bottle-1-1
-        map: ["enum.SolutionContainerLayers.Fill"]
-        visible: false
+    - state: bottle-1
+    - state: bottle-1-1
+      map: ["enum.SolutionContainerLayers.Fill"]
+      visible: false
  - type: Appearance
  - type: SolutionContainerVisuals
    maxFillLevels: 6
@@ -105,10 +105,10 @@
  components:
  - type: Sprite
    layers:
-      - state: bottle-2
-      - state: bottle-2-1
-        map: ["enum.SolutionContainerLayers.Fill"]
-        visible: false
+    - state: bottle-2
+    - state: bottle-2-1
+      map: ["enum.SolutionContainerLayers.Fill"]
+      visible: false
  - type: SolutionContainerVisuals
    fillBaseName: bottle-2-

@@ -118,10 +118,10 @@
  components:
  - type: Sprite
    layers:
-      - state: bottle-3
-      - state: bottle-3-1
-        map: ["enum.SolutionContainerLayers.Fill"]
-        visible: false
+    - state: bottle-3
+    - state: bottle-3-1
+      map: ["enum.SolutionContainerLayers.Fill"]
+      visible: false
  - type: SolutionContainerVisuals
    fillBaseName: bottle-3-

@@ -131,10 +131,10 @@
  components:
  - type: Sprite
    layers:
-      - state: bottle-4
-      - state: bottle-4-1
-        map: ["enum.SolutionContainerLayers.Fill"]
-        visible: false
+    - state: bottle-4
+    - state: bottle-4-1
+      map: ["enum.SolutionContainerLayers.Fill"]
+      visible: false
  - type: SolutionContainerVisuals
    fillBaseName: bottle-4-

@@ -148,7 +148,7 @@
    - Bottle

 - type: entity
-  id: EpinephrineChemistryBottle
+  id: ChemistryBottleEpinephrine
  suffix: epinephrine
  parent: BaseChemistryBottleFilled
  components:
@@ -163,7 +163,7 @@
          Quantity: 30

 - type: entity
-  id: RobustHarvestChemistryBottle
+  id: ChemistryBottleRobustHarvest
  suffix: robust harvest
  parent: BaseChemistryBottleFilled
  components:
@@ -178,7 +178,7 @@
          Quantity: 30

 - type: entity
-  id: EZNutrientChemistryBottle
+  id: ChemistryBottleEZNutrient
  suffix: ez nutrient
  parent: BaseChemistryBottleFilled
  components:
@@ -193,7 +193,7 @@
          Quantity: 30

 - type: entity
-  id: Left4ZedChemistryBottle
+  id: ChemistryBottleLeft4Zed
  suffix: left-4-zed
  parent: BaseChemistryBottleFilled
  components:
@@ -208,7 +208,7 @@
          Quantity: 30

 - type: entity
-  id: UnstableMutagenChemistryBottle
+  id: ChemistryBottleUnstableMutagen
  suffix: unstable mutagen
  parent: BaseChemistryBottleFilled
  components:
@@ -223,82 +223,7 @@
          Quantity: 30

 - type: entity
-  id: PotassiumChemistryBottle
-  suffix: potassium
-  parent: BaseChemistryBottleFilled
-  components:
-  - type: Label
-    currentLabel: reagent-name-potassium
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 30
-        reagents:
-        - ReagentId: Potassium
-          Quantity: 30
-
- type: entity
-  id: NitrogenChemistryBottle
-  suffix: nitrogen
-  parent: BaseChemistryBottleFilled
-  components:
-  - type: Label
-    currentLabel: reagent-name-nitrogen
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 30
-        reagents:
-        - ReagentId: Nitrogen
-          Quantity: 30
-
- type: entity
-  id: PhosphorusChemistryBottle
-  suffix: phosphorus
-  parent: BaseChemistryBottleFilled
-  components:
-  - type: Label
-    currentLabel: reagent-name-phosphorus
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 30
-        reagents:
-        - ReagentId: Phosphorus
-          Quantity: 30
-
- type: entity
-  id: HydrogenChemistryBottle
-  suffix: hydrogen
-  parent: BaseChemistryBottleFilled
-  components:
-  - type: Label
-    currentLabel: reagent-name-hydrogen
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 30
-        reagents:
-        - ReagentId: Hydrogen
-          Quantity: 30
-
- type: entity
-  id: EthanolChemistryBottle
-  suffix: ethanol
-  parent: BaseChemistryBottleFilled
-  components:
-  - type: Label
-    currentLabel: reagent-name-ethanol
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 30
-        reagents:
-        - ReagentId: Ethanol
-          Quantity: 30
-
- type: entity
-  id: NocturineChemistryBottle
+  id: ChemistryBottleNocturine
  suffix: nocturine
  parent: BaseChemistryBottleFilled
  components:
@@ -313,7 +238,7 @@
          Quantity: 30

 - type: entity
-  id: EphedrineChemistryBottle
+  id: ChemistryBottleEphedrine
  suffix: ephedrine
  parent: BaseChemistryBottleFilled
  components:
@@ -328,7 +253,7 @@
          Quantity: 30

 - type: entity
-  id: OmnizineChemistryBottle
+  id: ChemistryBottleOmnizine
  suffix: omnizine
  parent: BaseChemistryBottleFilled
  components:
@@ -344,7 +269,7 @@

 - type: entity
  parent: BaseChemistryBottleFilled
-  id: CognizineChemistryBottle
+  id: ChemistryBottleCognizine
  suffix: cognizine
  components:
  - type: Label
@@ -358,7 +283,7 @@
          Quantity: 30

 - type: entity
-  id: PaxChemistryBottle
+  id: ChemistryBottlePax
  suffix: pax
  parent: BaseChemistryBottleFilled
  components:
@@ -369,11 +294,11 @@
      drink:
        maxVol: 30
        reagents:
-          - ReagentId: Pax
-            Quantity: 30
+        - ReagentId: Pax
+          Quantity: 30

 - type: entity
-  id: MuteToxinChemistryBottle
+  id: ChemistryBottleMuteToxin
  suffix: mute toxin
  parent: BaseChemistryBottleFilled
  components:
@@ -384,11 +309,11 @@
      drink:
        maxVol: 30
        reagents:
-          - ReagentId: MuteToxin
-            Quantity: 30
+        - ReagentId: MuteToxin
+          Quantity: 30

 - type: entity
-  id: LeadChemistryBottle
+  id: ChemistryBottleLead
  suffix: lead
  parent: BaseChemistryBottleFilled
  components:
@@ -399,11 +324,11 @@
      drink:
        maxVol: 30
        reagents:
-          - ReagentId: Lead
-            Quantity: 30
+        - ReagentId: Lead
+          Quantity: 30

 - type: entity
-  id: ToxinChemistryBottle
+  id: ChemistryBottleToxin
  suffix: toxin
  parent: BaseChemistryBottleFilled
  components:
@@ -414,5 +339,306 @@
      drink:
        maxVol: 30
        reagents:
-          - ReagentId: Toxin
-            Quantity: 30
+        - ReagentId: Toxin
+          Quantity: 30
+
+# Base reagent bottles
+- type: entity
+  id: ChemistryBottleAluminium
+  suffix: aluminium
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-aluminium
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleCarbon
+  suffix: carbon
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-carbon
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Carbon
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleChlorine
+  suffix: chlorine
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-chlorine
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Chlorine
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleCopper
+  suffix: copper
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-copper
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Copper
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleEthanol
+  suffix: ethanol
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-ethanol
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Ethanol
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleFluorine
+  suffix: fluorine
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-fluorine
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Fluorine
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleHydrogen
+  suffix: hydrogen
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-hydrogen
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Hydrogen
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleIodine
+  suffix: iodine
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-iodine
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Iodine
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleIron
+  suffix: iron
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-iron
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Iron
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleLithium
+  suffix: lithium
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-lithium
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Lithium
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleMercury
+  suffix: mercury
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-mercury
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Mercury
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleNitrogen
+  suffix: nitrogen
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-nitrogen
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Nitrogen
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleOxygen
+  suffix: oxygen
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-oxygen
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Oxygen
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottlePhosphorus
+  suffix: phosphorus
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-phosphorus
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Phosphorus
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottlePotassium
+  suffix: potassium
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-potassium
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Potassium
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleRadium
+  suffix: radium
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-radium
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Radium
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleSilicon
+  suffix: silicon
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-silicon
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Silicon
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleSodium
+  suffix: sodium
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-sodium
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Sodium
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleSugar
+  suffix: sugar
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-sugar
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Sugar
+          Quantity: 30
+
+- type: entity
+  id: ChemistryBottleSulfur
+  suffix: sulfur
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-sulfur
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Sulfur
+          Quantity: 30
--- a/Resources/Prototypes/Procedural/salvage_loot.yml
+++ b/Resources/Prototypes/Procedural/salvage_loot.yml
@@ -26,7 +26,7 @@
          cost: 2
        - proto: CloningPodMachineCircuitboard
          cost: 2
-        - proto: CognizineChemistryBottle
+        - proto: ChemistryBottleCognizine
        - proto: FoodBoxDonkpocketCarp
          prob: 0.5
        - proto: CrateSalvageEquipment
@@ -45,7 +45,7 @@
          cost: 2
        - proto: NuclearBombKeg
          cost: 5
-        - proto: OmnizineChemistryBottle
+        - proto: ChemistryBottleOmnizine
          prob: 0.5
        - proto: PortableGeneratorPacman
          cost: 2
--- a/Resources/Prototypes/Procedural/salvage_rewards.yml
+++ b/Resources/Prototypes/Procedural/salvage_rewards.yml
@@ -67,8 +67,8 @@
    # rare armor
    ClothingOuterArmorRiot: 1.0
    # rare chemicals
-    CognizineChemistryBottle: 1.0
-    OmnizineChemistryBottle: 1.0
+    ChemistryBottleCognizine: 1.0
+    ChemistryBottleOmnizine: 1.0
    # money
    SpaceCash2500: 1.0
    SpaceCash5000: 0.75
--- a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
+++ b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
@@ -368,9 +368,9 @@
    - MedkitCombatFilled
    - MedkitCombatFilled
    - CrowbarRed
-    - OmnizineChemistryBottle
-    - EpinephrineChemistryBottle
-    - EpinephrineChemistryBottle
+    - ChemistryBottleOmnizine
+    - ChemistryBottleEpinephrine
+    - ChemistryBottleEpinephrine

 - type: startingGear
  id: ERTMedicalGearEVA
@@ -392,9 +392,9 @@
    - MedkitCombatFilled
    - MedkitCombatFilled
    - CrowbarRed
-    - OmnizineChemistryBottle
-    - EpinephrineChemistryBottle
-    - EpinephrineChemistryBottle
+    - ChemistryBottleOmnizine
+    - ChemistryBottleEpinephrine
+    - ChemistryBottleEpinephrine

 # Janitor
 - type: job
--- a/Resources/ServerInfo/Guidebook/Service/Botany.xml
+++ b/Resources/ServerInfo/Guidebook/Service/Botany.xml
@@ -13,7 +13,7 @@ There are many tools that can be used to keep your crops healthy and growing. Th
 <Box>
 <GuideEntityEmbed Entity="hydroponicsTray"/>
 </Box>
-It's a hydroponics tray, it grows plants with water. First fill the tray with water, then add seeds. 
+It's a hydroponics tray, it grows plants with water. First fill the tray with water, then add seeds.
 Hydroponics tray lights indicate different things depending on color and position:
 - [color=red]Red Light, Left[/color]: Dead plant that needs re-planting. Use a spade to remove the plant.
 - [color=orange]Flashing Orange Light, Center[/color]: The environment is sub-optimal. Check what is affecting the plant by Shift Clicking on it. It is likely weeds but it could be undesirable pressure or lack of oxygen. If weeds, use a mini hoe or spray 1 time with weed spray. Be warned, however, that overuse of weed killers can lead to unhealthy plants, possibly killing them.
@@ -64,7 +64,7 @@ Plants treated with [color=cyan]unstable mutagen[/color] will experience random
 The more unstable mutagen you use, the more mutations you will get. Since many genes are vital to a plant's survival, most mutations will cause a plant to die.

 <Box>
-<GuideEntityEmbed Entity="UnstableMutagenChemistryBottle"/>
+<GuideEntityEmbed Entity="ChemistryBottleUnstableMutagen"/>
 </Box>

 ## Cross-Pollination
@@ -85,5 +85,5 @@ Some chemicals have special effects on plants.
 <GuideReagentEmbed Reagent="Necrosol"/>
 <GuideReagentEmbed Reagent="Phalanximine"/>
 <GuideReagentGroupEmbed Group="Botanical"/>
-  
+
 </Document>
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -555,3 +555,23 @@ MagazineBoxAntiMaterielBig: null
 MagazineBoxCaselessRifle10x24: null
 MagazineBoxCaselessRifleBig: null
 MagazinePistolHighCapacityRubber: null
+
+# 2025-03-18
+EpinephrineChemistryBottle: ChemistryBottleEpinephrine
+RobustHarvestChemistryBottle: ChemistryBottleRobustHarvest
+EZNutrientChemistryBottle: ChemistryBottleEZNutrient
+Left4ZedChemistryBottle: ChemistryBottleLeft4Zed
+UnstableMutagenChemistryBottle: ChemistryBottleUnstableMutagen
+PotassiumChemistryBottle: ChemistryBottlePotassium
+NocturineChemistryBottle: ChemistryBottleNocturine
+NitrogenChemistryBottle: ChemistryBottleNitrogen
+EphedrineChemistryBottle: ChemistryBottleEphedrine
+PhosphorusChemistryBottle: ChemistryBottlePhosphorus
+OmnizineChemistryBottle: ChemistryBottleOmnizine
+HydrogenChemistryBottle: ChemistryBottleHydrogen
+CognizineChemistryBottle: ChemistryBottleCognizine
+EthanolChemistryBottle: ChemistryBottleEthanol
+PaxChemistryBottle: ChemistryBottlePax
+MuteToxinChemistryBottle: ChemistryBottleMuteToxin
+LeadChemistryBottle: ChemistryBottleLead
+ToxinChemistryBottle: ChemistryBottleToxin