From 222aaa9b59262693e0a5faed2a1eee8ed74ccf62 Mon Sep 17 00:00:00 2001 From: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Date: Tue, 28 Oct 2025 11:31:53 -0700 Subject: [PATCH 1/2] [HOTFIX] Fix status effect removal from entity effects and buckets not being draggable (#41168) just do less work it's that easy! Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> --- .../Fluids/EntitySystems/SolutionDumpingSystem.cs | 11 +---------- .../StatusEffectNew/StatusEffectSystem.API.cs | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Content.Shared/Fluids/EntitySystems/SolutionDumpingSystem.cs b/Content.Shared/Fluids/EntitySystems/SolutionDumpingSystem.cs index b2bbcb2942..a6f4a8b31f 100644 --- a/Content.Shared/Fluids/EntitySystems/SolutionDumpingSystem.cs +++ b/Content.Shared/Fluids/EntitySystems/SolutionDumpingSystem.cs @@ -4,7 +4,6 @@ using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.EntitySystems; using Content.Shared.DragDrop; using Content.Shared.FixedPoint; -using Content.Shared.Item; using Content.Shared.Nutrition.EntitySystems; using Content.Shared.Popups; using Robust.Shared.Audio.Systems; @@ -20,7 +19,6 @@ namespace Content.Shared.Fluids.EntitySystems; /// /// /// -/// public sealed class SolutionDumpingSystem : EntitySystem { [Dependency] private readonly IPrototypeManager _protoMan = default!; @@ -30,8 +28,6 @@ public sealed class SolutionDumpingSystem : EntitySystem [Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly SharedSolutionContainerSystem _solContainer = default!; - private EntityQuery _itemQuery; - private EntityQuery _refillableQuery; private EntityQuery _dumpQuery; public override void Initialize() @@ -40,22 +36,17 @@ public sealed class SolutionDumpingSystem : EntitySystem SubscribeLocalEvent(OnDrainableCanDrag); SubscribeLocalEvent(OnDrainableCanDragDropped); - - //SubscribeLocalEvent(OnRefillableDragged); For if you want to refill a container by dragging it into another one. Can't find a use for that currently. SubscribeLocalEvent(OnDrainableDragged); SubscribeLocalEvent(OnDrainedToDumpableDragged); // We use queries for these since CanDropDraggedEvent gets called pretty rapidly - _itemQuery = GetEntityQuery(); - _refillableQuery = GetEntityQuery(); _dumpQuery = GetEntityQuery(); } private void OnDrainableCanDrag(Entity ent, ref CanDragEvent args) { - if (_itemQuery.HasComp(ent)) - args.Handled = true; + args.Handled = true; } private void OnDrainableCanDragDropped(Entity ent, ref CanDropDraggedEvent args) diff --git a/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs b/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs index 0d153ecfaa..ab6362746c 100644 --- a/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs +++ b/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs @@ -306,7 +306,7 @@ public sealed partial class StatusEffectsSystem /// True if duration was edited successfully, false otherwise. public bool TryRemoveTime(EntityUid uid, EntProtoId effectProto, TimeSpan? time) { - return time == null ? TryRemoveStatusEffect(uid, effectProto) : TryAddTime(uid, effectProto, time.Value); + return time == null ? TryRemoveStatusEffect(uid, effectProto) : TryAddTime(uid, effectProto, - time.Value); } /// From 5c09eed0806a74dc28075422ea304276097309b5 Mon Sep 17 00:00:00 2001 From: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Date: Tue, 28 Oct 2025 11:33:46 -0700 Subject: [PATCH 2/2] [Hotfix] Fix Phalanx (#41170) feex Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> --- Content.Server/Botany/Systems/PlantHolderSystem.cs | 7 ++++--- Resources/Prototypes/Reagents/medicine.yml | 5 +---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs index 2554f95455..1e992f9cd2 100644 --- a/Content.Server/Botany/Systems/PlantHolderSystem.cs +++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs @@ -886,12 +886,13 @@ public sealed class PlantHolderSystem : EntitySystem if (solution.Volume > 0 && component.MutationLevel < 25) { - var amt = FixedPoint2.New(1); - foreach (var entry in _solutionContainerSystem.RemoveEachReagent(component.SoilSolution.Value, amt)) + foreach (var entry in component.SoilSolution.Value.Comp.Solution.Contents) { var reagentProto = _prototype.Index(entry.Reagent.Prototype); - _entityEffects.ApplyEffects(uid, reagentProto.PlantMetabolisms.ToArray()); + _entityEffects.ApplyEffects(uid, reagentProto.PlantMetabolisms.ToArray(), entry.Quantity.Float()); } + + _solutionContainerSystem.RemoveEachReagent(component.SoilSolution.Value, FixedPoint2.New(1)); } CheckLevelSanity(uid, component); diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 998f508b61..17c4dfcd5c 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -589,10 +589,7 @@ - !type:PlantAdjustToxins amount: 6 - !type:PlantPhalanximine - conditions: - - !type:ReagentCondition - reagent: Phalanximine - min: 4 + minScale: 4 metabolisms: Medicine: metabolismRate: 0.1