[Tweak] The Great Medbay Reformation

Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs

@@ -166,6 +166,15 @@ private List<ReagentButton> CreateReagentTransferButtons(ReagentId reagent, bool
             return buttons;
         }
 
+        // Arcane-Start: You can see max volume
+        private static string FormatVolume(FixedPoint2 current, FixedPoint2? max)
+        {
+            return max is { } m && m > FixedPoint2.Zero
+                ? $"{current}/{m}u"
+                : $"{current}u";
+        }
+        // Arcane-End
+
         /// <summary>
         /// Update the UI state when new state data is received from the server.
         /// </summary>
@@ -180,7 +189,7 @@ public void UpdateState(BoundUserInterfaceState state)
             // Ensure the Panel Info is updated, including UI elements for Buffer Volume, Output Container and so on
             UpdatePanelInfo(castState);
 
-            BufferCurrentVolume.Text = $" {castState.BufferCurrentVolume?.Int() ?? 0}u";
+            BufferCurrentVolume.Text = FormatVolume(castState.BufferCurrentVolume ?? 0, castState.BufferMaxVolume); // Arcane-Edit
 
             InputEjectButton.Disabled = castState.InputContainerInfo is null;
             OutputEjectButton.Disabled = castState.OutputContainerInfo is null;
@@ -279,9 +288,14 @@ private void UpdatePanelInfo(ChemMasterBoundUserInterfaceState state)
 
             var bufferLabel = new Label { Text = $"{Loc.GetString("chem-master-window-buffer-label")} " };
             bufferHBox.AddChild(bufferLabel);
+            // Arcane-Start
+            var bufVolText = state.BufferMaxVolume is { } maxVol && maxVol > FixedPoint2.Zero
+                ? $"{state.BufferCurrentVolume}/{maxVol}u"
+                : $"{state.BufferCurrentVolume}u";
+            // Arcane-End
             var bufferVol = new Label
             {
-                Text = $"{state.BufferCurrentVolume}u",
+                Text = bufVolText, // Arcane-Edit
                 StyleClasses = { StyleNano.StyleClassLabelSecondaryColor }
             };
             bufferHBox.AddChild(bufferVol);

Content.Goobstation.Server/Chemistry/EntitySystems/EnergyReagentDispenserSystem.cs

@@ -56,6 +56,7 @@
 using Content.Shared._Orion.Construction.Events;
 using Content.Shared.Emag.Systems;
 using Content.Shared.Power.Components;
+using Content.Shared.Power.EntitySystems;
 
 namespace Content.Goobstation.Server.Chemistry.EntitySystems
 {
@@ -72,6 +73,7 @@ public sealed class EnergyReagentDispenserSystem : EntitySystem
         [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly BatterySystem _battery = default!;
+        [Dependency] private readonly SharedPowerReceiverSystem _powerReceiver = default!; // Arcane
 
         public override void Initialize()
         {
@@ -225,7 +227,7 @@ private void OnClearContainerSolutionMessage(Entity<EnergyReagentDispenserCompon
                 || !_solutionContainerSystem.TryGetFitsInDispenser(outputContainer, out var solution, out var soln))
                 return;
 
-            var refundedPower = soln.Sum(reagent => GetPowerCostForReagent(reagent.Reagent.Prototype, (int) reagent.Quantity, reagentDispenser.Comp)) // Orion-Edit
+            var refundedPower = soln.Sum(reagent => GetRefundCostForReagent(reagent.Reagent.Prototype, (int) reagent.Quantity, reagentDispenser.Comp)) // Orion-Edit // Arcane-Edit
                                 * reagentDispenser.Comp.RefundEnergyEfficiency; // Orion
             if (refundedPower > 0)
                 _battery.AddCharge(reagentDispenser, refundedPower);
@@ -239,10 +241,22 @@ private void ClickSound(Entity<EnergyReagentDispenserComponent> reagentDispenser
             _audioSystem.PlayPvs(reagentDispenser.Comp.ClickSound, reagentDispenser, AudioParams.Default.WithVolume(-2f));
 
         private static float GetPowerCostForReagent(string reagentId, int amount, EnergyReagentDispenserComponent comp)
+        // Arcane-Start
+        {
+            return GetReagentCost(reagentId, amount, comp, unknownFallback: float.MaxValue);
+        }
+
+        private static float GetRefundCostForReagent(string reagentId, int amount, EnergyReagentDispenserComponent comp)
+        {
+            return GetReagentCost(reagentId, amount, comp, unknownFallback: 0f);
+        }
+
+        private static float GetReagentCost(string reagentId, int amount, EnergyReagentDispenserComponent comp, float unknownFallback)
+        // Arcane-End
         {
             return comp.Reagents.TryGetValue(reagentId, out var cost)
                 ? cost * amount * comp.FinalEnergyCostMultiplier // Orion-Edit
-                : float.MaxValue;
+                : unknownFallback; // Arcane-Edit
         }
 
         private void OnMapInit(Entity<EnergyReagentDispenserComponent> entity, ref MapInitEvent args)
@@ -267,7 +281,9 @@ private void OnPartsRefresh(EntityUid uid, EnergyReagentDispenserComponent compo
             var matterBinTier = args.GetPartRating(component.MatterBinPart);
 
             component.FinalRechargeRate = component.BaseRechargeRate * RefreshPartsEvent.GetPositiveTierMultiplier(capacitorTier);
-            component.FinalEnergyCostMultiplier = RefreshPartsEvent.GetLinearMultiplier(matterBinTier, 0.1f, 0.5f, 1.2f);
+            component.FinalEnergyCostMultiplier = Math.Clamp(1.1f - matterBinTier * 0.1f, 0.5f, 1.2f); // Arcane-Edit
+
+            _powerReceiver.SetBatteryRechargeRate(uid, component.FinalRechargeRate); // Arcane
 
             UpdateUiState((uid, component));
         }

Content.Goobstation.Shared/EntityEffects/OxygenateNearby.cs

@@ -35,7 +35,11 @@ public OxygenateNearby(float range, float factor)
     public override bool ShouldLog => true;
 
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-ignite", ("chance", Probability)); //In due time...
+        // Arcane-Edit-Start
+        => Loc.GetString("reagent-effect-guidebook-oxygenate",
+            ("chance", Probability),
+            ("factor", Factor));
+        // Arcane-Edit-End
 
     public override LogImpact LogImpact => LogImpact.Medium;
 

Content.Server/Atmos/Components/BarotraumaComponent.cs

@@ -65,7 +65,7 @@ public sealed partial class BarotraumaComponent : Component
 
         [DataField("maxDamage")]
         [ViewVariables(VVAccess.ReadWrite)]
-        public FixedPoint2 MaxDamage = 200;
+        public FixedPoint2 MaxDamage = 350; // Arcane-Edit: 200 > 350
 
         /// <summary>
         ///     Used to keep track of when damage starts/stops. Useful for logs.
@@ -96,6 +96,15 @@ public sealed partial class BarotraumaComponent : Component
         [ViewVariables(VVAccess.ReadWrite)]
         public bool HasImmunity = false;
 
+        // Arcane-Start
+        /// <summary>
+        ///     Tracks how long the entity has continuously been in hazardous low pressure.
+        ///     Used to ramp low-pressure damage over time.
+        /// </summary>
+        [ViewVariables(VVAccess.ReadWrite)]
+        public float SecondsInLowPressure = 0f;
+        // Arcane-End
+
         [DataField]
         public ProtoId<AlertPrototype> HighPressureAlert = "HighPressure";
 

Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs

@@ -46,6 +46,7 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Atmos.Components;
 using Content.Shared._Goobstation.Wizard.Spellblade;
+using Content.Shared._Shitmed.Damage;
 using Content.Shared._Shitmed.Targeting;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
@@ -66,6 +67,10 @@ public sealed class BarotraumaSystem : EntitySystem
         [Dependency] private readonly InventorySystem _inventorySystem = default!;
         [Dependency] private readonly SpellbladeSystem _spellblade = default!; // Goobstation
         private const float UpdateTimer = 1f;
+        // Arcane-Start
+        private const float LowPressureRampTime = 40f;
+        private const float LowPressureMaxMultiplier = 2.5f;
+        // Arcane-End
         private float _timer;
 
         public override void Initialize()
@@ -320,11 +325,28 @@ public override void Update(float frameTime)
                     RaiseLocalEvent(uid, ref resistEv);
 
                     if (resistEv.Cancelled)
-                        return;
+                    // Arcane-Edit-Start
+                    {
+                        barotrauma.SecondsInLowPressure = 0f;
+
+                        if (barotrauma.TakingDamage)
+                        {
+                            barotrauma.TakingDamage = false;
+                            _adminLogger.Add(LogType.Barotrauma, $"{ToPrettyString(uid):entity} stopped taking pressure damage");
+                        }
+
+                        _alertsSystem.ClearAlertCategory(uid, barotrauma.PressureAlertCategory);
+                        continue;
+                    }
+                    // Arcane-Edit-End
                     // goob end
 
+                    var lowPressureScale = MathF.Min(1f + (barotrauma.SecondsInLowPressure / LowPressureRampTime), LowPressureMaxMultiplier); // Arcane
+
                     // Deal damage and ignore resistances. Resistance to pressure damage should be done via pressure protection gear.
-                    _damageableSystem.TryChangeDamage(uid, barotrauma.Damage * Atmospherics.LowPressureDamage, true, false, targetPart: TargetBodyPart.All); // Shitmed Change
+                    _damageableSystem.TryChangeDamage(uid, barotrauma.Damage * Atmospherics.LowPressureDamage * lowPressureScale, true, false, targetPart: TargetBodyPart.All); // Shitmed Change // Arcane-Edit
+
+                    barotrauma.SecondsInLowPressure += UpdateTimer; // Arcane
 
                     if (!barotrauma.TakingDamage)
                     {
@@ -342,10 +364,24 @@ public override void Update(float frameTime)
                     RaiseLocalEvent(uid, ref resistEv);
 
                     if (resistEv.Cancelled)
-                        return;
+                    // Arcane-Edit-Start
+                    {
+                        barotrauma.SecondsInLowPressure = 0f;
+
+                        if (barotrauma.TakingDamage)
+                        {
+                            barotrauma.TakingDamage = false;
+                            _adminLogger.Add(LogType.Barotrauma, $"{ToPrettyString(uid):entity} stopped taking pressure damage");
+                        }
+
+                        _alertsSystem.ClearAlertCategory(uid, barotrauma.PressureAlertCategory);
+                        continue;
+                    }
+                    // Arcane-Edit-End
                     // goob end
 
                     var damageScale = MathF.Min(((pressure / Atmospherics.HazardHighPressure) - 1) * Atmospherics.PressureDamageCoefficient, Atmospherics.MaxHighPressureDamage);
+                    barotrauma.SecondsInLowPressure = 0f; // Arcane
 
                     // Deal damage and ignore resistances. Resistance to pressure damage should be done via pressure protection gear.
                     _damageableSystem.TryChangeDamage(uid, barotrauma.Damage * damageScale, true, false, targetPart: TargetBodyPart.All); // Shitmed Change
@@ -365,6 +401,8 @@ public override void Update(float frameTime)
                     RaiseLocalEvent(uid, ref pressureEv);
                     // goob end
 
+                    barotrauma.SecondsInLowPressure = 0f; // Arcane
+
                     // Within safe pressure limits
                     if (barotrauma.TakingDamage)
                     {

Content.Server/Body/Systems/RespiratorSystem.cs

@@ -137,6 +137,8 @@ public sealed class RespiratorSystem : EntitySystem
 
     private static readonly ProtoId<MetabolismGroupPrototype> GasId = new("Gas");
 
+    private const float VacuumSuffocationMultiplier = 2f; // Arcane
+
     public override void Initialize()
     {
         base.Initialize();
@@ -531,7 +533,15 @@ private void TakeSuffocationDamage(Entity<RespiratorComponent> ent)
         }
 
         // Shitmed Change End
-        _damageableSys.TryChangeDamage(ent, HasComp<DebrainedComponent>(ent) ? ent.Comp.Damage * 4.5f : ent.Comp.Damage, targetPart: TargetBodyPart.All, interruptsDoAfters: false); // Shitmed Change
+        // Arcane-Start
+        var suffocationDamage = HasComp<DebrainedComponent>(ent) ? ent.Comp.Damage * 4.5f : ent.Comp.Damage;
+
+        var pressure = _atmosSys.GetContainingMixture(ent.Owner)?.Pressure ?? 0f;
+        if (pressure <= Atmospherics.HazardLowPressure)
+            suffocationDamage *= VacuumSuffocationMultiplier;
+        // Arcane-End
+
+        _damageableSys.TryChangeDamage(ent, suffocationDamage, targetPart: TargetBodyPart.All, interruptsDoAfters: false); // Shitmed Change // Arcane-Edit
 
         if (ent.Comp.SuffocationCycles < ent.Comp.SuffocationCycleThreshold)
             return;