Up040826

.github/workflows/publish.yml

@@ -1,6 +1,7 @@
 name: Publish
 concurrency:
   group: publish
+  cancel-in-progress: true
 
 
 on:
@@ -59,12 +60,14 @@ jobs:
         GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}
 
     # - name: Publish changelog (Discord)
+    #   continue-on-error: true
     #   run: Tools/actions_changelogs_since_last_run.py
     #   env:
     #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     #     DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
 
     #- name: Publish changelog (RSS)
+    #  continue-on-error: true
     #  run: Tools/actions_changelog_rss.py
     #  env:
     #    CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}

.run/Content Server+Client.run.xml

@@ -4,4 +4,4 @@
     <toRun name="Content.Server" type="DotNetProject" />
     <method v="2" />
   </configuration>
-</component>
+</component>

Content.Client/Guidebook/Controls/GuideMicrowaveEmbed.xaml.cs

@@ -84,7 +84,7 @@ private void GenerateHeader(FoodRecipePrototype recipe)
         var entity = _prototype.Index<EntityPrototype>(recipe.Result);
 
         IconContainer.AddChild(new GuideEntityEmbed(recipe.Result, false, false));
-        ResultName.SetMarkup(entity.Name);
+        ResultName.SetMarkup(Loc.GetString("guidebook-microwave-recipe-name-display", ("amount", recipe.ResultCount), ("name", entity.Name))); // Mono
         ResultDescription.SetMarkup(entity.Description);
     }
 

Content.Client/Jittering/JitteringSystem.cs

@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Shared._CE.ZLevels.Core.Components; // Mono
 using Content.Shared.Jittering;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
@@ -30,7 +31,9 @@ private void OnStartup(EntityUid uid, JitteringComponent jittering, ComponentSta
 
             var animationPlayer = EnsureComp<AnimationPlayerComponent>(uid);
 
-            jittering.StartOffset = sprite.Offset;
+            jittering.StartOffset = TryComp(uid, out CEZPhysicsComponent? zPhys)
+                ? zPhys.SpriteOffsetDefault
+                : sprite.Offset;
             _animationPlayer.Play(uid, animationPlayer, GetAnimation(jittering, sprite), _jitterAnimationKey);
         }
 
@@ -58,6 +61,7 @@ private void OnAnimationCompleted(EntityUid uid, JitteringComponent jittering, A
 
         private Animation GetAnimation(JitteringComponent jittering, SpriteComponent sprite)
         {
+            var previousJitter = jittering.LastJitter; // Mono
             var amplitude = MathF.Min(4f, jittering.Amplitude / 100f + 1f) / 10f;
             var offset = new Vector2(_random.NextFloat(amplitude/4f, amplitude),
                 _random.NextFloat(amplitude / 4f, amplitude / 3f));
@@ -94,7 +98,7 @@ private Animation GetAnimation(JitteringComponent jittering, SpriteComponent spr
                         Property = nameof(SpriteComponent.Offset),
                         KeyFrames =
                         {
-                            new AnimationTrackProperty.KeyFrame(sprite.Offset, 0f),
+                            new AnimationTrackProperty.KeyFrame(jittering.StartOffset + previousJitter, 0f),
                             new AnimationTrackProperty.KeyFrame(jittering.StartOffset + offset, length),
                         }
                     }

Content.Client/PDA/PdaMenu.xaml

@@ -43,9 +43,18 @@
             <ContainerButton Name="StationTimeButton">
                 <RichTextLabel Name="StationTimeLabel" Access="Public"/>
             </ContainerButton>
+            <!-- Begin DeltaV changes -->
+            <ContainerButton Name="CurrentDateButton">
+                <RichTextLabel Name="CurrentDateLabel" Access="Public"/>
+            </ContainerButton>
+            <!-- End DeltaV changes -->
             <ContainerButton Name="StationAlertLevelInstructionsButton">
                 <RichTextLabel Name="StationAlertLevelInstructions" Access="Public"/>
             </ContainerButton>
+            <!-- Mono -->
+            <ContainerButton Name="WarLevelButton">
+                <RichTextLabel Name="WarLevelLabel" Access="Public"/>
+            </ContainerButton>
             <!-- Frontier -->
             <ContainerButton Name="BalanceButton">
                 <RichTextLabel Name="BalanceLabel" Access="Public"/>

Content.Client/PDA/PdaMenu.xaml.cs

@@ -36,6 +36,8 @@ public sealed partial class PdaMenu : PdaWindow
 
         private string _balance = Loc.GetString("comp-pda-ui-unknown"); // Frontier
         private string _shuttleDeed = Loc.GetString("comp-pda-ui-unknown"); // Frontier
+        private string _currentDate = Loc.GetString("comp-pda-ui-unknown"); // DeltaV - PDA date
+
 
         private int _currentView;
 
@@ -139,6 +141,13 @@ public PdaMenu()
                 _clipboard.SetText(_instructions);
             };
 
+            // Begin DeltaV additions
+            CurrentDateButton.OnPressed += _ =>
+            {
+                _clipboard.SetText(_currentDate);
+            };
+            // End DeltaV additions
+
 
 
 
@@ -219,6 +228,18 @@ public void UpdateState(PdaUpdateState state)
                 "comp-pda-ui-station-alert-level-instructions",
                 ("instructions", _instructions))
             );
+            // Begin DeltaV additions
+            if (state.PdaOwnerInfo.CurrentDate is { } curDate)
+                _currentDate = curDate.ToString("dd/MM/yyyy"); // Wicce: dd MMMM yyyy -> dd/MM/yyyy. Looks nicer.
+                CurrentDateLabel.SetMarkup(Loc.GetString(
+                    "comp-pda-ui-current-date",
+                    ("date", _currentDate)
+                ));
+            // End DeltaV additions
+
+            // Mono
+            var warLevel = state.PdaOwnerInfo.WarLevel;
+            WarLevelLabel.SetMarkup(warLevel != null ? warLevel : Loc.GetString("comp-pda-ui-station-war-level-unknown"));
 
             AddressLabel.Text = state.Address?.ToUpper() ?? " - ";
 

Content.Client/Parallax/ParallaxOverlay.cs

@@ -1,5 +1,8 @@
 using System.Numerics;
 using Content.Client.Parallax.Managers;
+using Content.Client.Viewport; // CrystallEdge
+using Content.Shared._CE.ZLevels.Core.Components; // CrystallEdge
+using Content.Shared._CE.ZLevels.Core.EntitySystems; // CrystallEdge
 using Content.Shared.CCVar;
 using Content.Shared.Parallax.Biomes;
 using Robust.Client.Graphics;
@@ -20,6 +23,7 @@ public sealed partial class ParallaxOverlay : Overlay
     [Dependency] private IMapManager _mapManager = default!;
     [Dependency] private IParallaxManager _manager = default!;
     private readonly ParallaxSystem _parallax;
+    private readonly CESharedZLevelsSystem _zLevel; //CrystallEdge
 
     public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowWorld;
 
@@ -28,14 +32,25 @@ public ParallaxOverlay()
         ZIndex = ParallaxSystem.ParallaxZIndex;
         IoCManager.InjectDependencies(this);
         _parallax = _entManager.System<ParallaxSystem>();
+        _zLevel = _entManager.System<CESharedZLevelsSystem>(); //CrystallEdge
     }
 
     protected override bool BeforeDraw(in OverlayDrawArgs args)
     {
         if (args.MapId == MapId.Nullspace)
             return false;
 
-        return true;
+        //CrystallEdge draw parallax only for lowest zlevel
+        if (args.Viewport.Eye is ScalingViewport.ZEye zEye)
+            return zEye.DrawParallax;
+
+        // Transit maps are mostly-empty carriers for a moving ship; painting the
+        // skybox on them would overwrite the already-rendered world below.
+        if (_entManager.HasComponent<CEZTransitMapComponent>(args.MapUid))
+            return false;
+
+        return !_zLevel.TryMapDown(args.MapUid, out _);
+        //CrystallEdge end
     }
 
     protected override void Draw(in OverlayDrawArgs args)

Content.Client/Remotes/UI/DoorRemoteStatusControl.cs

@@ -38,6 +38,7 @@ protected override void FrameUpdate(FrameEventArgs args)
             OperatingMode.OpenClose => "door-remote-open-close-text",
             OperatingMode.ToggleBolts => "door-remote-toggle-bolt-text",
             OperatingMode.ToggleEmergencyAccess => "door-remote-emergency-access-text",
+            OperatingMode.ToggleOvercharge => "door-remote-toggle-eletrify-text",
             _ => "door-remote-invalid-text"
         });
 

Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs

@@ -27,6 +27,8 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow
     private Dictionary<string, CyborgControlData> _cyborgs = new();
 
     public EntityUid Entity;
+
+    private bool _allowBorgControl = true;
 
     public RoboticsConsoleWindow()
     {
@@ -72,6 +74,7 @@ public void SetEntity(EntityUid uid)
     public void UpdateState(RoboticsConsoleState state)
     {
         _cyborgs = state.Cyborgs;
+        _allowBorgControl = state.AllowBorgControl;
 
         // clear invalid selection
         if (_selected is {} selected && !_cyborgs.ContainsKey(selected))
@@ -95,8 +98,8 @@ public void UpdateState(RoboticsConsoleState state)
         PopulateData();
 
         var locked = _lock.IsLocked(Entity);
-        DangerZone.Visible = !locked;
-        LockedMessage.Visible = locked;
+        DangerZone.Visible = !locked && _allowBorgControl;
+        LockedMessage.Visible = locked && _allowBorgControl; // Only show if locked AND control is allowed
     }
 
     private void PopulateCyborgs()
@@ -147,7 +150,8 @@ private void PopulateData()
         BorgInfo.SetMessage(text);
 
         // how the turntables
-        DisableButton.Disabled = !(data.HasBrain && data.CanDisable);
+        DisableButton.Disabled = !_allowBorgControl || !(data.HasBrain && data.CanDisable);
+        DestroyButton.Disabled = !_allowBorgControl;
     }
 
     protected override void FrameUpdate(FrameEventArgs args)

Content.Client/Shuttles/Systems/ShuttleConsoleSystem.cs

@@ -17,9 +17,9 @@ public override void Initialize()
         {
             base.Initialize();
             SubscribeLocalEvent<PilotComponent, ComponentHandleState>(OnHandleState);
-            
+
             // We don't need to handle BUI events on client-side since the BoundUserInterface class does that
-            
+
             var shuttle = _input.Contexts.New("shuttle", "common");
             shuttle.AddFunction(ContentKeyFunctions.ShuttleStrafeUp);
             shuttle.AddFunction(ContentKeyFunctions.ShuttleStrafeDown);
@@ -28,6 +28,8 @@ public override void Initialize()
             shuttle.AddFunction(ContentKeyFunctions.ShuttleRotateLeft);
             shuttle.AddFunction(ContentKeyFunctions.ShuttleRotateRight);
             shuttle.AddFunction(ContentKeyFunctions.ShuttleBrake);
+            shuttle.AddFunction(ContentKeyFunctions.ShuttleAscend); // Mono
+            shuttle.AddFunction(ContentKeyFunctions.ShuttleDescend); // Mono
         }
 
         public override void Shutdown()

Content.Client/Shuttles/UI/NavScreen.xaml

@@ -80,6 +80,37 @@
                                HorizontalExpand="True"
                                Align="Right"
                                FontColorOverride="#00ff2a"/>
+                        <!-- Mono: z-level altimeter -->
+                        <controls:Label Name="GridAltitudeCaption"
+                               Text="{controls:Loc 'shuttle-console-altitude'}"
+                               FontColorOverride="#00ff2a"
+                               Visible="False"/>
+                        <controls:Label Name="GridAltitude"
+                               Text="-"
+                               HorizontalExpand="True"
+                               Align="Right"
+                               FontColorOverride="#00ff2a"
+                               Visible="False"/>
+                        <controls:Label Name="GridVerticalVelocityCaption"
+                               Text="{controls:Loc 'shuttle-console-vertical-velocity'}"
+                               FontColorOverride="#00ff2a"
+                               Visible="False"/>
+                        <controls:Label Name="GridVerticalVelocity"
+                               Text="-"
+                               HorizontalExpand="True"
+                               Align="Right"
+                               FontColorOverride="#00ff2a"
+                               Visible="False"/>
+                        <controls:Label Name="GridTravelStateCaption"
+                               Text="{controls:Loc 'shuttle-console-travel-state'}"
+                               FontColorOverride="#00ff2a"
+                               Visible="False"/>
+                        <controls:Label Name="GridTravelState"
+                               Text="-"
+                               HorizontalExpand="True"
+                               Align="Right"
+                               FontColorOverride="#00ff2a"
+                               Visible="False"/>
                     </controls:GridContainer>
                     </controls:PanelContainer>
                     </controls:PanelContainer>
@@ -111,8 +142,8 @@
                             TextAlign="Center"
                             StyleClasses="ButtonSquare"
                             ToggleMode="True"/>
-                    <controls:Button Name="IFFShuttleToggle"
-                             Text="{controls:Loc 'shuttle-console-iffshuttles-toggle'}"
+                    <controls:Button Name="IFFDetailedToggle"
+                             Text="{controls:Loc 'shuttle-console-iff-detailed'}"
                              TextAlign="Center"
                              StyleClasses="ButtonSquare"
                              ToggleMode="True"/>

Content.Client/Shuttles/UI/NavScreen.xaml.cs

@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Shared._CE.ZLevels.Core.Components; // Mono
 using Content.Shared._Mono.Company;
 using Content.Shared.Shuttles.BUIStates;
 using Robust.Client.AutoGenerated;
@@ -32,8 +33,8 @@ public NavScreen()
         IFFToggle.OnToggled += OnIFFTogglePressed;
         IFFToggle.Pressed = NavRadar.ShowIFF;
 
-        IFFShuttleToggle.OnToggled += OnIFFShuttleTogglePressed;
-        IFFShuttleToggle.Pressed = NavRadar.ShowIFFShuttles;
+        IFFDetailedToggle.OnToggled += OnIFFDetailedTogglePressed; // Mono
+        IFFDetailedToggle.Pressed = NavRadar.ShowIFFDetailed; // Mono
 
         DockToggle.OnToggled += OnDockTogglePressed;
         DockToggle.Pressed = NavRadar.ShowDocks;
@@ -102,10 +103,11 @@ private void OnIFFTogglePressed(BaseButton.ButtonEventArgs args)
         args.Button.Pressed = NavRadar.ShowIFF;
     }
 
-    private void OnIFFShuttleTogglePressed(BaseButton.ButtonEventArgs args)
+    // Mono
+    private void OnIFFDetailedTogglePressed(BaseButton.ButtonEventArgs args)
     {
-        NavRadar.ShowIFFShuttles ^= true;
-        args.Button.Pressed = NavRadar.ShowIFFShuttles;
+        NavRadar.ShowIFFDetailed ^= true;
+        args.Button.Pressed = NavRadar.ShowIFFDetailed;
     }
 
     private void OnDockTogglePressed(BaseButton.ButtonEventArgs args)
@@ -209,5 +211,71 @@ protected override void Draw(DrawingHandleScreen handle)
             ("Y", $"{gridVelocity.Y + 10f * float.Epsilon:0.0}"));
         GridAngularVelocity.Text = Loc.GetString("shuttle-console-angular-velocity-value",
             ("angularVelocity", $"{-MathHelper.RadiansToDegrees(gridBody.AngularVelocity) + 10f * float.Epsilon:0.0}"));
+
+        UpdateAltitude(gridXform); // Mono
+    }
+
+    // Mono: z-level altimeter
+    private void UpdateAltitude(TransformComponent gridXform)
+    {
+        float? altitude = null;
+        string? state = null;
+
+        if (gridXform.MapUid is { } mapUid)
+        {
+            if (_entManager.TryGetComponent(mapUid, out CEZMapComponent? zLevel))
+            {
+                altitude = zLevel.Depth;
+
+                // Mid-spool a grounded ship shows a launch countdown instead.
+                if (_entManager.TryGetComponent(_shuttleEntity, out CEZPhysicsComponent? spoolPhys) &&
+                    spoolPhys.LaunchCountdown > 0f)
+                {
+                    state = Loc.GetString("shuttle-console-travel-state-launching",
+                        ("countdown", $"{spoolPhys.LaunchCountdown:0.0}"));
+                }
+                else
+                {
+                    state = Loc.GetString(_entManager.HasComponent<CEZGroundLayerComponent>(mapUid)
+                        ? "shuttle-console-travel-state-grounded"
+                        : "shuttle-console-travel-state-hovering");
+                }
+            }
+            else if (_entManager.TryGetComponent(mapUid, out CEZTransitMapComponent? transit) &&
+                     transit.LowerMap is { } lowerMap &&
+                     _entManager.TryGetComponent(lowerMap, out CEZMapComponent? lowerZ))
+            {
+                var progress = 0f;
+                if (_entManager.TryGetComponent(_shuttleEntity, out CEZPhysicsComponent? zPhys))
+                    progress = Math.Clamp(zPhys.LocalPosition, 0f, 1f);
+
+                altitude = lowerZ.Depth + progress;
+                state = Loc.GetString("shuttle-console-travel-state-flying");
+            }
+        }
+
+        var onZNetwork = altitude != null;
+        GridAltitudeCaption.Visible = onZNetwork;
+        GridAltitude.Visible = onZNetwork;
+        GridVerticalVelocityCaption.Visible = onZNetwork;
+        GridVerticalVelocity.Visible = onZNetwork;
+        GridTravelStateCaption.Visible = onZNetwork;
+        GridTravelState.Visible = onZNetwork;
+
+        if (!onZNetwork)
+            return;
+
+        GridAltitude.Text = Loc.GetString("shuttle-console-altitude-value",
+            ("altitude", $"{altitude!.Value:0.00}"));
+
+        // CEZPhysics.Velocity is positive = up; the server mirrors the grid's fall
+        // speed onto it. Add a bias like the other velocity rows so -0 never shows.
+        var vertical = 0f;
+        if (_entManager.TryGetComponent(_shuttleEntity, out CEZPhysicsComponent? velPhys))
+            vertical = velPhys.Velocity;
+        GridVerticalVelocity.Text = Loc.GetString("shuttle-console-vertical-velocity-value",
+            ("velocity", $"{vertical + 10f * float.Epsilon:0.00}"));
+
+        GridTravelState.Text = state!;
     }
 }