Merge remote-tracking branch 'EE-Master/master' into Update-1-19-2025

.envrc

@@ -1,4 +1,5 @@
+set -e
 if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then
-  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
+    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
 fi
-use nix
+use nix

.github/CODEOWNERS

@@ -1,3 +1,94 @@
-# Last match in file takes precedence.
+/.* @DEATHB4DEFEAT
+*.sln @DEATHB4DEFEAT
+*.csproj @DEATHB4DEFEAT
+*.dotsettings @DEATHB4DEFEAT
+*.DotSettings @DEATHB4DEFEAT
+*.toml @DEATHB4DEFEAT
+/Content.*/IoC @sleepyyapril @DEATHB4DEFEAT
 
-# TODO
+
+# Nix
+*.nix @DEATHB4DEFEAT @stellar-novas
+/flake.lock @DEATHB4DEFEAT @stellar-novas
+/.envrc @DEATHB4DEFEAT @stellar-novas
+
+
+# UI
+*.xaml @sleepyyapril @DEATHB4DEFEAT
+*.xaml.cs @sleepyyapril @DEATHB4DEFEAT
+
+# Lobby
+/Content.Client/Lobby @DEATHB4DEFEAT
+/Content.Client/MainMenu @DEATHB4DEFEAT
+
+# Queue
+/Content.*/DiscordAuth @DEATHB4DEFEAT
+/Content.*/JoinQueue @DEATHB4DEFEAT
+
+
+# Writing
+*.xml @DEATHB4DEFEAT
+*.ftl @DEATHB4DEFEAT @sleepyyapril
+*.md @DEATHB4DEFEAT
+*.txt @DEATHB4DEFEAT
+
+# Shaders
+*.swsl @DEATHB4DEFEAT
+/Resources/Prototypes/Shaders @DEATHB4DEFEAT
+
+# Overlays
+/Content.Client/Overlays @DEATHB4DEFEAT
+
+# Paint
+/Content.*/Paint @DEATHB4DEFEAT
+
+
+# Parkstation/etc
+**/SimpleStation14 @DEATHB4DEFEAT
+**/Parkstation @DEATHB4DEFEAT
+
+# Announcer system
+/Content.*/Announcements @DEATHB4DEFEAT
+/Content.Server/StationEvents @DEATHB4DEFEAT
+
+# SSD
+/Content.*/SSDIndicator @DEATHB4DEFEAT
+
+# Station Goals
+/Content.Server/StationGoal @DEATHB4DEFEAT
+
+# Random Bark
+/Content.Server/Speech/Components/RandomBarkComponent.cs @DEATHB4DEFEAT
+/Content.Server/Speech/Systems/RandomBarkSystem.cs @DEATHB4DEFEAT
+/Resources/Locale/en-US/random-barks @DEATHB4DEFEAT
+
+# Punpun
+/Content.Server/Punpun @DEATHB4DEFEAT
+
+
+# Database
+/Content.*/Database @sleepyyapril @DEATHB4DEFEAT
+/Content.*/.Database @sleepyyapril @DEATHB4DEFEAT
+
+# Preferences
+/Content.*/Preferences @DEATHB4DEFEAT
+**/*CVar*/*.cs @sleepyyapril @DEATHB4DEFEAT
+
+# Discord
+/Content.*/Discord* @sleepyyapril @DEATHB4DEFEAT
+
+# Loadouts
+/Resources/Prototypes/Loadouts @angelofallars
+/Resources/Prototypes/CharacterItemGroups @angelofallars
+/Resources/Locale/en-US/loadouts @angelofallars
+
+# Traits
+/Resources/Prototypes/Traits @angelofallars
+/Resources/Locale/en-US/traits @angelofallars
+
+# Throwing
+/Content.*/DamageOtherOnHit @angelofallars
+/Content.*/Embed @angelofallars
+/Content.*/ProjectileSystem @angelofallars
+/Content.*/ThrownItem @angelofallars
+/Content.*/ThrowEvent @angelofallars

.github/workflows/build-test-debug.yml

@@ -51,7 +51,7 @@ jobs:
       shell: pwsh
       run: |
         $env:DOTNET_gcServer=1
-        dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed
+        dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0
   ci-success:
     name: Build & Test Debug
     needs:

Content.Client/Actions/ActionsSystem.cs

@@ -302,7 +302,7 @@ public void LoadActionAssignments(string path, bool userData)
                     continue;
 
                 var action = _serialization.Read<BaseActionComponent>(actionNode, notNullableOverride: true);
-                var actionId = Spawn(null);
+                var actionId = Spawn();
                 AddComp(actionId, action);
                 AddActionDirect(user, actionId);
 

Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml

@@ -3,6 +3,7 @@
     <PanelContainer StyleClasses="BackgroundDark"></PanelContainer>
     <BoxContainer Name="SettingsBox" Orientation="Horizontal" HorizontalExpand="True" VerticalExpand="False">
         <Label Text="{Loc 'glimmer-monitor-interval'}"/>
+        <Button Name="IntervalButton6s" Access="Public" Text="6s" StyleClasses="OpenRight"/>
         <Button Name="IntervalButton1" Access="Public" Text="1m" StyleClasses="OpenRight"/>
         <Button Name="IntervalButton5" Access="Public" Text="5m" StyleClasses="OpenBoth"/>
         <Button Name="IntervalButton10" Access="Public" Text="10m" StyleClasses="OpenLeft"/>

Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs

@@ -26,12 +26,14 @@ public GlimmerMonitorUiFragment()
         VerticalExpand = true;
 
         var intervalGroup = new ButtonGroup();
+        IntervalButton6s.Group = intervalGroup;
         IntervalButton1.Group = intervalGroup;
         IntervalButton5.Group = intervalGroup;
         IntervalButton10.Group = intervalGroup;
 
-        IntervalButton1.Pressed = true;
+        IntervalButton6s.Pressed = true;
 
+        IntervalButton6s.OnPressed += _ => UpdateState(_cachedValues);
         IntervalButton1.OnPressed += _ => UpdateState(_cachedValues);
         IntervalButton5.OnPressed += _ => UpdateState(_cachedValues);
         IntervalButton10.OnPressed += _ => UpdateState(_cachedValues);
@@ -62,14 +64,12 @@ private List<int> FormatGlimmerValues(List<int> glimmerValues)
     {
         var returnList = glimmerValues;
 
-        if (IntervalButton5.Pressed)
-        {
-            returnList = GetAveragedList(glimmerValues, 5);
-        }
-        else if (IntervalButton10.Pressed)
-        {
+        if (IntervalButton1.Pressed)
             returnList = GetAveragedList(glimmerValues, 10);
-        }
+        else if (IntervalButton5.Pressed)
+            returnList = GetAveragedList(glimmerValues, 50);
+        else if (IntervalButton10.Pressed)
+            returnList = GetAveragedList(glimmerValues, 100);
 
         return ClipToFifteen(returnList);
     }

Content.Client/Chat/UI/SpeechBubble.cs

@@ -2,6 +2,8 @@
 using Content.Client.Chat.Managers;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
+using Content.Shared.Speech;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -17,6 +19,8 @@ public abstract class SpeechBubble : Control
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] protected readonly IConfigurationManager ConfigManager = default!;
 
+        private readonly SharedTransformSystem _transformSystem;
+
         public enum SpeechType : byte
         {
             Emote,
@@ -83,6 +87,7 @@ public SpeechBubble(ChatMessage message, EntityUid senderEntity, string speechSt
         {
             IoCManager.InjectDependencies(this);
             _senderEntity = senderEntity;
+            _transformSystem = _entityManager.System<SharedTransformSystem>();
 
             // Use text clipping so new messages don't overlap old ones being pushed up.
             RectClipContent = true;
@@ -139,8 +144,13 @@ protected override void FrameUpdate(FrameEventArgs args)
                 Modulate = Color.White;
             }
 
-            var offset = (-_eyeManager.CurrentEye.Rotation).ToWorldVec() * -EntityVerticalOffset;
-            var worldPos = xform.WorldPosition + offset;
+            var baseOffset = 0f;
+
+           if (_entityManager.TryGetComponent<SpeechComponent>(_senderEntity, out var speech))
+                baseOffset = speech.SpeechBubbleOffset;
+
+            var offset = (-_eyeManager.CurrentEye.Rotation).ToWorldVec() * -(EntityVerticalOffset + baseOffset);
+            var worldPos = _transformSystem.GetWorldPosition(xform) + offset;
 
             var lowerCenter = _eyeManager.WorldToScreen(worldPos) / UIScale;
             var screenPos = lowerCenter - new Vector2(ContentSize.X / 2, ContentSize.Y + _verticalOffsetAchieved);

Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs

@@ -10,15 +10,11 @@ namespace Content.Client.Chemistry.UI
     /// Initializes a <see cref="ChemMasterWindow"/> and updates it when new server messages are received.
     /// </summary>
     [UsedImplicitly]
-    public sealed class ChemMasterBoundUserInterface : BoundUserInterface
+    public sealed class ChemMasterBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey)
     {
         [ViewVariables]
         private ChemMasterWindow? _window;
 
-        public ChemMasterBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
-        {
-        }
-
         /// <summary>
         /// Called each time a chem master UI instance is opened. Generates the window and fills it with
         /// relevant info. Sets the actions for static buttons.
@@ -53,7 +49,11 @@ protected override void Open()
                 _window.PillTypeButtons[i].OnPressed += _ => SendMessage(new ChemMasterSetPillTypeMessage(pillType));
             }
 
-            _window.OnReagentButtonPressed += (args, button) => SendMessage(new ChemMasterReagentAmountButtonMessage(button.Id, button.Amount, button.IsBuffer));
+            _window.OnReagentButtonPressed += (_, button, amount) => SendMessage(new ChemMasterReagentAmountButtonMessage(button.Id, amount, button.IsBuffer));
+            _window.OnSortMethodChanged += sortMethod => SendMessage(new ChemMasterSortMethodUpdated(sortMethod));
+            _window.OnTransferAmountChanged += amount => SendMessage(new ChemMasterTransferringAmountUpdated(amount));
+
+
         }
 
         /// <summary>
@@ -68,7 +68,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
             base.UpdateState(state);
 
             var castState = (ChemMasterBoundUserInterfaceState) state;
-
             _window?.UpdateState(castState); // Update window state
         }
     }

Content.Client/Chemistry/UI/ChemMasterWindow.xaml

@@ -2,23 +2,25 @@
                 xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                 xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-                MinSize="620 670"
+                MinSize="500 770"
                 Title="{Loc 'chem-master-bound-user-interface-title'}">
     <TabContainer Name="Tabs" Margin="5 5 7 5">
         <BoxContainer Orientation="Vertical" HorizontalExpand="True" Margin="5" SeparationOverride="10">
             <!-- Input container info -->
             <BoxContainer Orientation="Horizontal">
                 <Label Text="{Loc 'chem-master-window-container-label'}" />
                 <Control HorizontalExpand="True" />
-                <Button MinSize="80 0" Name="InputEjectButton" Access="Public" Text="{Loc 'chem-master-window-eject-button'}" />
+                <RichTextLabel Name="InputAmountLabel" Text="{Loc 'chem-master-window-transferring-default-label'}"  Margin="0 0 7 0"/>
+                <LineEdit MinSize="140 0" Name="InputAmountLineEdit" Access="Public" PlaceHolder="{Loc 'chem-master-window-amount-placeholder'}" />
+                <Button MinSize="80 0" Name="InputEjectButton" Access="Public" Text="{Loc 'chem-master-window-eject-button'}" StyleClasses="OpenLeft" />
             </BoxContainer>
 
-            <PanelContainer VerticalExpand="True" MinSize="0 200">
+            <PanelContainer VerticalExpand="True" MinSize="0 300">
                 <PanelContainer.PanelOverride>
                     <gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
                 </PanelContainer.PanelOverride>
 
-                <ScrollContainer HorizontalExpand="True" MinSize="0 200">
+                <ScrollContainer HorizontalExpand="True" MinSize="0 300">
                     <!-- Initially empty, when server sends state data this will have container contents and fill volume.-->
                     <BoxContainer Name="InputContainerInfo" Orientation="Vertical" Margin="4" HorizontalExpand="True">
                         <Label Text="{Loc 'chem-master-window-no-container-loaded-text'}" />
@@ -34,16 +36,17 @@
                 <Label Text="{Loc 'chem-master-window-buffer-text'}" />
                 <Control HorizontalExpand="True" />
                 <Button MinSize="80 0" Name="BufferTransferButton" Access="Public" Text="{Loc 'chem-master-window-transfer-button'}" ToggleMode="True" StyleClasses="OpenRight" />
+                <OptionButton Name="SortMethod" Access="Public" ToolTip="{Loc 'chem-master-window-sort-method-tooltip'}" StyleClasses="OpenBoth" />
                 <Button MinSize="80 0" Name="BufferDiscardButton" Access="Public" Text="{Loc 'chem-master-window-discard-button'}" ToggleMode="True" StyleClasses="OpenLeft" />
             </BoxContainer>
 
             <!-- Buffer info -->
-            <PanelContainer VerticalExpand="True" MinSize="0 200">
+            <PanelContainer VerticalExpand="True" MinSize="0 300">
                 <PanelContainer.PanelOverride>
                     <gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
                 </PanelContainer.PanelOverride>
 
-                <ScrollContainer HorizontalExpand="True" MinSize="0 200">
+                <ScrollContainer HorizontalExpand="True" MinSize="0 300">
                     <!-- Buffer reagent list -->
                     <BoxContainer Name="BufferInfo" Orientation="Vertical" Margin="4" HorizontalExpand="True">
                         <Label Text="{Loc 'chem-master-window-buffer-empty-text'}" />
@@ -57,15 +60,17 @@
             <BoxContainer Orientation="Horizontal">
                 <Label Text="{Loc 'chem-master-window-container-label'}" />
                 <Control HorizontalExpand="True" />
+                <Label Name="OutputAmountLabel" Text="{Loc 'chem-master-window-transferring-default-label'}" Margin="0 0 7 0"/>
+                <LineEdit MinSize="140 0" Name="OutputAmountLineEdit" Access="Public" PlaceHolder="{Loc 'chem-master-window-amount-placeholder'}" />
                 <Button MinSize="80 0" Name="OutputEjectButton" Access="Public" Text="{Loc 'chem-master-window-eject-button'}" />
             </BoxContainer>
 
-            <PanelContainer VerticalExpand="True" MinSize="0 200">
+            <PanelContainer VerticalExpand="True" MinSize="0 300">
                 <PanelContainer.PanelOverride>
                     <gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
                 </PanelContainer.PanelOverride>
 
-                <ScrollContainer HorizontalExpand="True" MinSize="0 200">
+                <ScrollContainer HorizontalExpand="True" MinSize="0 300">
                     <!-- Initially empty, when server sends state data this will have container contents and fill volume.-->
                     <BoxContainer Name="OutputContainerInfo" Orientation="Vertical" Margin="4" HorizontalExpand="True">
                         <Label Text="{Loc 'chem-master-window-no-container-loaded-text'}" />