diff --git a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
index 116c78b417..b33426766c 100644
--- a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
+++ b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
@@ -26,27 +26,6 @@
-
-
-
-
diff --git a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
index 1a52166075..29ed124422 100644
--- a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
+++ b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
@@ -37,7 +37,7 @@ public sealed partial class GuideReagentReaction : BoxContainer, ISearchableCont
Container container = ReactantsContainer;
SetReagents(prototype.Reactants, ref container, protoMan);
Container productContainer = ProductsContainer;
- var products = new Dictionary(prototype._products); // CP14 random reactions
+ var products = new Dictionary(prototype.Products);
foreach (var (reagent, reactantProto) in prototype.Reactants)
{
if (reactantProto.Catalyst)
@@ -45,14 +45,6 @@ public sealed partial class GuideReagentReaction : BoxContainer, ISearchableCont
}
SetReagents(products, ref productContainer, protoMan, false);
- // CP14 random reagents begin
- if (prototype.Cp14RandomProducts.Count > 0)
- {
- var randomProducts = new Dictionary(prototype.Cp14RandomProducts[prototype.Cp14RandomProductIndex]);
- SetReagents(randomProducts, ref productContainer, protoMan, false);
- }
- // CP14 random reagents end
-
var mixingCategories = new List();
if (prototype.MixingCategories != null)
{
diff --git a/Content.Server/_CP14/Alchemy/EntitySystems/CP14RandomReagentReactionsSystem.cs b/Content.Server/_CP14/Alchemy/EntitySystems/CP14RandomReagentReactionsSystem.cs
deleted file mode 100644
index 46253e01fb..0000000000
--- a/Content.Server/_CP14/Alchemy/EntitySystems/CP14RandomReagentReactionsSystem.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Content.Server.GameTicking.Events;
-using Content.Shared.Chemistry.Reaction;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server._CP14.Alchemy.EntitySystems;
-
-public sealed class CP14RandomReagentReactionsSystem : EntitySystem
-{
- [Dependency] private readonly IPrototypeManager _proto = default!;
- [Dependency] private readonly IRobustRandom _random = default!;
-
- public override void Initialize()
- {
- base.Initialize();
- SubscribeLocalEvent(OnRoundStart);
- }
-
- private void OnRoundStart(RoundStartingEvent ev)
- {
- foreach (var reaction in _proto.EnumeratePrototypes())
- {
- reaction.Cp14RandomProductIndex = _random.Next(reaction.Cp14RandomProducts.Count);
- }
- }
-}
diff --git a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
index 7873ffc5ec..f73aaf55a8 100644
--- a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
@@ -51,42 +51,11 @@ namespace Content.Shared.Chemistry.Reaction
[DataField("requiredMixerCategories")]
public List>? MixingCategories;
- // CP14 random reactions begin
///
/// Reagents created when the reaction occurs.
///
[DataField("products", customTypeSerializer:typeof(PrototypeIdDictionarySerializer))]
- public Dictionary _products = new(); // CP14 random reactions
-
- public Dictionary Products
- {
- get {
- if (Cp14RandomProducts.Count == 0)
- return _products;
- // New dict because we don't want to modify original products dict
- Dictionary res = new(_products);
- foreach (var product in Cp14RandomProducts[Cp14RandomProductIndex])
- {
- if (res.ContainsKey(product.Key))
- res[product.Key] += product.Value;
- else
- res[product.Key] = product.Value;
- }
- return res;
- }
- set {
- _products = value;
- }
- }
-
- public int Cp14RandomProductIndex = 0;
-
- ///
- /// Random reagents groups, one of which will be selected at the roundstart and will be used as a reaction product.
- ///
- [DataField("cp14RandomProducts")]
- public List> Cp14RandomProducts = new();
- // CP14 random reactions end
+ public Dictionary Products = new();
///
/// Effects to be triggered when the reaction occurs.
diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/agaric.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/agaric.yml
index 829994c1b7..1a61ddadae 100644
--- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/agaric.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/agaric.yml
@@ -10,9 +10,7 @@
amount: 1
products:
CP14EssencePoison: 0.5
- cp14RandomProducts:
- - CP14EssenceWater: 0.5
- - CP14EssenceEarth: 0.5
+ CP14EssenceEarth: 0.5
# Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions.
diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/air_lily.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/air_lily.yml
index fc250938d4..4641e92c9b 100644
--- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/air_lily.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/air_lily.yml
@@ -10,9 +10,7 @@
amount: 1
products:
CP14EssenceAir: 0.5
- cp14RandomProducts:
- - CP14EssenceWater: 0.5
- - CP14EssenceLife: 0.5
+ CP14EssenceWater: 0.5
# Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions.
diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/blue_amanita.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/blue_amanita.yml
index 91e8fac9ff..74a23c373c 100644
--- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/blue_amanita.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/blue_amanita.yml
@@ -10,9 +10,7 @@
amount: 1
products:
CP14EssenceMagic: 0.5
- cp14RandomProducts:
- - CP14EssenceWater: 0.5
- - CP14EssenceLife: 0.5
+ CP14EssenceWater: 0.5
# Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions.
diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/dayflin.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/dayflin.yml
index 634a853755..a1db16afcc 100644
--- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/dayflin.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/dayflin.yml
@@ -10,9 +10,7 @@
amount: 1
products:
CP14EssenceFire: 0.5
- cp14RandomProducts:
- - CP14EssenceLife: 0.5
- - CP14EssenceMotion: 0.5
+ CP14EssenceMotion: 0.5
# Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions.
diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/ground_quartz.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/ground_quartz.yml
index 1c70c03d72..d55ccd3d2e 100644
--- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/ground_quartz.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/ground_quartz.yml
@@ -10,9 +10,7 @@
amount: 1
products:
CP14EssenceCrystal: 0.5
- cp14RandomProducts:
- - CP14EssenceOrder: 0.5
- - CP14EssenceChaos: 0.5
+ CP14EssenceOrder: 0.5
# Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions.
diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/lumishroom.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/lumishroom.yml
index 3b99336804..43b70a0406 100644
--- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/lumishroom.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/lumishroom.yml
@@ -10,41 +10,38 @@
amount: 1
products:
CP14EssenceLight: 0.5
- cp14RandomProducts:
- - CP14EssenceWater: 0.5
- - CP14EssenceEarth: 0.5
+ CP14EssenceEarth: 0.5
# Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions.
# Idea: Full randomness
-- type: reaction
- id: CP14LumiMushroomAdmixture
- minTemp: 500
- reactants:
- CP14LumiMushroom:
- amount: 1
- CP14BasicEffectEmpty:
- amount: 1
- cp14RandomProducts:
- - CP14BasicEffectHealBrute: 2
- - CP14BasicEffectDamageBrute: 2
- - CP14BasicEffectHealHeat: 2
- - CP14BasicEffectDamageHeat: 2
- - CP14BasicEffectHealCold: 2
- - CP14BasicEffectDamageCold: 2
- - CP14BasicEffectHealPoison: 2
- - CP14BasicEffectDamagePoison: 2
- - CP14BasicEffectHealAirloss: 2
- - CP14BasicEffectDamageAirloss: 2
- - CP14BasicEffectBloodRestore: 2
- - CP14BasicEffectBloodAbsorption: 2
- - CP14BasicEffectSatiateHunger: 2
- - CP14BasicEffectSatiateThirst: 2
- - CP14BasicEffectHealMana: 2
- - CP14BasicEffectDamageMana: 2
- - CP14BasicEffectSpeedUp: 2
- - CP14BasicEffectSpeedDown: 2
- - CP14BasicEffectSleep: 2
- - CP14BasicEffectUnsleep: 2
-
+#- type: reaction
+# id: CP14LumiMushroomAdmixture
+# minTemp: 500
+# reactants:
+# CP14LumiMushroom:
+# amount: 1
+# CP14BasicEffectEmpty:
+# amount: 1
+# cp14RandomProducts:
+# - CP14BasicEffectHealBrute: 2
+# - CP14BasicEffectDamageBrute: 2
+# - CP14BasicEffectHealHeat: 2
+# - CP14BasicEffectDamageHeat: 2
+# - CP14BasicEffectHealCold: 2
+# - CP14BasicEffectDamageCold: 2
+# - CP14BasicEffectHealPoison: 2
+# - CP14BasicEffectDamagePoison: 2
+# - CP14BasicEffectHealAirloss: 2
+# - CP14BasicEffectDamageAirloss: 2
+# - CP14BasicEffectBloodRestore: 2
+# - CP14BasicEffectBloodAbsorption: 2
+# - CP14BasicEffectSatiateHunger: 2
+# - CP14BasicEffectSatiateThirst: 2
+# - CP14BasicEffectHealMana: 2
+# - CP14BasicEffectDamageMana: 2
+# - CP14BasicEffectSpeedUp: 2
+# - CP14BasicEffectSpeedDown: 2
+# - CP14BasicEffectSleep: 2
+# - CP14BasicEffectUnsleep: 2
diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/wild_sage.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/wild_sage.yml
index 2f542bc0e9..3f4f632700 100644
--- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/wild_sage.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/wild_sage.yml
@@ -10,9 +10,7 @@
amount: 1
products:
CP14EssenceEarth: 0.5
- cp14RandomProducts:
- - CP14EssenceOrder: 0.5
- - CP14EssenceChaos: 0.5
+ CP14EssenceOrder: 0.5
# Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions.