Imp catch up 03-12-2026

.github/PULL_REQUEST_TEMPLATE.md

@@ -18,10 +18,17 @@
 - [ ] I have added media to this PR or it does not require an in-game showcase.
 <!-- You should understand that not following the above may get your PR closed at maintainer’s discretion -->
 
+## Licensing
+<!-- THIS IS OPTIONAL. Impstation is licensed under AGPLv3 by default. Check this box if you wish to allow other users to relicense your work to MIT. -->
+- [ ] I give permission for any changes to the repository made in this PR to be relicensed under MIT.
+<!-- THIS IS OPTIONAL. -->
+
 **Changelog**
 <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay.
 Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up.
-Changelog must have a :cl: symbol, so the bot recognizes the changes and adds them to the game's changelog. -->
+Changelog must have a :cl: symbol, so the bot recognizes the changes and adds them to the game's changelog. 
+The name that appears on the changelog will be your GitHub usernabe by default. If you wish for a different name to appear, format the symbol like so:
+:cl: My Name -->
 <!--
 :cl:
 - add: Added fun!

Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml

@@ -18,6 +18,8 @@
             <cc:CommandButton Command="achatwindow" Text="{Loc admin-player-actions-window-admin-chat}"/>
             <!-- CD: records purge button -->
             <cc:UICommandButton Command="purgecharacterrecords" Text="{Loc admin-player-actions-window-cd-record-purge}" WindowType="{x:Type cdAdmin:ModifyCharacterRecords}"/>
+            <!-- IMP: Shared moods -->
+            <cc:CommandButton Command="sharedmoods" Text="{Loc admin-player-actions-window-shared-moods}"/>
         </GridContainer>
     </BoxContainer>
 </Control>

Content.Client/Options/UI/OptionsMenu.xaml

@@ -1,8 +1,7 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             xmlns:tabs="clr-namespace:Content.Client.Options.UI.Tabs"
-            xmlns:dtabs="clr-namespace:Content.Client._DV.Options.UI.Tabs"
             Title="{Loc 'ui-options-title'}"
-            MinSize="800 450"> <!-- DV add dtabs -->
+            MinSize="800 450">
     <TabContainer Name="Tabs" Access="Public">
         <tabs:MiscTab Name="MiscTab" />
         <tabs:GraphicsTab Name="GraphicsTab" />

Content.Client/Options/UI/Tabs/AudioTab.xaml

@@ -2,32 +2,49 @@
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
          xmlns:ui="clr-namespace:Content.Client.Options.UI">
     <BoxContainer Orientation="Vertical">
-        <BoxContainer Orientation="Vertical" Margin="8 8 8 8" VerticalExpand="True">
-            <Label Text="{Loc 'ui-options-volume-label'}"
-                   StyleClasses="LabelKeyText"/>
-            <BoxContainer Orientation="Vertical" Margin="0 3 0 0">
-                <ui:OptionSlider Name="SliderVolumeMaster" Title="{Loc 'ui-options-master-volume'}"
-                                 Margin="0 0 0 8" />
-                <ui:OptionSlider Name="SliderVolumeMidi" Title="{Loc 'ui-options-midi-volume'}" />
-                <ui:OptionSlider Name="SliderVolumeAmbientMusic" Title="{Loc 'ui-options-ambient-music-volume'}" />
-                <ui:OptionSlider Name="SliderVolumeAmbience" Title="{Loc 'ui-options-ambience-volume'}" />
-                <ui:OptionSlider Name="SliderVolumeLobby" Title="{Loc 'ui-options-lobby-volume'}" />
-                <ui:OptionSlider Name="SliderVolumeInterface" Title="{Loc 'ui-options-interface-volume'}" />
-                <!-- EE add -->
-                <ui:OptionSlider Name="SliderVolumeAnnouncer" Title="{Loc 'ui-options-announcer-volume'}" />
-                <ui:OptionSlider Name="SliderMaxAmbienceSounds" Title="{Loc 'ui-options-ambience-max-sounds'}"
-                                 Margin="0 0 0 8" />
-                <CheckBox Name="LobbyMusicCheckBox" Text="{Loc 'ui-options-lobby-music'}" />
-                <CheckBox Name="RestartSoundsCheckBox" Text="{Loc 'ui-options-restart-sounds'}" />
-                <CheckBox Name="EventMusicCheckBox" Text="{Loc 'ui-options-event-music'}" />
-                <!-- EE add -->
-                <CheckBox Name="AnnouncerDisableMultipleSoundsCheckBox"
-                                Text="{Loc 'ui-options-announcer-disable-multiple-sounds'}"
-                                ToolTip="{Loc 'ui-options-announcer-disable-multiple-sounds-tooltip'}" />
-                <CheckBox Name="AdminSoundsCheckBox" Text="{Loc 'ui-options-admin-sounds'}" />
-                <CheckBox Name="BwoinkSoundCheckBox" Text="{Loc 'ui-options-bwoink-sound'}" />
+        <ScrollContainer VerticalExpand="True">
+            <BoxContainer Orientation="Vertical" Margin="8 8 8 8">
+                <Label Text="{Loc 'ui-options-volume-label'}"
+                       StyleClasses="LabelKeyText"/>
+                <BoxContainer Orientation="Vertical" Margin="0 3 0 0">
+                    <ui:OptionSlider Name="SliderVolumeMaster" Title="{Loc 'ui-options-master-volume'}"
+                                     Margin="0 0 0 8" />
+                    <ui:OptionSlider Name="SliderVolumeMidi" Title="{Loc 'ui-options-midi-volume'}" />
+                    <ui:OptionSlider Name="SliderVolumeAmbientMusic" Title="{Loc 'ui-options-ambient-music-volume'}" />
+                    <ui:OptionSlider Name="SliderVolumeAmbience" Title="{Loc 'ui-options-ambience-volume'}" />
+                    <ui:OptionSlider Name="SliderVolumeLobby" Title="{Loc 'ui-options-lobby-volume'}" />
+                    <ui:OptionSlider Name="SliderVolumeInterface" Title="{Loc 'ui-options-interface-volume'}" />
+                    <!-- EE add -->
+                    <ui:OptionSlider Name="SliderVolumeAnnouncer" Title="{Loc 'ui-options-announcer-volume'}" />
+                    <ui:OptionSlider Name="SliderMaxAmbienceSounds" Title="{Loc 'ui-options-ambience-max-sounds'}"
+                                     Margin="0 0 0 8" />
+                    <CheckBox Name="LobbyMusicCheckBox" Text="{Loc 'ui-options-lobby-music'}" />
+                    <CheckBox Name="RestartSoundsCheckBox" Text="{Loc 'ui-options-restart-sounds'}" />
+                    <CheckBox Name="EventMusicCheckBox" Text="{Loc 'ui-options-event-music'}" />
+                    <!-- EE add -->
+                    <CheckBox Name="AnnouncerDisableMultipleSoundsCheckBox"
+                                    Text="{Loc 'ui-options-announcer-disable-multiple-sounds'}"
+                                    ToolTip="{Loc 'ui-options-announcer-disable-multiple-sounds-tooltip'}" />
+                    <CheckBox Name="AdminSoundsCheckBox" Text="{Loc 'ui-options-admin-sounds'}" />
+                    <CheckBox Name="BwoinkSoundCheckBox" Text="{Loc 'ui-options-bwoink-sound'}" />
+
+                    <!-- VDS additions start -->
+                    <Label Text="{Loc 'ui-options-general-acoustics'}"
+                                    StyleClasses="LabelKeyText"
+                                    Margin="0 10 0 0" />
+                    <Label Text="{Loc 'ui-options-acoustics-subtext-1'}" StyleClasses="LabelSubText" />
+                    <Label Text="{Loc 'ui-options-acoustics-subtext-2'}" StyleClasses="LabelSubText" />
+                    <Label Text="{Loc 'ui-options-acoustics-subtext-3'}" StyleClasses="LabelSubText"
+                                    Margin="0 0 0 6" />
+                    <CheckBox Name="AcousticEnableCheckBox" Text="{Loc 'ui-options-acoustics-enabled'}" />
+                    <CheckBox Name="AcousticHighResolutionCheckBox"
+                                    Text="{Loc 'ui-options-acoustics-high-resolution'}"
+                                    ToolTip="{Loc 'ui-options-acoustics-high-resolution-tooltip'}" />
+                    <ui:OptionSlider Name="SliderAcousticReflectionCount" Title="{Loc 'ui-options-acoustics-max-reflections'}" />
+                    <!-- VDS additions end -->
+                </BoxContainer>
             </BoxContainer>
-        </BoxContainer>
+        </ScrollContainer>
         <ui:OptionsTabControlRow Name="Control" Access="Public" />
     </BoxContainer>
 </Control>

Content.Client/Options/UI/Tabs/AudioTab.xaml.cs

@@ -8,6 +8,7 @@
 using Robust.Shared;
 using Robust.Shared.Configuration;
 using Content.Shared._EE.CCVar; // EE
+using Content.Shared._VDS.CCVars; // VDS
 
 namespace Content.Client.Options.UI.Tabs;
 
@@ -76,6 +77,17 @@ public AudioTab()
         Control.AddOptionCheckBox(CCVars.AdminSoundsEnabled, AdminSoundsCheckBox);
         Control.AddOptionCheckBox(CCVars.BwoinkSoundEnabled, BwoinkSoundCheckBox);
 
+        // VDS start
+        var acousticEnable = Control.AddOptionCheckBox(VCCVars.AcousticEnable, AcousticEnableCheckBox);
+        acousticEnable.ImmediateValueChanged += UpdateAcousticButtons;
+        Control.AddOptionCheckBox(VCCVars.AcousticHighResolution, AcousticHighResolutionCheckBox);
+        Control.AddOptionSlider(
+            VCCVars.AcousticReflectionCount,
+            SliderAcousticReflectionCount,
+            _cfg.GetCVar(VCCVars.AcousticReflectionCountMinimum),
+            _cfg.GetCVar(VCCVars.AcousticReflectionCountMaximum));
+        // VDS end
+
         Control.Initialize();
     }
 
@@ -84,6 +96,7 @@ protected override void EnteredTree()
         base.EnteredTree();
         _admin.AdminStatusUpdated += UpdateAdminButtonsVisibility;
         UpdateAdminButtonsVisibility();
+        UpdateAcousticButtons(_cfg.GetCVar(VCCVars.AcousticEnable)); // VDS
     }
 
     protected override void ExitedTree()
@@ -98,6 +111,12 @@ private void UpdateAdminButtonsVisibility()
         BwoinkSoundCheckBox.Visible = _admin.IsActive();
     }
 
+    private void UpdateAcousticButtons(bool value) // VDS
+    {
+        AcousticHighResolutionCheckBox.Visible = value is true;
+        SliderAcousticReflectionCount.Visible = value is true;
+    }
+
     private void OnMasterVolumeSliderChanged(float value)
     {
         // TODO: I was thinking of giving OptionsTabControlRow a flag to "set CVar immediately", but I'm deferring that

Content.Client/Options/UI/Tabs/MiscTab.xaml

@@ -1,4 +1,4 @@
-<tabs:MiscTab xmlns="https://spacestation14.io"
+<tabs:MiscTab xmlns="https://spacestation14.io"
               xmlns:tabs="clr-namespace:Content.Client.Options.UI.Tabs"
               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:ui="clr-namespace:Content.Client.Options.UI">

Content.Client/Options/UI/Tabs/MiscTab.xaml.cs

@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Client.UserInterface.Screens;
 using Content.Shared.CCVar;
 using Content.Shared.HUD;

Content.Client/VendingMachines/UI/VendingMachineMenu.xaml

@@ -7,6 +7,14 @@
     <BoxContainer Name="MainContainer" Orientation="Vertical">
         <LineEdit Name="SearchBar" PlaceHolder="{Loc 'vending-machine-component-search-filter'}" HorizontalExpand="True"  Margin ="4 4"/>
         <co:SearchListContainer Name="VendingContents" VerticalExpand="True" Margin="4 4"/>
+        <!-- IMP ADD store button -->
+        <BoxContainer Orientation="Vertical"
+                      Margin="4 4">
+            <Button Name="StoreButton"
+                    Access="Public"
+                    Text="{Loc 'vending-machine-open-store'}"
+                    HorizontalAlignment="Center"/>
+        </BoxContainer>
          <!-- Footer -->
         <BoxContainer Orientation="Vertical">
             <PanelContainer StyleClasses="LowDivider" />

Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs

@@ -86,13 +86,16 @@ private void GenerateButton(ListData data, ListContainerButton button)
         /// <summary>
         /// Populates the list of available items on the vending machine interface
         /// and sets icons based on their prototypes
+        ///     IMP: Also hides the store button if there is no store
         /// </summary>
-        public void Populate(List<VendingMachineInventoryEntry> inventory, bool enabled)
+        public void Populate(List<VendingMachineInventoryEntry> inventory, bool enabled, bool hasStore = false) // imp add hasStore
         {
             _enabled = enabled;
             _listItems.Clear();
             _amounts.Clear();
 
+            StoreButton.Visible = hasStore; // imp add
+
             if (inventory.Count == 0 && VendingContents.Visible)
             {
                 SearchBar.Visible = false;

Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs

@@ -4,6 +4,7 @@
 using Robust.Client.UserInterface;
 using Robust.Shared.Input;
 using System.Linq;
+using Content.Shared.Store.Components; // IMP ADD
 
 namespace Content.Client.VendingMachines
 {
@@ -26,6 +27,11 @@ protected override void Open()
             _menu = this.CreateWindowCenteredLeft<VendingMachineMenu>();
             _menu.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
             _menu.OnItemSelected += OnItemSelected;
+            // IMP ADD START
+            _menu.StoreButton.OnPressed += _ =>
+            {
+                SendMessage(new VendingStoreOpenMessage());
+            };
             Refresh();
         }
 
@@ -36,7 +42,9 @@ public void Refresh()
             var system = EntMan.System<VendingMachineSystem>();
             _cachedInventory = system.GetAllInventory(Owner);
 
-            _menu?.Populate(_cachedInventory, enabled);
+            var hasStore = EntMan.HasComponent<StoreComponent>(Owner); // imp add
+
+            _menu?.Populate(_cachedInventory, enabled, hasStore); // imp add hasStore
         }
 
         public void UpdateAmounts()

Content.Client/_Harmony/Conspirators/EntitySystems/ConspiratorSystem.cs

@@ -0,0 +1,34 @@
+using Content.Shared._Harmony.Conspirators.Components;
+using Content.Shared._Harmony.Conspirators.EntitySystems;
+using Content.Shared.Antag;
+using Content.Shared.StatusIcon.Components;
+using Robust.Client.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._Harmony.Conspirators.EntitySystems;
+
+public sealed class ConspiratorSystem : SharedConspiratorSystem
+{
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ConspiratorComponent, GetStatusIconsEvent>(OnConspiratorGetIcons);
+    }
+
+    private void OnConspiratorGetIcons(Entity<ConspiratorComponent> entity, ref GetStatusIconsEvent args)
+    {
+        if (_playerManager.LocalSession?.AttachedEntity is { } playerEntity)
+        {
+            if (!HasComp<ShowAntagIconsComponent>(playerEntity) &&
+                !HasComp<ConspiratorComponent>(playerEntity))
+                return;
+        }
+
+        if (_prototypeManager.TryIndex(entity.Comp.ConspiratorIcon, out var iconPrototype))
+            args.StatusIcons.Add(iconPrototype);
+    }
+}

Content.Client/_Impstation/StrangeMoods/Eui/SharedMoodsEui.cs

@@ -0,0 +1,79 @@
+using Content.Client.Eui;
+using Content.Shared._Impstation.StrangeMoods;
+using Content.Shared._Impstation.StrangeMoods.Eui;
+using Content.Shared.Eui;
+
+namespace Content.Client._Impstation.StrangeMoods.Eui;
+
+public sealed class SharedMoodsEui : BaseEui
+{
+    private readonly SharedMoodsUi _sharedMoodsUi;
+
+    public SharedMoodsEui()
+    {
+        _sharedMoodsUi = new SharedMoodsUi();
+        _sharedMoodsUi.OnCreateShared += CreateShared;
+        _sharedMoodsUi.OnSave += SaveMoods;
+        _sharedMoodsUi.OnSharedSelected += GetSharedMood;
+    }
+
+    private void CreateShared()
+    {
+        SendMessage(new SharedMoodsInitStartMessage());
+    }
+
+    private void SaveMoods()
+    {
+        var newMoods = _sharedMoodsUi.GetMoods();
+        var targetMood = _sharedMoodsUi.GetTargetMood();
+
+        if (targetMood is not { } target)
+            return;
+
+        SendMessage(new SharedMoodsSaveMessage(target, newMoods));
+        _sharedMoodsUi.SetMoods(newMoods);
+    }
+
+    private void GetSharedMood(SharedMood mood)
+    {
+        if (mood.UniqueId == null)
+            return;
+
+        SendMessage(new SharedMoodsRequestMessage(mood.UniqueId));
+    }
+
+    public override void Opened()
+    {
+        _sharedMoodsUi.OpenCentered();
+    }
+
+    public override void HandleMessage(EuiMessageBase msg)
+    {
+        base.HandleMessage(msg);
+
+        switch (msg)
+        {
+            case SharedMoodsSendMessage sendData:
+            {
+                if (sendData.Mood is not { } mood)
+                    return;
+
+                _sharedMoodsUi.SetMoods(mood.Moods);
+                break;
+            }
+            case SharedMoodsInitValidMessage initData:
+            {
+                _sharedMoodsUi.PopulateDropDown(initData.AllSharedMoods, initData.Mood);
+                break;
+            }
+        }
+    }
+
+    public override void HandleState(EuiStateBase state)
+    {
+        if (state is not SharedMoodsEuiState s)
+            return;
+
+        _sharedMoodsUi.PopulateDropDown(s.AllSharedMoods, s.MoodId);
+    }
+}

Content.Client/_Impstation/StrangeMoods/Eui/SharedMoodsInitEui.cs

@@ -0,0 +1,45 @@
+using Content.Client.Eui;
+using Content.Shared._Impstation.StrangeMoods.Eui;
+using Content.Shared.Eui;
+
+namespace Content.Client._Impstation.StrangeMoods.Eui;
+
+public sealed class SharedMoodsInitEui : BaseEui
+{
+    private readonly SharedMoodsInitUi _sharedMoodsUi;
+
+    public SharedMoodsInitEui()
+    {
+        _sharedMoodsUi = new SharedMoodsInitUi();
+        _sharedMoodsUi.OnNameAccepted += AcceptName;
+    }
+
+    private void AcceptName(string name)
+    {
+        SendMessage(new SharedMoodsInitAcceptMessage(name));
+    }
+
+    public override void Opened()
+    {
+        _sharedMoodsUi.OpenCentered();
+    }
+
+    public override void HandleMessage(EuiMessageBase msg)
+    {
+        base.HandleMessage(msg);
+
+        switch (msg)
+        {
+            case SharedMoodsInitValidMessage:
+            {
+                _sharedMoodsUi.Close();
+                break;
+            }
+            case SharedMoodsInitErrorMessage:
+            {
+                _sharedMoodsUi.ShowError();
+                break;
+            }
+        }
+    }
+}