Merge branch 'sh1ntra' of https://github.com/Corvax-Frontier/corvax-f…

…rontier-14 into sh1ntra

Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs

@@ -23,6 +23,8 @@ public AdminAnnounceWindow()
             AnnounceMethod.SetItemMetadata(0, AdminAnnounceType.Station);
             AnnounceMethod.AddItem(_localization.GetString("admin-announce-type-server"));
             AnnounceMethod.SetItemMetadata(1, AdminAnnounceType.Server);
+            AnnounceMethod.AddItem(_localization.GetString("admin-announce-type-antag"));  // Frontier
+            AnnounceMethod.SetItemMetadata(2, AdminAnnounceType.Antag);  // Frontier
             AnnounceMethod.OnItemSelected += AnnounceMethodOnOnItemSelected;
             Announcement.OnKeyBindUp += AnnouncementOnOnTextChanged;
         }
@@ -35,7 +37,8 @@ private void AnnouncementOnOnTextChanged(GUIBoundKeyEventArgs args)
         private void AnnounceMethodOnOnItemSelected(OptionButton.ItemSelectedEventArgs args)
         {
             AnnounceMethod.SelectId(args.Id);
-            Announcer.Editable = ((AdminAnnounceType?)args.Button.SelectedMetadata ?? AdminAnnounceType.Station) == AdminAnnounceType.Station;
+            Announcer.Editable = ((AdminAnnounceType?)args.Button.SelectedMetadata ?? AdminAnnounceType.Station) == AdminAnnounceType.Station
+            || ((AdminAnnounceType?)args.Button.SelectedMetadata ?? AdminAnnounceType.Antag) == AdminAnnounceType.Antag; // Frontier
         }
     }
 }

Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs

@@ -1,6 +1,6 @@
 using Content.Client.Salvage;
 using Content.Client.Station;
-using Content.Server.Worldgen.Components.Debris;
+using Content.Server._NF.Worldgen.Components.Debris;
 using Content.Shared.Shipyard.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;

Content.Client/Corvax/Respawn/RespawnSystem.cs

@@ -0,0 +1,22 @@
+using Content.Shared.Corvax.Respawn;
+
+namespace Content.Server.Corvax.Respawn;
+
+public sealed class RespawnSystem : EntitySystem
+{
+    public TimeSpan? RespawnResetTime { get; private set; }
+
+    public event Action? RespawnReseted;
+
+    public override void Initialize()
+    {
+        SubscribeNetworkEvent<RespawnResetEvent>(OnRespawnReset);
+    }
+
+    private void OnRespawnReset(RespawnResetEvent e)
+    {
+        RespawnResetTime = e.Time;
+
+        RespawnReseted?.Invoke();
+    }
+}

Content.Client/Ghost/GhostSystem.cs

@@ -11,6 +11,7 @@
 using Robust.Shared.GameStates;
 using Robust.Shared.Timing;
 using Robust.Shared.Player;
+using Content.Server.Corvax.Respawn;
 
 namespace Content.Client.Ghost
 {
@@ -23,14 +24,15 @@ public sealed class GhostSystem : SharedGhostSystem
         [Dependency] private readonly EyeSystem _eye = default!;
         [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly RespawnSystem _respawn = default!;
 
         public override void Update(float frameTime)
         {
             foreach (var ghost in EntityManager.EntityQuery<GhostComponent, MindComponent>(true))
             {
                 var ui = _uiManager.GetActiveUIWidgetOrNull<GhostGui>();
                 if (ui != null && Player != null)
-                    ui.UpdateRespawn(ghost.Item2.TimeOfDeath);
+                    ui.UpdateRespawn(_respawn.RespawnResetTime);
             }
         }
 

Content.Client/PDA/PdaMenu.xaml

@@ -44,6 +44,9 @@
             <ContainerButton Name="StationTimeButton">
                 <RichTextLabel Name="StationTimeLabel" Access="Public"/>
             </ContainerButton>
+            <ContainerButton Name="ShuttleLeftTimeButton">
+                <RichTextLabel Name="ShuttleLeftTimeLabel" Access="Public"/>
+            </ContainerButton>
             <ContainerButton Name="StationAlertLevelInstructionsButton">
                 <RichTextLabel Name="StationAlertLevelInstructions" Access="Public"/>
             </ContainerButton>

Content.Client/PDA/PdaMenu.xaml.cs

@@ -25,12 +25,14 @@ public sealed partial class PdaMenu : PdaWindow
         public const int SettingsView = 2;
         public const int ProgramContentView = 3;
 
+        private TimeSpan shuttleEvacTimeSpan;
 
         private string _pdaOwner = Loc.GetString("comp-pda-ui-unknown");
         private string _owner = Loc.GetString("comp-pda-ui-unknown");
         private string _jobTitle = Loc.GetString("comp-pda-ui-unassigned");
         private string _stationName = Loc.GetString("comp-pda-ui-unknown");
         private string _alertLevel = Loc.GetString("comp-pda-ui-unknown");
+        private string _timeLeftShuttle = Loc.GetString("comp-pda-ui-unknown");
         private string _instructions = Loc.GetString("comp-pda-ui-unknown");
         private string _balance = Loc.GetString("comp-pda-ui-unknown");
 
@@ -116,6 +118,11 @@ public PdaMenu()
                 _clipboard.SetText(_alertLevel);
             };
 
+            ShuttleLeftTimeButton.OnPressed += _ =>
+            {
+                _clipboard.SetText(_timeLeftShuttle);
+            };
+
             BalanceButton.OnPressed += _ =>
             {
                 _clipboard.SetText(_balance);
@@ -165,14 +172,25 @@ public void UpdateState(PdaUpdateState state)
             StationNameLabel.SetMarkup(Loc.GetString("comp-pda-ui-station",
                 ("station", _stationName)));
 
-            _balance = Loc.GetString("comp-pda-ui-balance", ("balance", state.Balance));
-            BalanceLabel.SetMarkup(_balance);
+            if (state.Balance is not null)
+            {
+                _balance = Loc.GetString("comp-pda-ui-balance", ("balance", state.Balance.Value));
+                BalanceLabel.SetMarkup(_balance);
+            }
 
             var stationTime = _gameTiming.CurTime.Subtract(_gameTicker.RoundStartTimeSpan);
 
             StationTimeLabel.SetMarkup(Loc.GetString("comp-pda-ui-station-time",
                 ("time", stationTime.ToString("hh\\:mm\\:ss"))));
 
+            shuttleEvacTimeSpan = state.EvacShuttleTime ?? TimeSpan.Zero;
+            var shuttleEvacTime = shuttleEvacTimeSpan - _gameTiming.CurTime;
+            if (state.EvacShuttleTime is not null)
+                _timeLeftShuttle = Loc.GetString("comp-pda-ui-left-time",
+                    ("time", shuttleEvacTime.ToString("hh\\:mm\\:ss")));
+
+            ShuttleLeftTimeLabel.SetMarkup(_timeLeftShuttle);
+
             var alertLevel = state.PdaOwnerInfo.StationAlertLevel;
             var alertColor = state.PdaOwnerInfo.StationAlertColor;
             var alertLevelKey = alertLevel != null ? $"alert-level-{alertLevel}" : "alert-level-unknown";
@@ -346,6 +364,12 @@ protected override void Draw(DrawingHandleScreen handle)
 
             StationTimeLabel.SetMarkup(Loc.GetString("comp-pda-ui-station-time",
                 ("time", stationTime.ToString("hh\\:mm\\:ss"))));
+
+            var shuttleEvacTime = shuttleEvacTimeSpan - _gameTiming.CurTime;
+            _timeLeftShuttle = Loc.GetString("comp-pda-ui-left-time",
+                ("time", shuttleEvacTime.TotalSeconds <= 0 ? Loc.GetString("comp-pda-ui-unknown") : shuttleEvacTime.ToString("hh\\:mm\\:ss")));
+
+            ShuttleLeftTimeLabel.SetMarkup(_timeLeftShuttle);
         }
     }
 }

Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs

@@ -12,17 +12,19 @@
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.Timing;
+using Content.Server.Corvax.Respawn;
 
 namespace Content.Client.UserInterface.Systems.Ghost;
 
 // TODO hud refactor BEFORE MERGE fix ghost gui being too far up
-public sealed class GhostUIController : UIController, IOnSystemChanged<GhostSystem>
+public sealed class GhostUIController : UIController, IOnSystemChanged<GhostSystem>, IOnSystemChanged<RespawnSystem>
 {
     [Dependency] private readonly IEntityNetworkManager _net = default!;
     [Dependency] private readonly IConsoleHost _consoleHost = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
 
     [UISystemDependency] private readonly GhostSystem? _system = default;
+    [UISystemDependency] private readonly RespawnSystem? _respawn = default;
 
     private GhostGui? Gui => UIManager.GetActiveUIWidgetOrNull<GhostGui>();
     private bool _canUncryo = true; // Frontier. TODO: find a reliable way to update this, for now it just stays active all the time
@@ -66,6 +68,21 @@ public void OnSystemUnloaded(GhostSystem system)
         system.GhostRoleCountUpdated -= OnRoleCountUpdated;
     }
 
+    public void OnSystemLoaded(RespawnSystem system)
+    {
+        system.RespawnReseted += OnRespawnReseted;
+    }
+
+    public void OnSystemUnloaded(RespawnSystem system)
+    {
+        system.RespawnReseted -= OnRespawnReseted;
+    }
+
+    private void OnRespawnReseted()
+    {
+        UpdateGui();
+    }
+
     public void UpdateGui()
     {
         if (Gui == null)
@@ -75,7 +92,7 @@ public void UpdateGui()
 
         Gui.Visible = _system?.IsGhost ?? false;
         Gui.Update(_system?.AvailableGhostRoleCount, _system?.Player?.CanReturnToBody,
-            _system?.Player?.TimeOfDeath,
+            _respawn?.RespawnResetTime,
             _cfg.GetCVar(NF14CVars.RespawnTime),
             _canUncryo && _cfg.GetCVar(NF14CVars.CryoReturnEnabled));
     }
@@ -103,7 +120,7 @@ private void OnPlayerAttached(GhostComponent component)
             return;
 
         Gui.Visible = true;
-        UpdateRespawn(component.TimeOfDeath);
+        UpdateRespawn(_respawn?.RespawnResetTime);
         UpdateGui();
     }
 

Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs

@@ -55,11 +55,8 @@ public void Hide()
 
     public void UpdateRespawn(TimeSpan? todd)
     {
-        if (todd != null)
-        {
-            _timeOfDeath = todd;
-            _minTimeToRespawn = _configurationManager.GetCVar(NF14CVars.RespawnTime);
-        }
+        _timeOfDeath = todd;
+        _minTimeToRespawn = _configurationManager.GetCVar(NF14CVars.RespawnTime);
     }
 
     public void Update(int? roles, bool? canReturnToBody, TimeSpan? timeOfDeath, float minTimeToRespawn, bool canUncryo)
@@ -90,8 +87,8 @@ protected override void FrameUpdate(FrameEventArgs args)
     {
         if (_timeOfDeath is null)
         {
-            GhostRespawnButton.Text = Loc.GetString("ghost-gui-respawn-button-denied", ("time", "disabled"));
-            GhostRespawnButton.Disabled = true;
+            GhostRespawnButton.Text = Loc.GetString("ghost-gui-respawn-button-allowed");
+            GhostRespawnButton.Disabled = false;
             return;
         }
 

Content.Client/Weapons/Melee/MeleeWeaponSystem.cs

@@ -8,6 +8,7 @@
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Wieldable.Components;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
@@ -95,10 +96,29 @@ public override void Update(float frameTime)
         // it's kinda tricky.
         // I think as long as we make secondaries their own component it's probably fine
         // as long as guncomp has an alt-use key then it shouldn't be too much of a PITA to deal with.
-        if (TryComp<GunComponent>(weaponUid, out var gun) && gun.UseKey)
+
+        //Frontier: better support melee vs. ranged checks
+        /*if (TryComp<GunComponent>(weaponUid, out var gun) && gun.UseKey)
         {
             return;
+        }*/
+
+        // Ranged component has priority over melee if both are supported.
+        bool gunBoundToUse = false;
+        bool gunBoundToAlt = false;
+        if (TryComp<GunComponent>(weaponUid, out var gun)) {
+            gunBoundToUse = gun.UseKey;
+            gunBoundToAlt = !gun.UseKey; //Bound to alt-use when false
+
+            // If ranged mode only works when wielded, do not block melee attacks when unwielded
+            // (e.g. crusher & crusher glaive)
+            if (TryComp<GunRequiresWieldComponent>(weaponUid, out var _) &&
+                    TryComp<WieldableComponent>(weaponUid, out var wield)) {
+                gunBoundToUse &= wield.Wielded;
+                gunBoundToAlt &= wield.Wielded;
+            }
         }
+        //End Frontier
 
         var mousePos = _eyeManager.PixelToMap(_inputManager.MouseScreenPosition);
 
@@ -119,7 +139,7 @@ public override void Update(float frameTime)
         }
 
         // Heavy attack.
-        if (altDown == BoundKeyState.Down)
+        if (altDown == BoundKeyState.Down && !gunBoundToAlt) //Frontier: add !gunBoundToAlt condition
         {
             // If it's an unarmed attack then do a disarm
             if (weapon.AltDisarm && weaponUid == entity)
@@ -140,7 +160,7 @@ public override void Update(float frameTime)
         }
 
         // Light attack
-        if (useDown == BoundKeyState.Down)
+        if (useDown == BoundKeyState.Down && !gunBoundToUse) //Frontier: add !gunBoundToUse condition
         {
             var attackerPos = Transform(entity).MapPosition;
 

Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs

@@ -73,7 +73,7 @@ await server.WaitPost(() =>
         await server.WaitAssertion(() =>
         {
             var grid = entityManager.GetComponent<MapGridComponent>(gridId);
-            var solution = new Solution("Blood", FixedPoint2.New(100));
+            var solution = new Solution("Wine", FixedPoint2.New(100)); // Frontier - Blood to wine so test pass
             var tileRef = grid.GetTileRef(puddleOrigin);
 #pragma warning disable NUnit2045 // Interdependent tests
             Assert.That(puddleSystem.TrySpillAt(tileRef, solution, out _), Is.True);

Content.Server/Administration/UI/AdminAnnounceEui.cs

@@ -5,6 +5,7 @@
 using Content.Server.EUI;
 using Content.Shared.Administration;
 using Content.Shared.Eui;
+using Robust.Shared.Audio; // Frontier
 
 namespace Content.Server.Administration.UI
 {
@@ -52,6 +53,9 @@ public override void HandleMessage(EuiMessageBase msg)
                         case AdminAnnounceType.Station:
                             _chatSystem.DispatchGlobalAnnouncement(doAnnounce.Announcement, doAnnounce.Announcer, colorOverride: Color.Gold);
                             break;
+                        case AdminAnnounceType.Antag: // Frontier
+                            _chatSystem.DispatchGlobalAnnouncement(doAnnounce.Announcement, doAnnounce.Announcer, true, new SoundPathSpecifier("/Audio/Announcements/war.ogg"), colorOverride: Color.Red);
+                            break;
                     }
 
                     StateDirty();

Content.Server/Cargo/Systems/CargoSystem.Orders.cs

@@ -196,7 +196,7 @@ private void OnApproveOrderMessage(EntityUid uid, CargoOrderConsoleComponent com
                 ("approverName", approverName),
                 ("approverJob", approverJob),
                 ("cost", cost));
-            _radio.SendRadioMessage(uid, message, component.AnnouncementChannel, uid, escapeMarkup: false);
+            //_radio.SendRadioMessage(uid, message, component.AnnouncementChannel, uid, escapeMarkup: false); # Frontier
             ConsolePopup(args.Actor, Loc.GetString("cargo-console-trade-station", ("destination", MetaData(uid).EntityName)));
 
             // Log order approval

Content.Server/Corvax/Language/Components/LanguageUnderstandComponent.cs

@@ -1,4 +1,4 @@
 namespace Content.Server.Corvax.Language.Components;
 
 [RegisterComponent]
-public sealed partial class LanguageUnderstandComponent : Component { }
+public sealed partial class LanguageUnderstandComponent : Component;

Content.Server/Corvax/Respawn/RespawnResetComponent.cs

@@ -0,0 +1,4 @@
+namespace Content.Server.Corvax.Respawn;
+
+[RegisterComponent]
+public sealed partial class RespawnResetComponent : Component;