Merge branch 'Corvax-Frontier:master' into MedicalPodRebalance

Content.Client/DeltaV/RoundEnd/NoEorgPopup.xaml

@@ -0,0 +1,28 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                      Title="{Loc 'no-eorg-popup-title'}"
+                      MinSize="520 423"
+                      MaxSize="520 423"> <!-- Frontier: height: 450<423 -->
+    <BoxContainer Orientation="Vertical" Margin="15"> <!-- Frontier: margin: 20<15 -->
+        <Label Name="TitleLabel"
+               StyleClasses="LabelBig"
+               HorizontalAlignment="Center"
+               Margin="0 5 0 5" />
+        <PanelContainer StyleClasses="BackgroundDark" Margin="0"> <!-- Frontier: no margin -->
+            <BoxContainer Orientation="Vertical" Margin="10">
+                <RichTextLabel Name="MessageLabel" HorizontalAlignment="Center" Margin="0 5 0 10"/> <!-- Frontier: added margins, removed blank Control -->
+                <RichTextLabel Name="RuleLabel" HorizontalAlignment="Center" Margin="0 5 0 10"/> <!-- Frontier: added margins -->
+                <RichTextLabel Name="RuleTextLabel" HorizontalAlignment="Center" Margin="0 5 0 0" /> <!-- Frontier: added margins -->
+            </BoxContainer>
+        </PanelContainer>
+        <BoxContainer Orientation="Vertical" VerticalAlignment="Bottom" Margin="0 5 0 0"> <!-- Frontier: top margin 10<5 -->
+            <CheckBox Name="SkipCheckBox"
+                      Text="{Loc 'no-eorg-popup-skip-checkbox'}"
+                      HorizontalAlignment="Center"
+                      Margin="0 0 0 15" /> <!-- Frontier: bottom margin 10<15 -->
+            <Button Name="NoEorgCloseButton"
+                    HorizontalAlignment="Center"
+                    MinWidth="150" />
+        </BoxContainer>
+    </BoxContainer>
+</controls:FancyWindow>

Content.Client/DeltaV/RoundEnd/NoEorgPopup.xaml.cs

@@ -0,0 +1,91 @@
+using Content.Client.UserInterface.Controls;
+using Content.Shared.DeltaV.CCVars;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Configuration;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
+
+namespace Content.Client.DeltaV.RoundEnd;
+
+[GenerateTypedNameReferences]
+public sealed partial class NoEorgPopup : FancyWindow
+{
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+    private float _remainingTime;
+    private bool _initialSkipState;
+
+    public NoEorgPopup()
+    {
+        IoCManager.InjectDependencies(this);
+        RobustXamlLoader.Load(this);
+
+        InitializeUI();
+        InitializeEvents();
+        ResetTimer();
+    }
+
+    private void InitializeUI()
+    {
+        TitleLabel.Text = Loc.GetString("no-eorg-popup-label");
+        MessageLabel.SetMessage(FormattedMessage.FromMarkupOrThrow(Loc.GetString("no-eorg-popup-message")));
+        RuleLabel.SetMessage(FormattedMessage.FromMarkupOrThrow(Loc.GetString("no-eorg-popup-rule")));
+        RuleTextLabel.SetMessage(FormattedMessage.FromMarkupOrThrow(Loc.GetString("no-eorg-popup-rule-text")));
+
+        _initialSkipState =
+            _cfg.GetCVar(DCCVars.SkipRoundEndNoEorgPopup); // Store the initial CVar value to compare against
+        SkipCheckBox.Pressed = _initialSkipState;
+        NoEorgCloseButton.Disabled = true;
+
+        UpdateCloseButtonText();
+    }
+
+    private void InitializeEvents()
+    {
+        OnClose += SaveSkipState; // Only change the CVar once the close button is pressed
+        NoEorgCloseButton.OnPressed += OnClosePressed;
+    }
+
+    private void ResetTimer()
+    {
+        _remainingTime = _cfg.GetCVar(DCCVars.RoundEndNoEorgPopupTime); // Set how long to show the popup for
+        UpdateCloseButtonText();
+    }
+
+    private void SaveSkipState()
+    {
+        if (SkipCheckBox.Pressed == _initialSkipState)
+            return;
+
+        _cfg.SetCVar(DCCVars.SkipRoundEndNoEorgPopup, SkipCheckBox.Pressed);
+        _cfg.SaveToFile();
+    }
+
+    private void OnClosePressed(BaseButton.ButtonEventArgs args)
+    {
+        Close();
+    }
+
+    private void UpdateCloseButtonText()
+    {
+        var isWaiting = _remainingTime > 0f;
+        NoEorgCloseButton.Text = isWaiting
+            ? Loc.GetString("no-eorg-popup-close-button-wait", ("time", (int)MathF.Ceiling(_remainingTime)))
+            : Loc.GetString("no-eorg-popup-close-button");
+        NoEorgCloseButton.Disabled = isWaiting;
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        if (!NoEorgCloseButton.Disabled)
+            return;
+
+        _remainingTime = MathF.Max(0f, _remainingTime - args.DeltaSeconds);
+        UpdateCloseButtonText();
+    }
+}
+

Content.Client/DeltaV/RoundEnd/NoEorgPopupSystem.cs

@@ -0,0 +1,36 @@
+using Content.Shared.GameTicking;
+using Content.Shared.DeltaV.CCVars;
+using Robust.Shared.Configuration;
+
+namespace Content.Client.DeltaV.RoundEnd;
+
+public sealed class NoEorgPopupSystem : EntitySystem
+{
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+    private NoEorgPopup? _window;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeNetworkEvent<RoundEndMessageEvent>(OnRoundEnd);
+    }
+
+    private void OnRoundEnd(RoundEndMessageEvent ev)
+    {
+        if (_cfg.GetCVar(DCCVars.SkipRoundEndNoEorgPopup) || _cfg.GetCVar(DCCVars.RoundEndNoEorgPopup) == false)
+            return;
+
+        OpenNoEorgPopup();
+    }
+
+    private void OpenNoEorgPopup()
+    {
+        if (_window != null)
+            return;
+
+        _window = new NoEorgPopup();
+        _window.OpenCentered();
+        _window.OnClose += () => _window = null;
+    }
+}

Content.IntegrationTests/Tests/MachineBoardTest.cs

@@ -93,11 +93,6 @@ await server.WaitAssertion(() =>
                     continue;
                 var cId = cbc.Prototype;
 
-                // Frontier: we accept null as board prototypes, but this will fail the assertions.
-                if (cId == "Null")
-                    continue;
-                // End Frontier
-
                 Assert.Multiple(() =>
                 {
                     Assert.That(cId, Is.Not.Null, $"Computer board \"{p.ID}\" does not have a corresponding computer.");

Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs

@@ -563,6 +563,8 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
             };
             args.Verbs.Add(cluwne);
 
+            // Frontier: remove maid smite due to weird ID perms
+            /*
             Verb maiden = new()
             {
                 Text = "admin-smite-remove-gravity-name",
@@ -581,6 +583,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
                 Message = Loc.GetString("admin-smite-maid-description")
             };
             args.Verbs.Add(maiden);
+            */
         }
 
         Verb angerPointingArrows = new()

Content.Server/Administration/Systems/BwoinkSystem.cs

@@ -859,7 +859,7 @@ public async void DiscordAhelpSendMessage(BwoinkTextMessage message, EntitySessi
 
                     var nonAfkAdmins = GetNonAfkAdmins();
                     var messageParams = new AHelpMessageParams(
-                        senderSession.Name,
+                        adminNickname,
                         str,
                         !personalChannel,
                         _gameTicker.RoundDuration().ToString("hh\\:mm\\:ss"),

Content.Server/Cloning/CloningSystem.cs

@@ -95,20 +95,22 @@ private void OnComponentInit(EntityUid uid, CloningPodComponent clonePod, Compon
             _signalSystem.EnsureSinkPorts(uid, CloningPodComponent.PodPort);
         }
 
+        // Frontier: machine parts upgrades
         private void OnPartsRefreshed(EntityUid uid, CloningPodComponent component, RefreshPartsEvent args)
         {
             var materialRating = args.PartRatings[component.MachinePartMaterialUse];
             var speedRating = args.PartRatings[component.MachinePartCloningSpeed];
 
-            component.BiomassRequirementMultiplier = MathF.Pow(component.PartRatingMaterialMultiplier, materialRating - 1);
+            component.BiomassRequirementMultiplier = component.BaseBiomassRequirementMultiplier * MathF.Pow(component.PartRatingMaterialMultiplier, materialRating - 1);
             component.CloningTime = component.BaseCloningTime * MathF.Pow(component.PartRatingSpeedMultiplier, speedRating - 1);
         }
 
         private void OnUpgradeExamine(EntityUid uid, CloningPodComponent component, UpgradeExamineEvent args)
         {
             args.AddPercentageUpgrade("cloning-pod-component-upgrade-speed", component.BaseCloningTime / component.CloningTime);
-            args.AddPercentageUpgrade("cloning-pod-component-upgrade-biomass-requirement", component.BiomassRequirementMultiplier);
+            args.AddPercentageUpgrade("cloning-pod-component-upgrade-biomass-requirement", component.BiomassRequirementMultiplier / component.BaseBiomassRequirementMultiplier);
         }
+        // End Frontier
 
         internal void TransferMindToClone(EntityUid mindId, MindComponent mind)
         {

Content.Server/Construction/NodeEntities/BoardNodeEntity.cs

@@ -1,4 +1,4 @@
-using Content.Server.Construction.Components;
+using Content.Server._NF.Construction.Components; // Frontier
 using Content.Shared.Construction;
 using Content.Shared.Construction.Components;
 using JetBrains.Annotations;
@@ -15,6 +15,7 @@ namespace Content.Server.Construction.NodeEntities;
 public sealed partial class BoardNodeEntity : IGraphNodeEntity
 {
     [DataField("container")] public string Container { get; private set; } = string.Empty;
+    [DataField] public ComputerType Computer { get; private set; } = ComputerType.Default; // Frontier
 
     public string? GetId(EntityUid? uid, EntityUid? userUid, GraphNodeEntityArgs args)
     {
@@ -29,13 +30,22 @@ public sealed partial class BoardNodeEntity : IGraphNodeEntity
 
         var board = container.ContainedEntities[0];
 
-        // Frontier - adds tabletop variants
-        if (args.EntityManager.TryGetComponent(container.Owner, out ConstructionComponent? constructionComponent)
-            && constructionComponent.Graph == "ComputerTabletop"
-            && args.EntityManager.TryGetComponent(board, out ComputerTabletopBoardComponent? tabletopComputer))
+        // Frontier - alternative computer variants
+        switch (Computer)
         {
-            return tabletopComputer.Prototype;
+            case ComputerType.Tabletop:
+                if (args.EntityManager.TryGetComponent(board, out ComputerTabletopBoardComponent? tabletopComputer))
+                    return tabletopComputer.Prototype;
+                break;
+            case ComputerType.Wallmount:
+                if (args.EntityManager.TryGetComponent(board, out ComputerWallmountBoardComponent? wallmountComputer))
+                    return wallmountComputer.Prototype;
+                break;
+            case ComputerType.Default:
+            default:
+                break;
         }
+        // End Frontier
 
         // There should not be a case where both of these components exist on the same entity...
         if (args.EntityManager.TryGetComponent(board, out MachineBoardComponent? machine))
@@ -46,4 +56,13 @@ public sealed partial class BoardNodeEntity : IGraphNodeEntity
 
         return null;
     }
+
+    // Frontier: support for multiple computer types
+    public enum ComputerType : byte
+    {
+        Default, // Default machines
+        Tabletop,
+        Wallmount
+    }
+    // End Frontier
 }

Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs

@@ -0,0 +1,61 @@
+using Content.Server.Explosion.Components;
+using Content.Server.GameTicking;
+using Content.Shared.CombatMode;
+using Content.Shared.CombatMode.Pacification;
+using Content.Shared.DeltaV.CCVars;
+using Content.Shared.Explosion.Components;
+using Content.Shared.Flash.Components;
+using Content.Shared.Store.Components;
+using Robust.Shared.Configuration;
+
+namespace Content.Server.DeltaV.RoundEnd;
+
+public sealed class PacifiedRoundEnd : EntitySystem
+{
+    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+
+    private bool _enabled;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        _configurationManager.OnValueChanged(DCCVars.RoundEndPacifist, v => _enabled = v, true);
+        SubscribeLocalEvent<RoundEndTextAppendEvent>(OnRoundEnded);
+    }
+
+    private void OnRoundEnded(RoundEndTextAppendEvent ev)
+    {
+        if (!_enabled)
+            return;
+
+        var harmQuery = EntityQueryEnumerator<CombatModeComponent>();
+        while (harmQuery.MoveNext(out var uid, out _))
+        {
+            EnsureComp<PacifiedComponent>(uid);
+        }
+
+        var explosiveQuery = EntityQueryEnumerator<ExplosiveComponent>();
+        while (explosiveQuery.MoveNext(out var uid, out _))
+        {
+            RemComp<ExplosiveComponent>(uid);
+        }
+
+        var grenadeQuery = EntityQueryEnumerator<OnUseTimerTriggerComponent>();
+        while (grenadeQuery.MoveNext(out var uid, out _))
+        {
+            RemComp<OnUseTimerTriggerComponent>(uid);
+        }
+
+        var flashQuery = EntityQueryEnumerator<FlashComponent>();
+        while (flashQuery.MoveNext(out var uid, out _))
+        {
+            RemComp<FlashComponent>(uid);
+        }
+
+        var uplinkQuery = EntityQueryEnumerator<StoreComponent>();
+        while (uplinkQuery.MoveNext(out var uid, out _))
+        {
+            RemComp<StoreComponent>(uid);
+        }
+    }
+}

Content.Server/EntityEffects/Effects/PlantMutateGases.cs

@@ -25,12 +25,28 @@ public override void Effect(EntityEffectBaseArgs args)
         if (plantholder.Seed == null)
             return;
 
+        // Frontier: List of gasses
+        Gas[] gasList =
+        {
+          Gas.Oxygen,
+          Gas.Nitrogen,
+          Gas.CarbonDioxide,
+          Gas.NitrousOxide,
+          Gas.Ammonia,
+          Gas.Plasma,
+          Gas.WaterVapor,
+          //Gas.Tritium,
+          //Gas.Frezon,
+        };
+        // End Frontier: List of gasses
+
         var random = IoCManager.Resolve<IRobustRandom>();
         var gasses = plantholder.Seed.ExudeGasses;
 
         // Add a random amount of a random gas to this gas dictionary
         float amount = random.NextFloat(MinValue, MaxValue);
-        Gas gas = random.Pick(Enum.GetValues(typeof(Gas)).Cast<Gas>().ToList());
+        //Gas gas = random.Pick(Enum.GetValues(typeof(Gas)).Cast<Gas>().ToList()); // Frontier
+        Gas gas = random.Pick(gasList); // Frontier
         if (gasses.ContainsKey(gas))
         {
             gasses[gas] += amount;
@@ -65,7 +81,7 @@ public override void Effect(EntityEffectBaseArgs args)
             return;
 
         // Frontier: List of gasses
-        Gas[] GassesList =
+        Gas[] gasList =
         {
           Gas.Oxygen,
           Gas.Nitrogen,
@@ -77,15 +93,15 @@ public override void Effect(EntityEffectBaseArgs args)
           //Gas.Tritium,
           //Gas.Frezon,
         };
-        // Frontier: List of gasses
+        // End Frontier: List of gasses
 
         var random = IoCManager.Resolve<IRobustRandom>();
         var gasses = plantholder.Seed.ConsumeGasses;
 
         // Add a random amount of a random gas to this gas dictionary
         float amount = random.NextFloat(MinValue, MaxValue);
         //Gas gas = random.Pick(Enum.GetValues(typeof(Gas)).Cast<Gas>().ToList()); // Frontier
-        Gas gas = random.Pick(GassesList); // Frontier
+        Gas gas = random.Pick(gasList); // Frontier
         if (gasses.ContainsKey(gas))
         {
             gasses[gas] += amount;