From f6dd89ea7a060bf528cb8be384cd902c3dcc44e8 Mon Sep 17 00:00:00 2001
From: Red <96445749+TheShuEd@users.noreply.github.com>
Date: Sun, 1 Jun 2025 21:55:20 +0300
Subject: [PATCH] d (#1351)

---
 .../_CP14/MagicEnergy/CP14MagicEnergySystem.cs        |  9 ---------
 .../Prototypes/Reagents/Consumable/Food/food.yml      |  6 +++---
 .../Entities/Objects/Specific/Alchemy/vial_bomb.yml   |  5 ++++-
 Resources/Prototypes/_CP14/Trading/brad_potions.yml   | 11 +++++++++++
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/Content.Server/_CP14/MagicEnergy/CP14MagicEnergySystem.cs b/Content.Server/_CP14/MagicEnergy/CP14MagicEnergySystem.cs
index fbc6f0381d..541ef6a77f 100644
--- a/Content.Server/_CP14/MagicEnergy/CP14MagicEnergySystem.cs
+++ b/Content.Server/_CP14/MagicEnergy/CP14MagicEnergySystem.cs
@@ -1,6 +1,4 @@
-using Content.Server.Cargo.Systems;
 using Content.Shared._CP14.MagicEnergy;
-using Content.Shared._CP14.MagicEnergy.Components;
 using Robust.Shared.Timing;
 
 namespace Content.Server._CP14.MagicEnergy;
@@ -16,13 +14,6 @@ public sealed partial class CP14MagicEnergySystem : SharedCP14MagicEnergySystem
 
         InitializeDraw();
         InitializePortRelay();
-
-        SubscribeLocalEvent<CP14MagicEnergyContainerComponent, PriceCalculationEvent>(OnMagicPrice);
-    }
-
-    private void OnMagicPrice(Entity<CP14MagicEnergyContainerComponent> ent, ref PriceCalculationEvent args)
-    {
-        args.Price += ent.Comp.Energy.Double() * 0.1;
     }
 
     public override void Update(float frameTime)
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/food.yml b/Resources/Prototypes/Reagents/Consumable/Food/food.yml
index e78b4d2c56..89f949a23f 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/food.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/food.yml
@@ -20,7 +20,7 @@
     amount: 1.5
   - !type:PlantAdjustHealth
     amount: 0.75
-  pricePerUnit: 0.2
+  pricePerUnit: 0.05
 
 - type: reagent
   id: Vitamin #Anything "healthy"
@@ -53,7 +53,7 @@
     amount: 0.5
   - !type:PlantAdjustHealth
     amount: 1.5
-  pricePerUnit: 0.25
+  pricePerUnit: 0.07
 
 - type: reagent
   id: Protein #Meat and beans
@@ -78,7 +78,7 @@
         - !type:OrganType
           type: CP14Vampire
           shouldHave: false
-  pricePerUnit: 0.3
+  pricePerUnit: 0.1
 
 - type: reagent
   id: Sugar #Candy and grains
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vial_bomb.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vial_bomb.yml
index 99b62b29e6..d1f78ad13e 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vial_bomb.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vial_bomb.yml
@@ -39,4 +39,7 @@
       - state: label
         visible: false
         map: ["enum.PaperLabelVisuals.Layer"]
-
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Glass: 10
+      CP14Gold: 10
diff --git a/Resources/Prototypes/_CP14/Trading/brad_potions.yml b/Resources/Prototypes/_CP14/Trading/brad_potions.yml
index fc20844625..d92d5aff34 100644
--- a/Resources/Prototypes/_CP14/Trading/brad_potions.yml
+++ b/Resources/Prototypes/_CP14/Trading/brad_potions.yml
@@ -200,6 +200,17 @@
   service: !type:CP14BuyItemsService
     product: CP14Cauldron
 
+- type: cp14TradingPosition
+  id: CP14BaseAlchemyBomb
+  faction: BradPotions
+  reputationLevel: 2
+  uiPosition: 7
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14BaseAlchemyBomb
+
 # Rep 3
 
 - type: cp14TradingPosition