From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Sat, 7 Sep 2024 05:51:36 +0000 (+0200)
Subject: Remake bottles and syringes names to use labels (#29956)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=9680c1d1d94f2647efa6187846f98ad9e4d15c8b;p=space-station-14.git

Remake bottles and syringes names to use labels (#29956)

* Remake bottles and syringes names to use labels

* vial

* fix and add stuff
---

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index adb0378507..f28548a8d1 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -835,10 +835,12 @@
 
 # Syringes
 - type: entity
-  name: ephedrine syringe
+  suffix: ephedrine
   parent: PrefilledSyringe
   id: SyringeEphedrine
   components:
+  - type: Label
+    currentLabel: reagent-name-ephedrine
   - type: SolutionContainerManager
     solutions:
       injector:
@@ -848,10 +850,12 @@
           Quantity: 15
 
 - type: entity
-  name: inaprovaline syringe
+  suffix: inaprovaline
   parent: PrefilledSyringe
   id: SyringeInaprovaline
   components:
+  - type: Label
+    currentLabel: reagent-name-inaprovaline
   - type: SolutionContainerManager
     solutions:
       injector:
@@ -861,10 +865,12 @@
           Quantity: 15
 
 - type: entity
-  name: tranexamic acid syringe
+  suffix: tranexamic acid
   parent: PrefilledSyringe
   id: SyringeTranexamicAcid
   components:
+  - type: Label
+    currentLabel: reagent-name-tranexamic-acid
   - type: SolutionContainerManager
     solutions:
       injector:
@@ -874,10 +880,12 @@
           Quantity: 15
 
 - type: entity
-  name: bicaridine syringe
+  suffix: bicaridine
   parent: PrefilledSyringe
   id: SyringeBicaridine
   components:
+  - type: Label
+    currentLabel: reagent-name-bicaridine
   - type: SolutionContainerManager
     solutions:
       injector:
@@ -887,10 +895,12 @@
           Quantity: 15
 
 - type: entity
-  name: dermaline syringe
+  suffix: dermaline
   parent: PrefilledSyringe
   id: SyringeDermaline
   components:
+  - type: Label
+    currentLabel: reagent-name-dermaline
   - type: SolutionContainerManager
     solutions:
       injector:
@@ -900,10 +910,12 @@
           Quantity: 15
 
 - type: entity
-  name: hyronalin syringe
+  suffix: hyronalin
   parent: PrefilledSyringe
   id: SyringeHyronalin
   components:
+  - type: Label
+    currentLabel: reagent-name-hyronalin
   - type: SolutionContainerManager
     solutions:
       injector:
@@ -913,10 +925,12 @@
           Quantity: 15
 
 - type: entity
-  name: ipecac syringe
+  suffix: ipecac
   parent: PrefilledSyringe
   id: SyringeIpecac
   components:
+  - type: Label
+    currentLabel: reagent-name-ipecac
   - type: SolutionContainerManager
     solutions:
       injector:
@@ -926,76 +940,88 @@
           Quantity: 15
 
 - type: entity
-  name: ambuzol syringe
+  suffix: ambuzol
   parent: PrefilledSyringe
   id: SyringeAmbuzol
   components:
-    - type: SolutionContainerManager
-      solutions:
-        injector:
-          maxVol: 15
-          reagents:
-            - ReagentId: Ambuzol
-              Quantity: 15
+  - type: Label
+    currentLabel: reagent-name-ambuzol
+  - type: SolutionContainerManager
+    solutions:
+      injector:
+        maxVol: 15
+        reagents:
+          - ReagentId: Ambuzol
+            Quantity: 15
 
 - type: entity
-  name: sigynate syringe
+  suffix: sigynate
   parent: PrefilledSyringe
   id: SyringeSigynate
   components:
-    - type: SolutionContainerManager
-      solutions:
-        injector:
-          maxVol: 15
-          reagents:
-            - ReagentId: Sigynate
-              Quantity: 15
+  - type: Label
+    currentLabel: reagent-name-sigynate
+  - type: SolutionContainerManager
+    solutions:
+      injector:
+        maxVol: 15
+        reagents:
+          - ReagentId: Sigynate
+            Quantity: 15
 
 - type: entity
-  name: ethylredoxrazine syringe
+  suffix: ethylredoxrazine
   parent: PrefilledSyringe
   id: SyringeEthylredoxrazine
   components:
-    - type: SolutionContainerManager
-      solutions:
-        injector:
-          maxVol: 15
-          reagents:
-            - ReagentId: Ethylredoxrazine
-              Quantity: 15
+  - type: Label
+    currentLabel: reagent-name-ethylredoxrazine
+  - type: SolutionContainerManager
+    solutions:
+      injector:
+        maxVol: 15
+        reagents:
+          - ReagentId: Ethylredoxrazine
+            Quantity: 15
 
 - type: entity
-  name: phalanximine syringe
+  suffix: phalanximine
   parent: PrefilledSyringe
   id: SyringePhalanximine
   components:
-    - type: SolutionContainerManager
-      solutions:
-        injector:
-          maxVol: 15
-          reagents:
-            - ReagentId: Phalanximine
-              Quantity: 15
+  - type: Label
+    currentLabel: reagent-name-phalanximine
+  - type: SolutionContainerManager
+    solutions:
+      injector:
+        maxVol: 15
+        reagents:
+          - ReagentId: Phalanximine
+            Quantity: 15
 
 - type: entity
-  name: saline syringe
+  suffix: saline
   parent: PrefilledSyringe
   id: SyringeSaline
   components:
-    - type: SolutionContainerManager
-      solutions:
-        injector:
-          maxVol: 15
-          reagents:
-            - ReagentId: Saline
-              Quantity: 15
+  - type: Label
+    currentLabel: reagent-name-saline
+  - type: SolutionContainerManager
+    solutions:
+      injector:
+        maxVol: 15
+        reagents:
+          - ReagentId: Saline
+            Quantity: 15
 
 #this is where all the syringes are so i didn't know where to put it
 - type: entity
-  name: romerol syringe
-  parent: [PrefilledSyringe, BaseSyndicateContraband]
+  suffix: romerol
+  parent: PrefilledSyringe
   id: SyringeRomerol
   components:
+  - type: Label
+    currentLabel: reagent-name-romerol
   - type: SolutionContainerManager
     solutions:
       injector:
@@ -1005,10 +1031,12 @@
           Quantity: 15
 
 - type: entity
-  name: hyperzine syringe
-  parent: [PrefilledSyringe, BaseSyndicateContraband]
+  suffix: hyperzine
+  parent: PrefilledSyringe
   id: SyringeStimulants
   components:
+  - type: Label
+    currentLabel: reagent-name-hyperzine
   - type: SolutionContainerManager
     solutions:
       injector:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
index d1020ff609..1bbe05944f 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
@@ -86,384 +86,360 @@
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: carbon
   id: JugCarbon
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-carbon
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: Carbon
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-carbon
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Carbon
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: iodine
   id: JugIodine
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-iodine
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: Iodine
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-iodine
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Iodine
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: fluorine
   id: JugFluorine
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-fluorine
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: Fluorine
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-fluorine
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Fluorine
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: chlorine
   id: JugChlorine
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-chlorine
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: Chlorine
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-chlorine
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Chlorine
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: aluminium
   id: JugAluminium
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-aluminium
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: Aluminium
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-aluminium
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: phosphorus
   id: JugPhosphorus
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-phosphorus
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: Phosphorus
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-phosphorus
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Phosphorus
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: sulfur
   id: JugSulfur
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-sulfur
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: Sulfur
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-sulfur
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Sulfur
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: silicon
   id: JugSilicon
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-silicon
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: Silicon
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-silicon
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Silicon
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: hydrogen
   id: JugHydrogen
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-hydrogen
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: Hydrogen
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-hydrogen
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Hydrogen
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: lithium
   id: JugLithium
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-lithium
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: Lithium
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-lithium
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Lithium
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: sodium
   id: JugSodium
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-sodium
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: Sodium
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-sodium
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Sodium
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: potassium
   id: JugPotassium
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-potassium
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: Potassium
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-potassium
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Potassium
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: radium
   id: JugRadium
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-radium
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: Radium
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-radium
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Radium
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: iron
   id: JugIron
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-iron
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: Iron
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-iron
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Iron
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: copper
   id: JugCopper
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-copper
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: Copper
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-copper
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Copper
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: gold
   id: JugGold
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-gold
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: Gold
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-gold
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Gold
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: mercury
   id: JugMercury
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-mercury
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: Mercury
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-mercury
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Mercury
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: silver
   id: JugSilver
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-silver
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: Silver
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-silver
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Silver
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: ethanol
   id: JugEthanol
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-ethanol
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: Ethanol
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-ethanol
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Ethanol
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: sugar
   id: JugSugar
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-sugar
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: Sugar
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-sugar
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Sugar
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: nitrogen
   id: JugNitrogen
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-nitrogen
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: Nitrogen
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-nitrogen
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Nitrogen
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: oxygen
   id: JugOxygen
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-oxygen
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: Oxygen
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-oxygen
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: Oxygen
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: Plant-B-Gone
   id: JugPlantBGone
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-plant-b-gone
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: PlantBGone
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-plant-b-gone
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: PlantBGone
+          Quantity: 200
 
 - type: entity
   parent: Jug
-  name: jug
   suffix: welding fuel
   id: JugWeldingFuel
   categories: [ HideSpawnMenu ]
   components:
-    - type: Label
-      currentLabel: reagent-name-welding-fuel
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-            - ReagentId: WeldingFuel
-              Quantity: 200
+  - type: Label
+    currentLabel: reagent-name-welding-fuel
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        reagents:
+        - ReagentId: WeldingFuel
+          Quantity: 200
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
index 311f7a56a9..29f6daa39e 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
@@ -149,9 +149,11 @@
 
 - type: entity
   id: EpinephrineChemistryBottle
-  name: epinephrine bottle
+  suffix: epinephrine
   parent: BaseChemistryBottleFilled
   components:
+  - type: Label
+    currentLabel: reagent-name-epinephrine
   - type: SolutionContainerManager
     solutions:
       drink: # This solution name and target volume is hard-coded in ChemMasterComponent
@@ -162,10 +164,11 @@
 
 - type: entity
   id: RobustHarvestChemistryBottle
-  name: robust harvest bottle
-  description: This will increase the potency of your plants.
+  suffix: robust harvest
   parent: BaseChemistryBottleFilled
   components:
+  - type: Label
+    currentLabel: reagent-name-robust-harvest
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -176,10 +179,11 @@
 
 - type: entity
   id: EZNutrientChemistryBottle
-  name: ez nutrient bottle
-  description: This will provide some nutrition to your plants.
+  suffix: ez nutrient
   parent: BaseChemistryBottleFilled
   components:
+  - type: Label
+    currentLabel: reagent-name-e-z-nutrient
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -190,10 +194,11 @@
 
 - type: entity
   id: Left4ZedChemistryBottle
-  name: left-4-zed bottle
-  description: This will increase the effectiveness of mutagen.
+  suffix: left-4-zed
   parent: BaseChemistryBottleFilled
   components:
+  - type: Label
+    currentLabel: reagent-name-left4-zed
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -204,10 +209,11 @@
 
 - type: entity
   id: UnstableMutagenChemistryBottle
-  name: unstable mutagen bottle
-  description: This will cause rapid mutations in your plants.
+  suffix: unstable mutagen
   parent: BaseChemistryBottleFilled
   components:
+  - type: Label
+    currentLabel: reagent-name-unstable-mutagen
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -218,9 +224,11 @@
 
 - type: entity
   id: PotassiumChemistryBottle
-  name: potassium bottle
+  suffix: potassium
   parent: BaseChemistryBottleFilled
   components:
+  - type: Label
+    currentLabel: reagent-name-potassium
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -231,9 +239,11 @@
 
 - type: entity
   id: NitrogenChemistryBottle
-  name: nitrogen bottle
+  suffix: nitrogen
   parent: BaseChemistryBottleFilled
   components:
+  - type: Label
+    currentLabel: reagent-name-nitrogen
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -244,9 +254,11 @@
 
 - type: entity
   id: PhosphorusChemistryBottle
-  name: phosphorus bottle
+  suffix: phosphorus
   parent: BaseChemistryBottleFilled
   components:
+  - type: Label
+    currentLabel: reagent-name-phosphorus
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -257,9 +269,11 @@
 
 - type: entity
   id: HydrogenChemistryBottle
-  name: hydrogen bottle
+  suffix: hydrogen
   parent: BaseChemistryBottleFilled
   components:
+  - type: Label
+    currentLabel: reagent-name-hydrogen
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -270,9 +284,11 @@
 
 - type: entity
   id: EthanolChemistryBottle
-  name: ethanol bottle
+  suffix: ethanol
   parent: BaseChemistryBottleFilled
   components:
+  - type: Label
+    currentLabel: reagent-name-ethanol
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -283,10 +299,11 @@
 
 - type: entity
   id: NocturineChemistryBottle
-  name: nocturine bottle
-  description: This will make someone fall down almost immediately. Hard to overdose on.
-  parent: [BaseChemistryBottleFilled, BaseSyndicateContraband]
+  suffix: nocturine
+  parent: BaseChemistryBottleFilled
   components:
+  - type: Label
+    currentLabel: reagent-name-nocturine
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -297,9 +314,11 @@
 
 - type: entity
   id: EphedrineChemistryBottle
-  name: ephedrine bottle
+  suffix: ephedrine
   parent: BaseChemistryBottleFilled
   components:
+  - type: Label
+    currentLabel: reagent-name-ephedrine
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -310,9 +329,11 @@
 
 - type: entity
   id: OmnizineChemistryBottle
-  name: omnizine bottle
+  suffix: omnizine
   parent: BaseChemistryBottleFilled
   components:
+  - type: Label
+    currentLabel: reagent-name-omnizine
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -324,8 +345,10 @@
 - type: entity
   parent: BaseChemistryBottleFilled
   id: CognizineChemistryBottle
-  name: cognizine bottle
+  suffix: cognizine
   components:
+  - type: Label
+    currentLabel: reagent-name-cognizine
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -336,52 +359,60 @@
 
 - type: entity
   id: PaxChemistryBottle
-  name: pax bottle
+  suffix: pax
   parent: BaseChemistryBottleFilled
   components:
-    - type: SolutionContainerManager
-      solutions:
-        drink:
-          maxVol: 30
-          reagents:
-            - ReagentId: Pax
-              Quantity: 30
+  - type: Label
+    currentLabel: reagent-name-pax
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+          - ReagentId: Pax
+            Quantity: 30
 
 - type: entity
   id: MuteToxinChemistryBottle
-  name: mute toxin bottle
+  suffix: mute toxin
   parent: BaseChemistryBottleFilled
   components:
-    - type: SolutionContainerManager
-      solutions:
-        drink:
-          maxVol: 30
-          reagents:
-            - ReagentId: MuteToxin
-              Quantity: 30
+  - type: Label
+    currentLabel: reagent-name-mute-toxin
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+          - ReagentId: MuteToxin
+            Quantity: 30
 
 - type: entity
   id: LeadChemistryBottle
-  name: lead bottle
+  suffix: lead
   parent: BaseChemistryBottleFilled
   components:
-    - type: SolutionContainerManager
-      solutions:
-        drink:
-          maxVol: 30
-          reagents:
-            - ReagentId: Lead
-              Quantity: 30
+  - type: Label
+    currentLabel: reagent-name-lead
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+          - ReagentId: Lead
+            Quantity: 30
 
 - type: entity
   id: ToxinChemistryBottle
-  name: toxin bottle
+  suffix: toxin
   parent: BaseChemistryBottleFilled
   components:
-    - type: SolutionContainerManager
-      solutions:
-        drink:
-          maxVol: 30
-          reagents:
-            - ReagentId: Toxin
-              Quantity: 30
+  - type: Label
+    currentLabel: reagent-name-toxin
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+          - ReagentId: Toxin
+            Quantity: 30
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml
index 5a8c8351ed..ec910150ee 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml
@@ -105,41 +105,47 @@
 
 - type: entity
   id: VestineChemistryVial
-  name: vestine vial
   parent: BaseChemistryEmptyVial
+  suffix: vestine
   components:
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          maxVol: 30
-          reagents:
-            - ReagentId: Vestine
-              Quantity: 30
-    - type: Tag
-      tags: []
+  - type: Label
+    currentLabel: reagent-name-vestine
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        maxVol: 30
+        reagents:
+        - ReagentId: Vestine
+          Quantity: 30
+  - type: Tag
+    tags: []
 
 - type: entity
   id: RadiumChemistryVial
-  name: radium vial
   parent: BaseChemistryEmptyVial
+  suffix: radium
   components:
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          maxVol: 5
-          reagents:
-            - ReagentId: Radium
-              Quantity: 5
+  - type: Label
+    currentLabel: reagent-name-radium
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        maxVol: 5
+        reagents:
+          - ReagentId: Radium
+            Quantity: 5
 
 - type: entity
   id: ChlorineChemistryVial
-  name: chlorine vial
   parent: BaseChemistryEmptyVial
+  suffix: chlorine
   components:
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          maxVol: 5
-          reagents:
-            - ReagentId: Chlorine
-              Quantity: 5
+  - type: Label
+    currentLabel: reagent-name-chlorine
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        maxVol: 5
+        reagents:
+          - ReagentId: Chlorine
+            Quantity: 5
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index 72f612436b..0f74b4afaf 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -176,11 +176,12 @@
     inHandsFillBaseName: -fill-
 
 - type: entity
-  name: cryoxadone beaker
-  description: Filled with a reagent used in cryogenic tubes.
+  suffix: cryoxadone
   parent: Beaker
   id: CryoxadoneBeakerSmall
   components:
+  - type: Label
+    currentLabel: reagent-name-cryoxadone
   - type: SolutionContainerManager
     solutions:
       beaker: