diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2e90f0eed03..f248264219c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,18 +3,36 @@
# C# code
/Content.*/ @DeltaV-Station/maintainers
+# Any assets
+/Resources/ @DeltaV-Station/maintainers
+
+# Server config files
+/Resources/ConfigPresets/ @MilonPL
+
# YML files
/Resources/*.yml @DeltaV-Station/yaml-maintainers
/Resources/**/*.yml @DeltaV-Station/yaml-maintainers
# Sprites
-/Resources/Textures/ @IamVelcroboy
+/Resources/Textures/ @DeltaV-Station/direction
# Lobby art and music - automatically direction issues since its immediately visible to players
-/Resources/Audio/Lobby/ @DeltaV-Station/game-directors
-/Resources/Textures/LobbyScreens/ @DeltaV-Station/game-directors
+/Resources/Audio/Lobby/ @DeltaV-Station/direction
+/Resources/Textures/LobbyScreens/ @DeltaV-Station/direction
# Maps
/Resources/Maps/ @DeltaV-Station/maptainers
/Resources/Prototypes/Maps/ @DeltaV-Station/maptainers
/Content.IntegrationTests/Tests/PostMapInitTest.cs @DeltaV-Station/maptainers
+
+# Server rules
+/Resources/ServerInfo/Guidebook/DeltaV/Rules/ @DeltaV-Station/head-administrators
+
+# Tools and scripts
+/Tools/ @deltanedas @MilonPL
+
+# Workflows, codeowners, templates, etc.
+/.github/ @deltanedas @MilonPL
+
+# Standalone files in the root repo
+/* @deltanedas
diff --git a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
index 050756fcd14..93ce5538aa1 100644
--- a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
+++ b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
@@ -26,6 +26,13 @@ protected override void Open()
_window.OnNameChanged += OnNameChanged;
_window.OnJobChanged += OnJobChanged;
_window.OnJobIconChanged += OnJobIconChanged;
+ _window.OnNumberChanged += OnNumberChanged; // DeltaV
+ }
+
+ // DeltaV - Add number change handler
+ private void OnNumberChanged(uint newNumber)
+ {
+ SendMessage(new AgentIDCardNumberChangedMessage(newNumber));
}
private void OnNameChanged(string newName)
@@ -56,6 +63,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
_window.SetCurrentName(cast.CurrentName);
_window.SetCurrentJob(cast.CurrentJob);
_window.SetAllowedIcons(cast.CurrentJobIconId);
+ _window.SetCurrentNumber(cast.CurrentNumber); // DeltaV
}
}
}
diff --git a/Content.Client/Access/UI/AgentIDCardWindow.xaml b/Content.Client/Access/UI/AgentIDCardWindow.xaml
index 7d091e4e165..a2ddd1c417d 100644
--- a/Content.Client/Access/UI/AgentIDCardWindow.xaml
+++ b/Content.Client/Access/UI/AgentIDCardWindow.xaml
@@ -6,6 +6,10 @@
+
+
+
+
diff --git a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
index 320bb88a67e..a342013d314 100644
--- a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
+++ b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
@@ -21,9 +21,13 @@ public sealed partial class AgentIDCardWindow : DefaultWindow
private const int JobIconColumnCount = 10;
+ private const int MaxNumberLength = 4; // DeltaV - Same as NewChatPopup
+
public event Action? OnNameChanged;
public event Action? OnJobChanged;
+ public event Action? OnNumberChanged; // DeltaV - Add event for number changes
+
public event Action>? OnJobIconChanged;
public AgentIDCardWindow()
@@ -37,6 +41,37 @@ public AgentIDCardWindow()
JobLineEdit.OnTextEntered += e => OnJobChanged?.Invoke(e.Text);
JobLineEdit.OnFocusExit += e => OnJobChanged?.Invoke(e.Text);
+
+ // DeltaV - Add handlers for number changes
+ NumberLineEdit.OnTextEntered += OnNumberEntered;
+ NumberLineEdit.OnFocusExit += OnNumberEntered;
+
+ // DeltaV - Filter to only allow digits
+ NumberLineEdit.OnTextChanged += args =>
+ {
+ if (args.Text.Length > MaxNumberLength)
+ {
+ NumberLineEdit.Text = args.Text[..MaxNumberLength];
+ }
+
+ // Filter to digits only
+ var newText = string.Concat(args.Text.Where(char.IsDigit));
+ if (newText != args.Text)
+ NumberLineEdit.Text = newText;
+ };
+ }
+
+ // DeltaV - Add number validation and event
+ private void OnNumberEntered(LineEdit.LineEditEventArgs args)
+ {
+ if (uint.TryParse(args.Text, out var number) && number > 0)
+ OnNumberChanged?.Invoke(number);
+ }
+
+ // DeltaV - Add setter for current number
+ public void SetCurrentNumber(uint? number)
+ {
+ NumberLineEdit.Text = number?.ToString("D4") ?? "";
}
public void SetAllowedIcons(string currentJobIconId)
diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs
index 57c861bd20f..a00b58f54f9 100644
--- a/Content.Client/Actions/ActionsSystem.cs
+++ b/Content.Client/Actions/ActionsSystem.cs
@@ -259,13 +259,13 @@ public void UnlinkAllActions()
public void LinkAllActions(ActionsComponent? actions = null)
{
- if (_playerManager.LocalEntity is not { } user ||
- !Resolve(user, ref actions, false))
- {
- return;
- }
+ if (_playerManager.LocalEntity is not { } user ||
+ !Resolve(user, ref actions, false))
+ {
+ return;
+ }
- LinkActions?.Invoke(actions);
+ LinkActions?.Invoke(actions);
}
public override void Shutdown()
diff --git a/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs b/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
index a412e47396b..c8e3afeb22c 100644
--- a/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
+++ b/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
@@ -159,6 +159,7 @@ private void OnTypeChanged(OptionButton.ItemSelectedEventArgs args)
SecretCheckBox.Pressed = false;
SeverityOption.Disabled = false;
PermanentCheckBox.Pressed = true;
+ SubmitButton.Disabled = true;
UpdatePermanentCheckboxFields();
break;
case (int) NoteType.Message: // Message: these are shown to the player when they log on
diff --git a/Content.Client/Atmos/Components/PipeColorVisualsComponent.cs b/Content.Client/Atmos/Components/PipeColorVisualsComponent.cs
index 355b10cb4a4..9b24b1adc25 100644
--- a/Content.Client/Atmos/Components/PipeColorVisualsComponent.cs
+++ b/Content.Client/Atmos/Components/PipeColorVisualsComponent.cs
@@ -1,8 +1,4 @@
-using Robust.Shared.GameObjects;
-
namespace Content.Client.Atmos.Components;
[RegisterComponent]
-public sealed partial class PipeColorVisualsComponent : Component
-{
-}
+public sealed partial class PipeColorVisualsComponent : Component;
diff --git a/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml b/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml
index 6bdfb3989f9..3dbe14e6b6d 100644
--- a/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml
+++ b/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml
@@ -1,6 +1,5 @@
@@ -62,7 +61,7 @@
-
+
diff --git a/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs b/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
index 79bb66560e3..e533ef2dce0 100644
--- a/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
+++ b/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
@@ -136,8 +136,9 @@ public void UpdateEntry(AtmosAlertsComputerEntry entry, bool isFocus, AtmosAlert
GasGridContainer.RemoveAllChildren();
var gasData = focusData.Value.GasData.Where(g => g.Key != Gas.Oxygen);
+ var keyValuePairs = gasData.ToList();
- if (gasData.Count() == 0)
+ if (keyValuePairs.Count == 0)
{
// No other gases
var gasLabel = new Label()
@@ -158,13 +159,11 @@ public void UpdateEntry(AtmosAlertsComputerEntry entry, bool isFocus, AtmosAlert
else
{
// Add an entry for each gas
- foreach ((var gas, (var mol, var percent, var alert)) in gasData)
+ foreach ((var gas, (var mol, var percent, var alert)) in keyValuePairs)
{
- var gasPercent = (FixedPoint2)0f;
- gasPercent = percent * 100f;
+ FixedPoint2 gasPercent = percent * 100f;
- if (!_gasShorthands.TryGetValue(gas, out var gasShorthand))
- gasShorthand = "X";
+ var gasShorthand = _gasShorthands.GetValueOrDefault(gas, "X");
var gasLabel = new Label()
{
diff --git a/Content.Client/Atmos/Consoles/AtmosAlertsComputerBoundUserInterface.cs b/Content.Client/Atmos/Consoles/AtmosAlertsComputerBoundUserInterface.cs
index 08cae979b9b..6f0e7f80da1 100644
--- a/Content.Client/Atmos/Consoles/AtmosAlertsComputerBoundUserInterface.cs
+++ b/Content.Client/Atmos/Consoles/AtmosAlertsComputerBoundUserInterface.cs
@@ -14,8 +14,6 @@ protected override void Open()
_menu = new AtmosAlertsComputerWindow(this, Owner);
_menu.OpenCentered();
_menu.OnClose += Close;
-
- EntMan.TryGetComponent(Owner, out var xform);
}
protected override void UpdateState(BoundUserInterfaceState state)
@@ -24,9 +22,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
var castState = (AtmosAlertsComputerBoundInterfaceState) state;
- if (castState == null)
- return;
-
EntMan.TryGetComponent(Owner, out var xform);
_menu?.UpdateUI(xform?.Coordinates, castState.AirAlarms, castState.FireAlarms, castState.FocusData);
}
diff --git a/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml b/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml
index 8824a776ee6..e5ede1b92e3 100644
--- a/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml
+++ b/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml
@@ -1,7 +1,6 @@
(OnInit);
- SubscribeLocalEvent(OnAppearanceChanged, after: new[] { typeof(SubFloorHideSystem) });
+ SubscribeLocalEvent(OnAppearanceChanged, after: [typeof(SubFloorHideSystem)]);
}
private void OnInit(EntityUid uid, PipeAppearanceComponent component, ComponentInit args)
@@ -84,7 +82,8 @@ private void OnAppearanceChanged(EntityUid uid, PipeAppearanceComponent componen
layer.Visible &= visible;
- if (!visible) continue;
+ if (!visible)
+ continue;
layer.Color = color;
}
diff --git a/Content.Client/Atmos/EntitySystems/GasPressurePumpSystem.cs b/Content.Client/Atmos/EntitySystems/GasPressurePumpSystem.cs
new file mode 100644
index 00000000000..54e16bc8621
--- /dev/null
+++ b/Content.Client/Atmos/EntitySystems/GasPressurePumpSystem.cs
@@ -0,0 +1,23 @@
+using Content.Client.Atmos.UI;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.EntitySystems;
+using Content.Shared.Atmos.Piping.Binary.Components;
+
+namespace Content.Client.Atmos.EntitySystems;
+
+public sealed class GasPressurePumpSystem : SharedGasPressurePumpSystem
+{
+ public override void Initialize()
+ {
+ base.Initialize();
+ SubscribeLocalEvent(OnPumpUpdate);
+ }
+
+ private void OnPumpUpdate(Entity ent, ref AfterAutoHandleStateEvent args)
+ {
+ if (UserInterfaceSystem.TryGetOpenUi(ent.Owner, GasPressurePumpUiKey.Key, out var bui))
+ {
+ bui.Update();
+ }
+ }
+}
diff --git a/Content.Client/Atmos/Monitor/AtmosAlarmableVisualsSystem.cs b/Content.Client/Atmos/Monitor/AtmosAlarmableVisualsSystem.cs
index 019f25f376b..18ca2234752 100644
--- a/Content.Client/Atmos/Monitor/AtmosAlarmableVisualsSystem.cs
+++ b/Content.Client/Atmos/Monitor/AtmosAlarmableVisualsSystem.cs
@@ -1,12 +1,7 @@
-using System.Collections.Generic;
using Content.Shared.Atmos.Monitor;
using Content.Shared.Power;
using Robust.Client.GameObjects;
using Robust.Client.Graphics;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Maths;
-using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Client.Atmos.Monitor;
@@ -27,7 +22,7 @@ protected override void OnAppearanceChange(EntityUid uid, AtmosAlarmableVisualsC
{
foreach (var visLayer in component.HideOnDepowered)
{
- if (args.Sprite.LayerMapTryGet(visLayer, out int powerVisibilityLayer))
+ if (args.Sprite.LayerMapTryGet(visLayer, out var powerVisibilityLayer))
args.Sprite.LayerSetVisible(powerVisibilityLayer, powered);
}
}
@@ -36,7 +31,7 @@ protected override void OnAppearanceChange(EntityUid uid, AtmosAlarmableVisualsC
{
foreach (var (setLayer, powerState) in component.SetOnDepowered)
{
- if (args.Sprite.LayerMapTryGet(setLayer, out int setStateLayer))
+ if (args.Sprite.LayerMapTryGet(setLayer, out var setStateLayer))
args.Sprite.LayerSetState(setStateLayer, new RSI.StateId(powerState));
}
}
diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs
index d9e94e373b4..650f96eec97 100644
--- a/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs
+++ b/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs
@@ -1,11 +1,7 @@
using Content.Shared.Atmos;
using Content.Shared.Atmos.Monitor;
using Content.Shared.Atmos.Monitor.Components;
-using Robust.Client.GameObjects;
using Robust.Client.UserInterface;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Log;
namespace Content.Client.Atmos.Monitor.UI;
@@ -78,6 +74,7 @@ protected override void Dispose(bool disposing)
{
base.Dispose(disposing);
- if (disposing) _window?.Dispose();
+ if (disposing)
+ _window?.Dispose();
}
}
diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
index e1425ac491b..65164983865 100644
--- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
@@ -8,7 +8,6 @@
using Content.Shared.Atmos.Piping.Unary.Components;
using Content.Shared.Temperature;
using Robust.Client.AutoGenerated;
-using Robust.Client.GameObjects;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
@@ -59,7 +58,7 @@ public AirAlarmWindow()
AirAlarmMode.Fill => "air-alarm-ui-mode-fill",
AirAlarmMode.Panic => "air-alarm-ui-mode-panic",
AirAlarmMode.None => "air-alarm-ui-mode-none",
- _ => "error"
+ _ => "error",
};
_modes.AddItem(Loc.GetString(text));
}
@@ -70,7 +69,7 @@ public AirAlarmWindow()
AirAlarmModeChanged!.Invoke((AirAlarmMode) args.Id);
};
- _autoMode.OnToggled += args =>
+ _autoMode.OnToggled += _ =>
{
AutoModeChanged!.Invoke(_autoMode.Pressed);
};
@@ -176,22 +175,18 @@ public void UpdateDeviceData(string addr, IAtmosDeviceData device)
public static Color ColorForThreshold(float amount, AtmosAlarmThreshold threshold)
{
- threshold.CheckThreshold(amount, out AtmosAlarmType curAlarm);
+ threshold.CheckThreshold(amount, out var curAlarm);
return ColorForAlarm(curAlarm);
}
public static Color ColorForAlarm(AtmosAlarmType curAlarm)
{
- if(curAlarm == AtmosAlarmType.Danger)
+ return curAlarm switch
{
- return StyleNano.DangerousRedFore;
- }
- else if(curAlarm == AtmosAlarmType.Warning)
- {
- return StyleNano.ConcerningOrangeFore;
- }
-
- return StyleNano.GoodGreenFore;
+ AtmosAlarmType.Danger => StyleNano.DangerousRedFore,
+ AtmosAlarmType.Warning => StyleNano.ConcerningOrangeFore,
+ _ => StyleNano.GoodGreenFore,
+ };
}
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs
index 17b03b84684..2cd51d6fc7f 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs
@@ -1,12 +1,8 @@
-using System;
-using Content.Shared.Atmos.Monitor;
using Content.Shared.Atmos.Monitor.Components;
using Content.Shared.Atmos.Piping.Unary.Components;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Localization;
namespace Content.Client.Atmos.Monitor.UI.Widgets;
@@ -25,7 +21,7 @@ public sealed partial class PumpControl : BoxContainer
private OptionButton _pressureCheck => CPressureCheck;
private FloatSpinBox _externalBound => CExternalBound;
private FloatSpinBox _internalBound => CInternalBound;
- private Button _copySettings => CCopySettings;
+ private Button _copySettings => CCopySettings;
public PumpControl(GasVentPumpData data, string address)
{
@@ -86,7 +82,7 @@ public PumpControl(GasVentPumpData data, string address)
_data.PressureChecks = (VentPressureBound) args.Id;
PumpDataChanged?.Invoke(_address, _data);
};
-
+
_copySettings.OnPressed += _ =>
{
PumpDataCopied?.Invoke(_data);
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs
index f2241bcd8da..c16ff688c93 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs
@@ -1,15 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
using Content.Shared.Atmos;
-using Content.Shared.Atmos.Monitor;
using Content.Shared.Atmos.Monitor.Components;
using Content.Shared.Atmos.Piping.Unary.Components;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Localization;
namespace Content.Client.Atmos.Monitor.UI.Widgets;
@@ -27,7 +21,7 @@ public sealed partial class ScrubberControl : BoxContainer
private OptionButton _pumpDirection => CPumpDirection;
private FloatSpinBox _volumeRate => CVolumeRate;
private CheckBox _wideNet => CWideNet;
- private Button _copySettings => CCopySettings;
+ private Button _copySettings => CCopySettings;
private GridContainer _gases => CGasContainer;
private Dictionary _gasControls = new();
@@ -77,7 +71,7 @@ public ScrubberControl(GasVentScrubberData data, string address)
_data.PumpDirection = (ScrubberPumpDirection) args.Id;
ScrubberDataChanged?.Invoke(_address, _data);
};
-
+
_copySettings.OnPressed += _ =>
{
ScrubberDataCopied?.Invoke(_data);
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs
index da602cd7479..9e60b6cea62 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs
@@ -43,7 +43,8 @@ public SensorInfo(AtmosSensorData data, string address)
var label = new RichTextLabel();
var fractionGas = amount / data.TotalMoles;
- label.SetMarkup(Loc.GetString("air-alarm-ui-gases-indicator", ("gas", $"{gas}"),
+ label.SetMarkup(Loc.GetString("air-alarm-ui-gases-indicator",
+ ("gas", $"{gas}"),
("color", AirAlarmWindow.ColorForThreshold(fractionGas, data.GasThresholds[gas])),
("amount", $"{amount:0.####}"),
("percentage", $"{(100 * fractionGas):0.##}")));
@@ -53,9 +54,9 @@ public SensorInfo(AtmosSensorData data, string address)
var threshold = data.GasThresholds[gas];
var gasThresholdControl = new ThresholdControl(Loc.GetString($"air-alarm-ui-thresholds-gas-title", ("gas", $"{gas}")), threshold, AtmosMonitorThresholdType.Gas, gas, 100);
gasThresholdControl.Margin = new Thickness(20, 2, 2, 2);
- gasThresholdControl.ThresholdDataChanged += (type, threshold, arg3) =>
+ gasThresholdControl.ThresholdDataChanged += (type, alarmThreshold, arg3) =>
{
- OnThresholdUpdate!(_address, type, threshold, arg3);
+ OnThresholdUpdate!(_address, type, alarmThreshold, arg3);
};
_gasThresholds.Add(gas, gasThresholdControl);
@@ -64,7 +65,8 @@ public SensorInfo(AtmosSensorData data, string address)
_pressureThreshold = new ThresholdControl(Loc.GetString("air-alarm-ui-thresholds-pressure-title"), data.PressureThreshold, AtmosMonitorThresholdType.Pressure);
PressureThresholdContainer.AddChild(_pressureThreshold);
- _temperatureThreshold = new ThresholdControl(Loc.GetString("air-alarm-ui-thresholds-temperature-title"), data.TemperatureThreshold,
+ _temperatureThreshold = new ThresholdControl(Loc.GetString("air-alarm-ui-thresholds-temperature-title"),
+ data.TemperatureThreshold,
AtmosMonitorThresholdType.Temperature);
TemperatureThresholdContainer.AddChild(_temperatureThreshold);
@@ -103,7 +105,8 @@ public void ChangeData(AtmosSensorData data)
}
var fractionGas = amount / data.TotalMoles;
- label.SetMarkup(Loc.GetString("air-alarm-ui-gases-indicator", ("gas", $"{gas}"),
+ label.SetMarkup(Loc.GetString("air-alarm-ui-gases-indicator",
+ ("gas", $"{gas}"),
("color", AirAlarmWindow.ColorForThreshold(fractionGas, data.GasThresholds[gas])),
("amount", $"{amount:0.####}"),
("percentage", $"{(100 * fractionGas):0.##}")));
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml.cs
index 3612d84de4c..55f7c008987 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml.cs
@@ -1,7 +1,4 @@
-using Content.Client.Message;
-using Content.Shared.Atmos;
using Content.Shared.Atmos.Monitor;
-using Content.Shared.Temperature;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml.cs
index 78c73fa573a..651620f3e25 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml.cs
@@ -1,12 +1,8 @@
-using System;
using Content.Shared.Atmos;
using Content.Shared.Atmos.Monitor;
-using Content.Shared.Atmos.Monitor.Components;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Localization;
// holy FUCK
// this technically works because some of this you can *not* do in XAML but holy FUCK
@@ -115,29 +111,38 @@ public ThresholdControl(string name, AtmosAlarmThreshold threshold, AtmosMonitor
_enabled.Pressed = !_threshold.Ignore;
}
- private String LabelForBound(string boundType) //, DebugMessage)> state) =>
{
if (_system.TileData.TryGetValue(uid, out var data))
diff --git a/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs b/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs
index 220fdbe875c..0c07eec4025 100644
--- a/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs
+++ b/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs
@@ -1,65 +1,63 @@
using Content.Shared.Atmos;
+using Content.Shared.Atmos.Components;
using Content.Shared.Atmos.Piping.Binary.Components;
+using Content.Shared.IdentityManagement;
using Content.Shared.Localizations;
using JetBrains.Annotations;
-using Robust.Client.GameObjects;
using Robust.Client.UserInterface;
-namespace Content.Client.Atmos.UI
+namespace Content.Client.Atmos.UI;
+
+///
+/// Initializes a and updates it when new server messages are received.
+///
+[UsedImplicitly]
+public sealed class GasPressurePumpBoundUserInterface : BoundUserInterface
{
- ///
- /// Initializes a and updates it when new server messages are received.
- ///
- [UsedImplicitly]
- public sealed class GasPressurePumpBoundUserInterface : BoundUserInterface
- {
- [ViewVariables]
- private const float MaxPressure = Atmospherics.MaxOutputPressure;
+ [ViewVariables]
+ private const float MaxPressure = Atmospherics.MaxOutputPressure;
+
+ [ViewVariables]
+ private GasPressurePumpWindow? _window;
- [ViewVariables]
- private GasPressurePumpWindow? _window;
+ public GasPressurePumpBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+ {
+ }
- public GasPressurePumpBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
- {
- }
+ protected override void Open()
+ {
+ base.Open();
- protected override void Open()
- {
- base.Open();
+ _window = this.CreateWindow();
- _window = this.CreateWindow();
+ _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed;
+ _window.PumpOutputPressureChanged += OnPumpOutputPressurePressed;
+ Update();
+ }
- _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed;
- _window.PumpOutputPressureChanged += OnPumpOutputPressurePressed;
- }
+ public void Update()
+ {
+ if (_window == null)
+ return;
- private void OnToggleStatusButtonPressed()
- {
- if (_window is null) return;
- SendMessage(new GasPressurePumpToggleStatusMessage(_window.PumpStatus));
- }
+ _window.Title = Identity.Name(Owner, EntMan);
- private void OnPumpOutputPressurePressed(string value)
- {
- var pressure = UserInputParser.TryFloat(value, out var parsed) ? parsed : 0f;
- if (pressure > MaxPressure) pressure = MaxPressure;
+ if (!EntMan.TryGetComponent(Owner, out GasPressurePumpComponent? pump))
+ return;
- SendMessage(new GasPressurePumpChangeOutputPressureMessage(pressure));
- }
+ _window.SetPumpStatus(pump.Enabled);
+ _window.MaxPressure = pump.MaxTargetPressure;
+ _window.SetOutputPressure(pump.TargetPressure);
+ }
- ///
- /// Update the UI state based on server-sent info
- ///
- ///
- protected override void UpdateState(BoundUserInterfaceState state)
- {
- base.UpdateState(state);
- if (_window == null || state is not GasPressurePumpBoundUserInterfaceState cast)
- return;
+ private void OnToggleStatusButtonPressed()
+ {
+ if (_window is null) return;
+ SendPredictedMessage(new GasPressurePumpToggleStatusMessage(_window.PumpStatus));
+ }
- _window.Title = (cast.PumpLabel);
- _window.SetPumpStatus(cast.Enabled);
- _window.SetOutputPressure(cast.OutputPressure);
- }
+ private void OnPumpOutputPressurePressed(float value)
+ {
+ SendPredictedMessage(new GasPressurePumpChangeOutputPressureMessage(value));
}
}
diff --git a/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml b/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml
index a0896a7b41e..f2c2c7cec50 100644
--- a/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml
+++ b/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml
@@ -1,22 +1,18 @@
-
+ xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+ SetSize="340 110" MinSize="340 110" Title="Pressure Pump">
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
-
+
diff --git a/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml.cs b/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml.cs
index b5ffcd10721..aa86a1aa03b 100644
--- a/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml.cs
+++ b/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml.cs
@@ -1,14 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using Content.Client.Atmos.EntitySystems;
+using Content.Client.UserInterface.Controls;
using Content.Shared.Atmos;
-using Content.Shared.Atmos.Prototypes;
using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Localization;
namespace Content.Client.Atmos.UI
{
@@ -16,12 +10,25 @@ namespace Content.Client.Atmos.UI
/// Client-side UI used to control a gas pressure pump.
///
[GenerateTypedNameReferences]
- public sealed partial class GasPressurePumpWindow : DefaultWindow
+ public sealed partial class GasPressurePumpWindow : FancyWindow
{
public bool PumpStatus = true;
public event Action? ToggleStatusButtonPressed;
- public event Action? PumpOutputPressureChanged;
+ public event Action? PumpOutputPressureChanged;
+
+ public float MaxPressure
+ {
+ get => _maxPressure;
+ set
+ {
+ _maxPressure = value;
+
+ PumpPressureOutputInput.Value = MathF.Min(value, PumpPressureOutputInput.Value);
+ }
+ }
+
+ private float _maxPressure = Atmospherics.MaxOutputPressure;
public GasPressurePumpWindow()
{
@@ -30,23 +37,25 @@ public GasPressurePumpWindow()
ToggleStatusButton.OnPressed += _ => SetPumpStatus(!PumpStatus);
ToggleStatusButton.OnPressed += _ => ToggleStatusButtonPressed?.Invoke();
- PumpPressureOutputInput.OnTextChanged += _ => SetOutputPressureButton.Disabled = false;
+ PumpPressureOutputInput.OnValueChanged += _ => SetOutputPressureButton.Disabled = false;
+
SetOutputPressureButton.OnPressed += _ =>
{
- PumpOutputPressureChanged?.Invoke(PumpPressureOutputInput.Text ??= "");
+ PumpPressureOutputInput.Value = Math.Clamp(PumpPressureOutputInput.Value, 0f, _maxPressure);
+ PumpOutputPressureChanged?.Invoke(PumpPressureOutputInput.Value);
SetOutputPressureButton.Disabled = true;
};
SetMaxPressureButton.OnPressed += _ =>
{
- PumpPressureOutputInput.Text = Atmospherics.MaxOutputPressure.ToString(CultureInfo.CurrentCulture);
+ PumpPressureOutputInput.Value = _maxPressure;
SetOutputPressureButton.Disabled = false;
};
}
public void SetOutputPressure(float pressure)
{
- PumpPressureOutputInput.Text = pressure.ToString(CultureInfo.CurrentCulture);
+ PumpPressureOutputInput.Value = pressure;
}
public void SetPumpStatus(bool enabled)
diff --git a/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs
index 44c40143d83..04075000f5b 100644
--- a/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs
+++ b/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs
@@ -39,6 +39,6 @@ protected override void UpdateState(BoundUserInterfaceState message)
if (message is not CargoBountyConsoleState state)
return;
- _menu?.UpdateEntries(state.Bounties, state.UntilNextSkip);
+ _menu?.UpdateEntries(state.Bounties, state.History, state.UntilNextSkip);
}
}
diff --git a/Content.Client/Cargo/UI/BountyHistoryEntry.xaml b/Content.Client/Cargo/UI/BountyHistoryEntry.xaml
new file mode 100644
index 00000000000..eee8c5cc165
--- /dev/null
+++ b/Content.Client/Cargo/UI/BountyHistoryEntry.xaml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/Cargo/UI/BountyHistoryEntry.xaml.cs b/Content.Client/Cargo/UI/BountyHistoryEntry.xaml.cs
new file mode 100644
index 00000000000..f3c9bbfafb1
--- /dev/null
+++ b/Content.Client/Cargo/UI/BountyHistoryEntry.xaml.cs
@@ -0,0 +1,54 @@
+using Content.Client.Message;
+using Content.Shared.Cargo;
+using Content.Shared.Cargo.Prototypes;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Cargo.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class BountyHistoryEntry : BoxContainer
+{
+ [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+ public BountyHistoryEntry(CargoBountyHistoryData bounty)
+ {
+ RobustXamlLoader.Load(this);
+ IoCManager.InjectDependencies(this);
+
+ if (!_prototype.TryIndex(bounty.Bounty, out var bountyPrototype))
+ return;
+
+ var items = new List();
+ foreach (var entry in bountyPrototype.Entries)
+ {
+ items.Add(Loc.GetString("bounty-console-manifest-entry",
+ ("amount", entry.Amount),
+ ("item", Loc.GetString(entry.Name))));
+ }
+ ManifestLabel.SetMarkup(Loc.GetString("bounty-console-manifest-label", ("item", string.Join(", ", items))));
+ RewardLabel.SetMarkup(Loc.GetString("bounty-console-reward-label", ("reward", bountyPrototype.Reward)));
+ IdLabel.SetMarkup(Loc.GetString("bounty-console-id-label", ("id", bounty.Id)));
+
+ var stationTime = bounty.Timestamp.ToString("hh\\:mm\\:ss");
+ if (bounty.ActorName == null)
+ {
+ StatusLabel.SetMarkup(Loc.GetString("bounty-console-history-completed-label"));
+ NoticeLabel.SetMarkup(Loc.GetString("bounty-console-history-notice-completed-label", ("time", stationTime)));
+ }
+ else
+ {
+ StatusLabel.SetMarkup(Loc.GetString("bounty-console-history-skipped-label"));
+ NoticeLabel.SetMarkup(Loc.GetString("bounty-console-history-notice-skipped-label",
+ ("id", bounty.ActorName),
+ ("time", stationTime)));
+ }
+ }
+ protected override void FrameUpdate(FrameEventArgs args)
+ {
+ base.FrameUpdate(args);
+ }
+}
diff --git a/Content.Client/Cargo/UI/CargoBountyMenu.xaml b/Content.Client/Cargo/UI/CargoBountyMenu.xaml
index bb263ff6c4a..0f093d5f8e7 100644
--- a/Content.Client/Cargo/UI/CargoBountyMenu.xaml
+++ b/Content.Client/Cargo/UI/CargoBountyMenu.xaml
@@ -11,15 +11,26 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs b/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs
index 3767b45e4be..0717aacc5e6 100644
--- a/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs
@@ -17,8 +17,11 @@ public CargoBountyMenu()
RobustXamlLoader.Load(this);
}
- public void UpdateEntries(List bounties, TimeSpan untilNextSkip)
+ public void UpdateEntries(List bounties, List history, TimeSpan untilNextSkip)
{
+ MasterTabContainer.SetTabTitle(0, Loc.GetString("bounty-console-tab-available-label"));
+ MasterTabContainer.SetTabTitle(1, Loc.GetString("bounty-console-tab-history-label"));
+
BountyEntriesContainer.Children.Clear();
foreach (var b in bounties)
{
@@ -32,5 +35,12 @@ public void UpdateEntries(List bounties, TimeSpan untilNextSkip
{
MinHeight = 10
});
+
+ BountyHistoryContainer.Children.Clear();
+ foreach (var h in history)
+ {
+ var entry = new BountyHistoryEntry(h);
+ BountyHistoryContainer.AddChild(entry);
+ }
}
}
diff --git a/Content.Client/CartridgeLoader/Cartridges/LogProbeUi.cs b/Content.Client/CartridgeLoader/Cartridges/LogProbeUi.cs
index d28d3228c94..aaf3900beee 100644
--- a/Content.Client/CartridgeLoader/Cartridges/LogProbeUi.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/LogProbeUi.cs
@@ -23,6 +23,6 @@ public override void UpdateState(BoundUserInterfaceState state)
if (state is not LogProbeUiState logProbeUiState)
return;
- _fragment?.UpdateState(logProbeUiState.PulledLogs);
+ _fragment?.UpdateState(logProbeUiState); // DeltaV - just take the state
}
}
diff --git a/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml b/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml
index d12fb55cdce..a0769590e91 100644
--- a/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml
+++ b/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml
@@ -9,10 +9,30 @@
BorderColor="#5a5a5a"
BorderThickness="0 0 0 1"/>
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml.cs b/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml.cs
index b22e0bc1964..5fa93bb40db 100644
--- a/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml.cs
@@ -1,4 +1,7 @@
-using Content.Shared.CartridgeLoader.Cartridges;
+using System.Linq; // DeltaV
+using Content.Client.DeltaV.CartridgeLoader.Cartridges; // DeltaV
+using Content.Shared.CartridgeLoader.Cartridges;
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges; // DeltaV
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
@@ -13,10 +16,112 @@ public LogProbeUiFragment()
RobustXamlLoader.Load(this);
}
- public void UpdateState(List logs)
+ // DeltaV begin - Update to handle both types of data
+ public void UpdateState(LogProbeUiState state)
{
ProbedDeviceContainer.RemoveAllChildren();
+ if (state.NanoChatData != null)
+ {
+ SetupNanoChatView(state.NanoChatData.Value);
+ DisplayNanoChatData(state.NanoChatData.Value);
+ }
+ else
+ {
+ SetupAccessLogView();
+ if (state.PulledLogs.Count > 0)
+ DisplayAccessLogs(state.PulledLogs);
+ }
+ }
+
+ private void SetupNanoChatView(NanoChatData data)
+ {
+ TitleLabel.Text = Loc.GetString("log-probe-header-nanochat");
+ ContentLabel.Text = Loc.GetString("log-probe-label-message");
+
+ // Show card info if available
+ var cardInfo = new List();
+ if (data.CardNumber != null)
+ cardInfo.Add(Loc.GetString("log-probe-card-number", ("number", $"#{data.CardNumber:D4}")));
+
+ // Add recipient count
+ cardInfo.Add(Loc.GetString("log-probe-recipients", ("count", data.Recipients.Count)));
+
+ CardNumberLabel.Text = string.Join(" | ", cardInfo);
+ CardNumberLabel.Visible = true;
+ }
+
+ private void SetupAccessLogView()
+ {
+ TitleLabel.Text = Loc.GetString("log-probe-header-access");
+ ContentLabel.Text = Loc.GetString("log-probe-label-accessor");
+ CardNumberLabel.Visible = false;
+ }
+
+ private void DisplayNanoChatData(NanoChatData data)
+ {
+ // First add a recipient list entry
+ var recipientsList = Loc.GetString("log-probe-recipient-list") + "\n" + string.Join("\n",
+ data.Recipients.Values
+ .OrderBy(r => r.Name)
+ .Select(r => $" {r.Name}" +
+ (string.IsNullOrEmpty(r.JobTitle) ? "" : $" ({r.JobTitle})") +
+ $" | #{r.Number:D4}"));
+
+ var recipientsEntry = new LogProbeUiEntry(0, "---", recipientsList);
+ ProbedDeviceContainer.AddChild(recipientsEntry);
+
+ var count = 1;
+ foreach (var (partnerId, messages) in data.Messages)
+ {
+ // Show only successfully delivered incoming messages
+ var incomingMessages = messages
+ .Where(msg => msg.SenderId == partnerId && !msg.DeliveryFailed)
+ .OrderByDescending(msg => msg.Timestamp);
+
+ foreach (var msg in incomingMessages)
+ {
+ var messageText = Loc.GetString("log-probe-message-format",
+ ("sender", $"#{msg.SenderId:D4}"),
+ ("recipient", $"#{data.CardNumber:D4}"),
+ ("content", msg.Content));
+
+ var entry = new NanoChatLogEntry(
+ count,
+ TimeSpan.FromSeconds(Math.Truncate(msg.Timestamp.TotalSeconds)).ToString(),
+ messageText);
+
+ ProbedDeviceContainer.AddChild(entry);
+ count++;
+ }
+
+ // Show only successfully delivered outgoing messages
+ var outgoingMessages = messages
+ .Where(msg => msg.SenderId == data.CardNumber && !msg.DeliveryFailed)
+ .OrderByDescending(msg => msg.Timestamp);
+
+ foreach (var msg in outgoingMessages)
+ {
+ var messageText = Loc.GetString("log-probe-message-format",
+ ("sender", $"#{msg.SenderId:D4}"),
+ ("recipient", $"#{partnerId:D4}"),
+ ("content", msg.Content));
+
+ var entry = new NanoChatLogEntry(
+ count,
+ TimeSpan.FromSeconds(Math.Truncate(msg.Timestamp.TotalSeconds)).ToString(),
+ messageText);
+
+ ProbedDeviceContainer.AddChild(entry);
+ count++;
+ }
+ }
+ }
+ // DeltaV end
+
+ // DeltaV - Handle this in a separate method
+ private void DisplayAccessLogs(List logs)
+ {
//Reverse the list so the oldest entries appear at the bottom
logs.Reverse();
diff --git a/Content.Client/Clothing/FlippableClothingVisualizerSystem.cs b/Content.Client/Clothing/FlippableClothingVisualizerSystem.cs
index 2c3afb0324f..1f09ae9eebb 100644
--- a/Content.Client/Clothing/FlippableClothingVisualizerSystem.cs
+++ b/Content.Client/Clothing/FlippableClothingVisualizerSystem.cs
@@ -7,7 +7,7 @@
namespace Content.Client.Clothing;
-public sealed class FlippableClothingVisualizerSystem : VisualizerSystem
+public sealed class FlippableClothingVisualizerSystem : VisualizerSystem
{
[Dependency] private readonly SharedItemSystem _itemSys = default!;
diff --git a/Content.Client/Construction/UI/ConstructionMenu.xaml b/Content.Client/Construction/UI/ConstructionMenu.xaml
index 6e4438cf6fd..a934967a533 100644
--- a/Content.Client/Construction/UI/ConstructionMenu.xaml
+++ b/Content.Client/Construction/UI/ConstructionMenu.xaml
@@ -1,15 +1,20 @@
-
+
+
+
+
-
-
+
+
+
+
+
diff --git a/Content.Client/Construction/UI/ConstructionMenu.xaml.cs b/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
index f0cb8148762..9ab8a156005 100644
--- a/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
+++ b/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
@@ -25,11 +25,16 @@ public interface IConstructionMenuView : IDisposable
OptionButton OptionCategories { get; }
bool EraseButtonPressed { get; set; }
+ bool GridViewButtonPressed { get; set; }
bool BuildButtonPressed { get; set; }
ItemList Recipes { get; }
ItemList RecipeStepList { get; }
+
+ ScrollContainer RecipesGridScrollContainer { get; }
+ GridContainer RecipesGrid { get; }
+
event EventHandler<(string search, string catagory)> PopulateRecipes;
event EventHandler RecipeSelected;
event EventHandler RecipeFavorited;
@@ -72,9 +77,16 @@ public bool EraseButtonPressed
set => EraseButton.Pressed = value;
}
+ public bool GridViewButtonPressed
+ {
+ get => MenuGridViewButton.Pressed;
+ set => MenuGridViewButton.Pressed = value;
+ }
+
public ConstructionMenu()
{
- SetSize = MinSize = new Vector2(720, 320);
+ SetSize = new Vector2(560, 450);
+ MinSize = new Vector2(560, 320);
IoCManager.InjectDependencies(this);
RobustXamlLoader.Load(this);
@@ -102,6 +114,9 @@ public ConstructionMenu()
EraseButton.OnToggled += args => EraseButtonToggled?.Invoke(this, args.Pressed);
FavoriteButton.OnPressed += args => RecipeFavorited?.Invoke(this, EventArgs.Empty);
+
+ MenuGridViewButton.OnPressed += _ =>
+ PopulateRecipes?.Invoke(this, (SearchBar.Text, Categories[OptionCategories.SelectedId]));
}
public event EventHandler? ClearAllGhosts;
diff --git a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
index c315cdedb2c..d35e8fbe769 100644
--- a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
+++ b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
@@ -1,7 +1,8 @@
using System.Linq;
+using System.Numerics;
+using Content.Client.Stylesheets;
using Content.Client.UserInterface.Systems.MenuBar.Widgets;
using Content.Shared.Construction.Prototypes;
-using Content.Shared.Tag;
using Content.Shared.Whitelist;
using Robust.Client.GameObjects;
using Robust.Client.Graphics;
@@ -11,7 +12,6 @@
using Robust.Client.UserInterface.Controls;
using Robust.Client.Utility;
using Robust.Shared.Enums;
-using Robust.Shared.Graphics;
using Robust.Shared.Prototypes;
using static Robust.Client.UserInterface.Controls.BaseButton;
@@ -33,10 +33,12 @@ internal sealed class ConstructionMenuPresenter : IDisposable
private readonly IConstructionMenuView _constructionView;
private readonly EntityWhitelistSystem _whitelistSystem;
+ private readonly SpriteSystem _spriteSystem;
private ConstructionSystem? _constructionSystem;
private ConstructionPrototype? _selected;
private List _favoritedRecipes = [];
+ private Dictionary _recipeButtons = new();
private string _selectedCategory = string.Empty;
private string _favoriteCatName = "construction-category-favorites";
private string _forAllCategoryName = "construction-category-all";
@@ -85,6 +87,7 @@ public ConstructionMenuPresenter()
IoCManager.InjectDependencies(this);
_constructionView = new ConstructionMenu();
_whitelistSystem = _entManager.System();
+ _spriteSystem = _entManager.System();
// This is required so that if we load after the system is initialized, we can bind to it immediately
if (_systemManager.TryGetEntitySystem(out var constructionSystem))
@@ -150,12 +153,24 @@ private void OnViewRecipeSelected(object? sender, ItemList.Item? item)
PopulateInfo(_selected);
}
+ private void OnGridViewRecipeSelected(object? sender, ConstructionPrototype? recipe)
+ {
+ if (recipe is null)
+ {
+ _selected = null;
+ _constructionView.ClearRecipeInfo();
+ return;
+ }
+
+ _selected = recipe;
+ if (_placementManager.IsActive && !_placementManager.Eraser) UpdateGhostPlacement();
+ PopulateInfo(_selected);
+ }
+
private void OnViewPopulateRecipes(object? sender, (string search, string catagory) args)
{
var (search, category) = args;
- var recipesList = _constructionView.Recipes;
- recipesList.Clear();
var recipes = new List();
var isEmptyCategory = string.IsNullOrEmpty(category) || category == _forAllCategoryName;
@@ -201,12 +216,73 @@ private void OnViewPopulateRecipes(object? sender, (string search, string catago
recipes.Sort((a, b) => string.Compare(a.Name, b.Name, StringComparison.InvariantCulture));
- foreach (var recipe in recipes)
+ var recipesList = _constructionView.Recipes;
+ recipesList.Clear();
+
+ var recipesGrid = _constructionView.RecipesGrid;
+ recipesGrid.RemoveAllChildren();
+
+ _constructionView.RecipesGridScrollContainer.Visible = _constructionView.GridViewButtonPressed;
+ _constructionView.Recipes.Visible = !_constructionView.GridViewButtonPressed;
+
+ if (_constructionView.GridViewButtonPressed)
+ {
+ foreach (var recipe in recipes)
+ {
+ var itemButton = new TextureButton
+ {
+ TextureNormal = _spriteSystem.Frame0(recipe.Icon),
+ VerticalAlignment = Control.VAlignment.Center,
+ Name = recipe.Name,
+ ToolTip = recipe.Name,
+ Scale = new Vector2(1.35f),
+ ToggleMode = true,
+ };
+ var itemButtonPanelContainer = new PanelContainer
+ {
+ PanelOverride = new StyleBoxFlat { BackgroundColor = StyleNano.ButtonColorDefault },
+ Children = { itemButton },
+ };
+
+ itemButton.OnToggled += buttonToggledEventArgs =>
+ {
+ SelectGridButton(itemButton, buttonToggledEventArgs.Pressed);
+
+ if (buttonToggledEventArgs.Pressed &&
+ _selected != null &&
+ _recipeButtons.TryGetValue(_selected.Name, out var oldButton))
+ {
+ oldButton.Pressed = false;
+ SelectGridButton(oldButton, false);
+ }
+
+ OnGridViewRecipeSelected(this, buttonToggledEventArgs.Pressed ? recipe : null);
+ };
+
+ recipesGrid.AddChild(itemButtonPanelContainer);
+ _recipeButtons[recipe.Name] = itemButton;
+ var isCurrentButtonSelected = _selected == recipe;
+ itemButton.Pressed = isCurrentButtonSelected;
+ SelectGridButton(itemButton, isCurrentButtonSelected);
+ }
+ }
+ else
{
- recipesList.Add(GetItem(recipe, recipesList));
+ foreach (var recipe in recipes)
+ {
+ recipesList.Add(GetItem(recipe, recipesList));
+ }
}
+ }
+
+ private void SelectGridButton(TextureButton button, bool select)
+ {
+ if (button.Parent is not PanelContainer buttonPanel)
+ return;
- // There is apparently no way to set which
+ button.Modulate = select ? Color.Green : Color.White;
+ var buttonColor = select ? StyleNano.ButtonColorDefault : Color.Transparent;
+ buttonPanel.PanelOverride = new StyleBoxFlat { BackgroundColor = buttonColor };
}
private void PopulateCategories(string? selectCategory = null)
@@ -257,11 +333,10 @@ private void PopulateCategories(string? selectCategory = null)
private void PopulateInfo(ConstructionPrototype prototype)
{
- var spriteSys = _systemManager.GetEntitySystem();
_constructionView.ClearRecipeInfo();
_constructionView.SetRecipeInfo(
- prototype.Name, prototype.Description, spriteSys.Frame0(prototype.Icon),
+ prototype.Name, prototype.Description, _spriteSystem.Frame0(prototype.Icon),
prototype.Type != ConstructionType.Item,
!_favoritedRecipes.Contains(prototype));
@@ -274,7 +349,6 @@ private void GenerateStepList(ConstructionPrototype prototype, ItemList stepList
if (_constructionSystem?.GetGuide(prototype) is not { } guide)
return;
- var spriteSys = _systemManager.GetEntitySystem();
foreach (var entry in guide.Entries)
{
@@ -290,20 +364,20 @@ private void GenerateStepList(ConstructionPrototype prototype, ItemList stepList
// The padding needs to be applied regardless of text length... (See PadLeft documentation)
text = text.PadLeft(text.Length + entry.Padding);
- var icon = entry.Icon != null ? spriteSys.Frame0(entry.Icon) : Texture.Transparent;
+ var icon = entry.Icon != null ? _spriteSystem.Frame0(entry.Icon) : Texture.Transparent;
stepList.AddItem(text, icon, false);
}
}
- private static ItemList.Item GetItem(ConstructionPrototype recipe, ItemList itemList)
+ private ItemList.Item GetItem(ConstructionPrototype recipe, ItemList itemList)
{
return new(itemList)
{
Metadata = recipe,
Text = recipe.Name,
- Icon = recipe.Icon.Frame0(),
+ Icon = _spriteSystem.Frame0(recipe.Icon),
TooltipEnabled = true,
- TooltipText = recipe.Description
+ TooltipText = recipe.Description,
};
}
diff --git a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
index e5be0b1811f..44501767dd4 100644
--- a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
+++ b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
@@ -31,7 +31,7 @@ protected override void Open()
private void PopulateCrayons()
{
var crayonDecals = _protoManager.EnumeratePrototypes().Where(x => x.Tags.Contains("crayon"));
- _menu?.Populate(crayonDecals);
+ _menu?.Populate(crayonDecals.ToList());
}
public override void OnProtoReload(PrototypesReloadedEventArgs args)
@@ -44,6 +44,16 @@ public override void OnProtoReload(PrototypesReloadedEventArgs args)
PopulateCrayons();
}
+ protected override void ReceiveMessage(BoundUserInterfaceMessage message)
+ {
+ base.ReceiveMessage(message);
+
+ if (_menu is null || message is not CrayonUsedMessage crayonMessage)
+ return;
+
+ _menu.AdvanceState(crayonMessage.DrawnDecal);
+ }
+
protected override void UpdateState(BoundUserInterfaceState state)
{
base.UpdateState(state);
diff --git a/Content.Client/Crayon/UI/CrayonWindow.xaml b/Content.Client/Crayon/UI/CrayonWindow.xaml
index 7729318ae7f..7acb22551b7 100644
--- a/Content.Client/Crayon/UI/CrayonWindow.xaml
+++ b/Content.Client/Crayon/UI/CrayonWindow.xaml
@@ -1,14 +1,13 @@
+ MinSize="450 500"
+ SetSize="450 500">
-
+
-
-
-
+
+
diff --git a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
index 6ef282d219a..88475562c67 100644
--- a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
+++ b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs
@@ -1,8 +1,10 @@
using System.Collections.Generic;
+using System.Linq;
using Content.Client.Stylesheets;
using Content.Shared.Crayon;
using Content.Shared.Decals;
using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
using Robust.Client.Graphics;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
@@ -18,7 +20,12 @@ namespace Content.Client.Crayon.UI
[GenerateTypedNameReferences]
public sealed partial class CrayonWindow : DefaultWindow
{
- private Dictionary? _decals;
+ [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
+ private readonly SpriteSystem _spriteSystem = default!;
+
+ private Dictionary>? _decals;
+ private List? _allDecals;
+ private string? _autoSelected;
private string? _selected;
private Color _color;
@@ -28,8 +35,10 @@ public sealed partial class CrayonWindow : DefaultWindow
public CrayonWindow()
{
RobustXamlLoader.Load(this);
+ IoCManager.InjectDependencies(this);
+ _spriteSystem = _entitySystem.GetEntitySystem();
- Search.OnTextChanged += _ => RefreshList();
+ Search.OnTextChanged += SearchChanged;
ColorSelector.OnColorChanged += SelectColor;
}
@@ -44,51 +53,94 @@ private void SelectColor(Color color)
private void RefreshList()
{
// Clear
- Grid.DisposeAllChildren();
- if (_decals == null)
+ Grids.DisposeAllChildren();
+
+ if (_decals == null || _allDecals == null)
return;
var filter = Search.Text;
- foreach (var (decal, tex) in _decals)
+ var comma = filter.IndexOf(',');
+ var first = (comma == -1 ? filter : filter[..comma]).Trim();
+
+ var names = _decals.Keys.ToList();
+ names.Sort((a, b) => a == "random" ? 1 : b == "random" ? -1 : a.CompareTo(b));
+
+ if (_autoSelected != null && first != _autoSelected && _allDecals.Contains(first))
+ {
+ _selected = first;
+ _autoSelected = _selected;
+ OnSelected?.Invoke(_selected);
+ }
+
+ foreach (var categoryName in names)
{
- if (!decal.Contains(filter))
+ var locName = Loc.GetString("crayon-category-" + categoryName);
+ var category = _decals[categoryName].Where(d => locName.Contains(first) || d.Name.Contains(first)).ToList();
+
+ if (category.Count == 0)
continue;
- var button = new TextureButton()
+ var label = new Label
{
- TextureNormal = tex,
- Name = decal,
- ToolTip = decal,
- Modulate = _color,
+ Text = locName
};
- button.OnPressed += ButtonOnPressed;
- if (_selected == decal)
+
+ var grid = new GridContainer
{
- var panelContainer = new PanelContainer()
+ Columns = 6,
+ Margin = new Thickness(0, 0, 0, 16)
+ };
+
+ Grids.AddChild(label);
+ Grids.AddChild(grid);
+
+ foreach (var (name, texture) in category)
+ {
+ var button = new TextureButton()
{
- PanelOverride = new StyleBoxFlat()
- {
- BackgroundColor = StyleNano.ButtonColorDefault,
- },
- Children =
- {
- button,
- },
+ TextureNormal = texture,
+ Name = name,
+ ToolTip = name,
+ Modulate = _color,
+ Scale = new System.Numerics.Vector2(2, 2)
};
- Grid.AddChild(panelContainer);
- }
- else
- {
- Grid.AddChild(button);
+ button.OnPressed += ButtonOnPressed;
+
+ if (_selected == name)
+ {
+ var panelContainer = new PanelContainer()
+ {
+ PanelOverride = new StyleBoxFlat()
+ {
+ BackgroundColor = StyleNano.ButtonColorDefault,
+ },
+ Children =
+ {
+ button,
+ },
+ };
+ grid.AddChild(panelContainer);
+ }
+ else
+ {
+ grid.AddChild(button);
+ }
}
}
}
+ private void SearchChanged(LineEdit.LineEditEventArgs obj)
+ {
+ _autoSelected = ""; // Placeholder to kick off the auto-select in refreshlist()
+ RefreshList();
+ }
+
private void ButtonOnPressed(ButtonEventArgs obj)
{
if (obj.Button.Name == null) return;
_selected = obj.Button.Name;
+ _autoSelected = null;
OnSelected?.Invoke(_selected);
RefreshList();
}
@@ -107,12 +159,38 @@ public void UpdateState(CrayonBoundUserInterfaceState state)
RefreshList();
}
- public void Populate(IEnumerable prototypes)
+ public void AdvanceState(string drawnDecal)
{
- _decals = new Dictionary();
+ var filter = Search.Text;
+ if (!filter.Contains(',') || !filter.Contains(drawnDecal))
+ return;
+
+ var first = filter[..filter.IndexOf(',')].Trim();
+
+ if (first.Equals(drawnDecal, StringComparison.InvariantCultureIgnoreCase))
+ {
+ Search.Text = filter[(filter.IndexOf(',') + 1)..].Trim();
+ _autoSelected = first;
+ }
+
+ RefreshList();
+ }
+
+ public void Populate(List prototypes)
+ {
+ _decals = [];
+ _allDecals = [];
+
+ prototypes.Sort((a, b) => a.ID.CompareTo(b.ID));
+
foreach (var decalPrototype in prototypes)
{
- _decals.Add(decalPrototype.ID, decalPrototype.Sprite.Frame0());
+ var category = "random";
+ if (decalPrototype.Tags.Count > 1 && decalPrototype.Tags[1].StartsWith("crayon-"))
+ category = decalPrototype.Tags[1].Replace("crayon-", "");
+ var list = _decals.GetOrNew(category);
+ list.Add((decalPrototype.ID, _spriteSystem.Frame0(decalPrototype.Sprite)));
+ _allDecals.Add(decalPrototype.ID);
}
RefreshList();
diff --git a/Content.Client/DeltaV/AACTablet/UI/AACBoundUserInterface.cs b/Content.Client/DeltaV/AACTablet/UI/AACBoundUserInterface.cs
index 6a9330598fa..1e47b78da89 100644
--- a/Content.Client/DeltaV/AACTablet/UI/AACBoundUserInterface.cs
+++ b/Content.Client/DeltaV/AACTablet/UI/AACBoundUserInterface.cs
@@ -1,12 +1,11 @@
using Content.Shared.DeltaV.AACTablet;
+using Content.Shared.DeltaV.QuickPhrase;
using Robust.Shared.Prototypes;
namespace Content.Client.DeltaV.AACTablet.UI;
public sealed class AACBoundUserInterface : BoundUserInterface
{
- [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-
[ViewVariables]
private AACWindow? _window;
@@ -18,14 +17,14 @@ protected override void Open()
{
base.Open();
_window?.Close();
- _window = new AACWindow(this, _prototypeManager);
+ _window = new AACWindow();
_window.OpenCentered();
_window.PhraseButtonPressed += OnPhraseButtonPressed;
_window.OnClose += Close;
}
- private void OnPhraseButtonPressed(string phraseId)
+ private void OnPhraseButtonPressed(ProtoId phraseId)
{
SendMessage(new AACTabletSendPhraseMessage(phraseId));
}
@@ -33,6 +32,6 @@ private void OnPhraseButtonPressed(string phraseId)
protected override void Dispose(bool disposing)
{
base.Dispose(disposing);
- _window?.Dispose();
+ _window?.Orphan();
}
}
diff --git a/Content.Client/DeltaV/AACTablet/UI/AACWindow.xaml b/Content.Client/DeltaV/AACTablet/UI/AACWindow.xaml
index e4183934209..6bb23b5c96a 100644
--- a/Content.Client/DeltaV/AACTablet/UI/AACWindow.xaml
+++ b/Content.Client/DeltaV/AACTablet/UI/AACWindow.xaml
@@ -6,4 +6,4 @@
MinSize="540 300">
-
\ No newline at end of file
+
diff --git a/Content.Client/DeltaV/AACTablet/UI/AACWindow.xaml.cs b/Content.Client/DeltaV/AACTablet/UI/AACWindow.xaml.cs
index c9bc457b8df..07866367786 100644
--- a/Content.Client/DeltaV/AACTablet/UI/AACWindow.xaml.cs
+++ b/Content.Client/DeltaV/AACTablet/UI/AACWindow.xaml.cs
@@ -13,20 +13,26 @@ namespace Content.Client.DeltaV.AACTablet.UI;
[GenerateTypedNameReferences]
public sealed partial class AACWindow : FancyWindow
{
- private IPrototypeManager _prototypeManager;
- public event Action? PhraseButtonPressed;
+ [Dependency] private readonly IPrototypeManager _prototype = default!;
+ public event Action>? PhraseButtonPressed;
- public AACWindow(AACBoundUserInterface ui, IPrototypeManager prototypeManager)
+ private const float SpaceWidth = 10f;
+ private const float ParentWidth = 540f;
+ private const int ColumnCount = 4;
+
+ private const int ButtonWidth =
+ (int)((ParentWidth - SpaceWidth * 2) / ColumnCount - SpaceWidth * ((ColumnCount - 1f) / ColumnCount));
+
+ public AACWindow()
{
RobustXamlLoader.Load(this);
- _prototypeManager = prototypeManager;
- PopulateGui(ui);
+ IoCManager.InjectDependencies(this);
+ PopulateGui();
}
- private void PopulateGui(AACBoundUserInterface ui)
+ private void PopulateGui()
{
- var loc = IoCManager.Resolve();
- var phrases = _prototypeManager.EnumeratePrototypes().ToList();
+ var phrases = _prototype.EnumeratePrototypes().ToList();
// take ALL phrases and turn them into tabs and groups, so the buttons are sorted and tabbed
var sortedTabs = phrases
@@ -38,7 +44,7 @@ private void PopulateGui(AACBoundUserInterface ui)
.OrderBy(gg => gg.Key)
.ToDictionary(
gg => gg.Key,
- gg => gg.OrderBy(p => loc.GetString(p.Text)).ToList()
+ gg => gg.OrderBy(p => Loc.GetString(p.Text)).ToList()
)
);
@@ -49,11 +55,10 @@ private void PopulateGui(AACBoundUserInterface ui)
private TabContainer CreateTabContainer(Dictionary>> sortedTabs)
{
var tabContainer = new TabContainer();
- var loc = IoCManager.Resolve();
foreach (var tab in sortedTabs)
{
- var tabName = loc.GetString(tab.Key);
+ var tabName = Loc.GetString(tab.Key);
var boxContainer = CreateBoxContainerForTab(tab.Value);
tabContainer.AddChild(boxContainer);
tabContainer.SetTabTitle(tabContainer.ChildCount - 1, tabName);
@@ -64,7 +69,7 @@ private TabContainer CreateTabContainer(Dictionary> groups)
{
- var boxContainer = new BoxContainer()
+ var boxContainer = new BoxContainer
{
HorizontalExpand = true,
Orientation = BoxContainer.LayoutOrientation.Vertical
@@ -81,7 +86,7 @@ private BoxContainer CreateBoxContainerForTab(Dictionary phrases)
{
- var loc = IoCManager.Resolve();
var buttonContainer = CreateButtonContainer();
foreach (var phrase in phrases)
{
- var text = loc.GetString(phrase.Text);
+ var text = Loc.GetString(phrase.Text);
var button = CreatePhraseButton(text, phrase.StyleClass);
- button.OnPressed += _ => OnPhraseButtonPressed(phrase.ID);
+ button.OnPressed += _ => OnPhraseButtonPressed(new ProtoId(phrase.ID));
buttonContainer.AddChild(button);
}
return buttonContainer;
@@ -121,11 +125,10 @@ private static GridContainer CreateButtonContainer()
private static Button CreatePhraseButton(string text, string styleClass)
{
- var buttonWidth = GetButtonWidth();
var phraseButton = new Button
{
Access = AccessLevel.Public,
- MaxSize = new Vector2(buttonWidth, buttonWidth),
+ MaxSize = new Vector2(ButtonWidth, ButtonWidth),
ClipText = false,
HorizontalExpand = true,
StyleClasses = { styleClass }
@@ -142,20 +145,7 @@ private static Button CreatePhraseButton(string text, string styleClass)
return phraseButton;
}
- private static int GetButtonWidth()
- {
- var spaceWidth = 10;
- var parentWidth = 540;
- var columnCount = 4;
-
- var paddingSize = spaceWidth * 2;
- var gutterScale = (columnCount - 1) / columnCount;
- var columnWidth = (parentWidth - paddingSize) / columnCount;
- var buttonWidth = columnWidth - spaceWidth * gutterScale;
- return buttonWidth;
- }
-
- private void OnPhraseButtonPressed(string phraseId)
+ private void OnPhraseButtonPressed(ProtoId phraseId)
{
PhraseButtonPressed?.Invoke(phraseId);
}
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml
new file mode 100644
index 00000000000..0b136133624
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml
@@ -0,0 +1,48 @@
+
+
+
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs
new file mode 100644
index 00000000000..ff4ea9ba9c1
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs
@@ -0,0 +1,39 @@
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class NanoChatEntry : BoxContainer
+{
+ public event Action? OnPressed;
+ private uint _number;
+ private Action? _pressHandler;
+
+ public NanoChatEntry()
+ {
+ RobustXamlLoader.Load(this);
+ }
+
+ public void SetRecipient(NanoChatRecipient recipient, uint number, bool isSelected)
+ {
+ // Remove old handler if it exists
+ if (_pressHandler != null)
+ ChatButton.OnPressed -= _pressHandler;
+
+ _number = number;
+
+ // Create and store new handler
+ _pressHandler = _ => OnPressed?.Invoke(_number);
+ ChatButton.OnPressed += _pressHandler;
+
+ NameLabel.Text = recipient.Name;
+ JobLabel.Text = recipient.JobTitle ?? "";
+ JobLabel.Visible = !string.IsNullOrEmpty(recipient.JobTitle);
+ UnreadIndicator.Visible = recipient.HasUnread;
+
+ ChatButton.ModulateSelfOverride = isSelected ? NanoChatMessageBubble.OwnMessageColor : null;
+ }
+}
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatLogEntry.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatLogEntry.xaml
new file mode 100644
index 00000000000..c87478d6301
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatLogEntry.xaml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatLogEntry.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatLogEntry.xaml.cs
new file mode 100644
index 00000000000..b94ea1a18aa
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatLogEntry.xaml.cs
@@ -0,0 +1,17 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class NanoChatLogEntry : BoxContainer
+{
+ public NanoChatLogEntry(int number, string time, string message)
+ {
+ RobustXamlLoader.Load(this);
+ NumberLabel.Text = number.ToString();
+ TimeLabel.Text = time;
+ MessageLabel.Text = message;
+ }
+}
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml
new file mode 100644
index 00000000000..84daa2f1c59
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml.cs
new file mode 100644
index 00000000000..42725bb09c5
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml.cs
@@ -0,0 +1,62 @@
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class NanoChatMessageBubble : BoxContainer
+{
+ public static readonly Color OwnMessageColor = Color.FromHex("#173717d9"); // Dark green
+ public static readonly Color OtherMessageColor = Color.FromHex("#252525d9"); // Dark gray
+ public static readonly Color BorderColor = Color.FromHex("#40404066"); // Subtle border
+ public static readonly Color TextColor = Color.FromHex("#dcdcdc"); // Slightly softened white
+ public static readonly Color ErrorColor = Color.FromHex("#cc3333"); // Red
+
+ public NanoChatMessageBubble()
+ {
+ RobustXamlLoader.Load(this);
+ }
+
+ public void SetMessage(NanoChatMessage message, bool isOwnMessage)
+ {
+ if (MessagePanel.PanelOverride is not StyleBoxFlat)
+ return;
+
+ // Configure message appearance
+ var style = (StyleBoxFlat)MessagePanel.PanelOverride;
+ style.BackgroundColor = isOwnMessage ? OwnMessageColor : OtherMessageColor;
+ style.BorderColor = BorderColor;
+
+ // Set message content
+ MessageText.Text = message.Content;
+ MessageText.Modulate = TextColor;
+
+ // Show delivery failed text if needed (only for own messages)
+ DeliveryFailedLabel.Visible = isOwnMessage && message.DeliveryFailed;
+ if (DeliveryFailedLabel.Visible)
+ DeliveryFailedLabel.Modulate = ErrorColor;
+
+ // For own messages: FlexSpace -> MessagePanel -> RightSpacer
+ // For other messages: LeftSpacer -> MessagePanel -> FlexSpace
+ MessageContainer.RemoveAllChildren();
+
+ // fuuuuuck
+ MessageBox.Parent?.RemoveChild(MessageBox);
+
+ if (isOwnMessage)
+ {
+ MessageContainer.AddChild(FlexSpace);
+ MessageContainer.AddChild(MessageBox);
+ MessageContainer.AddChild(RightSpacer);
+ }
+ else
+ {
+ MessageContainer.AddChild(LeftSpacer);
+ MessageContainer.AddChild(MessageBox);
+ MessageContainer.AddChild(FlexSpace);
+ }
+ }
+}
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUi.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUi.cs
new file mode 100644
index 00000000000..fb65b03e887
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUi.cs
@@ -0,0 +1,43 @@
+using Content.Client.UserInterface.Fragments;
+using Content.Shared.CartridgeLoader;
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+public sealed partial class NanoChatUi : UIFragment
+{
+ private NanoChatUiFragment? _fragment;
+
+ public override Control GetUIFragmentRoot()
+ {
+ return _fragment!;
+ }
+
+ public override void Setup(BoundUserInterface userInterface, EntityUid? fragmentOwner)
+ {
+ _fragment = new NanoChatUiFragment();
+
+ _fragment.OnMessageSent += (type, number, content, job) =>
+ {
+ SendNanoChatUiMessage(type, number, content, job, userInterface);
+ };
+ }
+
+ public override void UpdateState(BoundUserInterfaceState state)
+ {
+ if (state is NanoChatUiState cast)
+ _fragment?.UpdateState(cast);
+ }
+
+ private static void SendNanoChatUiMessage(NanoChatUiMessageType type,
+ uint? number,
+ string? content,
+ string? job,
+ BoundUserInterface userInterface)
+ {
+ var nanoChatMessage = new NanoChatUiMessageEvent(type, number, content, job);
+ var message = new CartridgeUiMessage(nanoChatMessage);
+ userInterface.SendMessage(message);
+ }
+}
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
new file mode 100644
index 00000000000..2a39094b85d
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
@@ -0,0 +1,167 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
new file mode 100644
index 00000000000..159d6b1a93a
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
@@ -0,0 +1,254 @@
+using System.Linq;
+using System.Numerics;
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Client.UserInterface;
+using Robust.Shared.Timing;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class NanoChatUiFragment : BoxContainer
+{
+ [Dependency] private readonly IGameTiming _timing = default!;
+
+ private const int MaxMessageLength = 256;
+
+ private readonly NewChatPopup _newChatPopup;
+ private uint? _currentChat;
+ private uint? _pendingChat;
+ private uint _ownNumber;
+ private bool _notificationsMuted;
+ private Dictionary _recipients = new();
+ private Dictionary> _messages = new();
+
+ public event Action? OnMessageSent;
+
+ public NanoChatUiFragment()
+ {
+ IoCManager.InjectDependencies(this);
+ RobustXamlLoader.Load(this);
+
+ _newChatPopup = new NewChatPopup();
+ SetupEventHandlers();
+ }
+
+ private void SetupEventHandlers()
+ {
+ _newChatPopup.OnChatCreated += (number, name, job) =>
+ {
+ OnMessageSent?.Invoke(NanoChatUiMessageType.NewChat, number, name, job);
+ };
+
+ NewChatButton.OnPressed += _ =>
+ {
+ _newChatPopup.ClearInputs();
+ _newChatPopup.OpenCentered();
+ };
+
+ MuteButton.OnPressed += _ =>
+ {
+ _notificationsMuted = !_notificationsMuted;
+ UpdateMuteButton();
+ OnMessageSent?.Invoke(NanoChatUiMessageType.ToggleMute, null, null, null);
+ };
+
+ MessageInput.OnTextChanged += args =>
+ {
+ var length = args.Text.Length;
+ var isValid = !string.IsNullOrWhiteSpace(args.Text) &&
+ length <= MaxMessageLength &&
+ (_currentChat != null || _pendingChat != null);
+
+ SendButton.Disabled = !isValid;
+
+ // Show character count when over limit
+ CharacterCount.Visible = length > MaxMessageLength;
+ if (length > MaxMessageLength)
+ {
+ CharacterCount.Text = Loc.GetString("nano-chat-message-too-long",
+ ("current", length),
+ ("max", MaxMessageLength));
+ CharacterCount.StyleClasses.Add("LabelDanger");
+ }
+ };
+
+ SendButton.OnPressed += _ => SendMessage();
+ DeleteChatButton.OnPressed += _ => DeleteCurrentChat();
+ }
+
+ private void SendMessage()
+ {
+ var activeChat = _pendingChat ?? _currentChat;
+ if (activeChat == null || string.IsNullOrWhiteSpace(MessageInput.Text))
+ return;
+
+ var messageContent = MessageInput.Text;
+
+ // Add predicted message
+ var predictedMessage = new NanoChatMessage(
+ _timing.CurTime,
+ messageContent,
+ _ownNumber
+ );
+
+ if (!_messages.TryGetValue(activeChat.Value, out var value))
+ {
+ value = new List();
+ _messages[activeChat.Value] = value;
+ }
+
+ value.Add(predictedMessage);
+
+ // Update UI with predicted message
+ UpdateMessages(_messages);
+
+ // Send message event
+ OnMessageSent?.Invoke(NanoChatUiMessageType.SendMessage, activeChat, messageContent, null);
+
+ // Clear input
+ MessageInput.Text = string.Empty;
+ SendButton.Disabled = true;
+ }
+
+ private void SelectChat(uint number)
+ {
+ // Don't reselect the same chat
+ if (_currentChat == number && _pendingChat == null)
+ return;
+
+ _pendingChat = number;
+
+ // Predict marking messages as read
+ if (_recipients.TryGetValue(number, out var recipient))
+ {
+ recipient.HasUnread = false;
+ _recipients[number] = recipient;
+ UpdateChatList(_recipients);
+ }
+
+ OnMessageSent?.Invoke(NanoChatUiMessageType.SelectChat, number, null, null);
+ UpdateCurrentChat();
+ }
+
+ private void DeleteCurrentChat()
+ {
+ var activeChat = _pendingChat ?? _currentChat;
+ if (activeChat == null)
+ return;
+
+ OnMessageSent?.Invoke(NanoChatUiMessageType.DeleteChat, activeChat, null, null);
+ }
+
+ private void UpdateChatList(Dictionary recipients)
+ {
+ ChatList.RemoveAllChildren();
+ _recipients = recipients;
+
+ NoChatsLabel.Visible = recipients.Count == 0;
+ if (NoChatsLabel.Parent != ChatList)
+ {
+ NoChatsLabel.Parent?.RemoveChild(NoChatsLabel);
+ ChatList.AddChild(NoChatsLabel);
+ }
+
+ foreach (var (number, recipient) in recipients.OrderBy(r => r.Value.Name))
+ {
+ var entry = new NanoChatEntry();
+ // For pending chat selection, always show it as selected even if unconfirmed
+ var isSelected = (_pendingChat == number) || (_pendingChat == null && _currentChat == number);
+ entry.SetRecipient(recipient, number, isSelected);
+ entry.OnPressed += SelectChat;
+ ChatList.AddChild(entry);
+ }
+ }
+
+ private void UpdateCurrentChat()
+ {
+ var activeChat = _pendingChat ?? _currentChat;
+ var hasActiveChat = activeChat != null;
+
+ // Update UI state
+ MessagesScroll.Visible = hasActiveChat;
+ CurrentChatName.Visible = !hasActiveChat;
+ MessageInputContainer.Visible = hasActiveChat;
+ DeleteChatButton.Visible = hasActiveChat;
+ DeleteChatButton.Disabled = !hasActiveChat;
+
+ if (activeChat != null && _recipients.TryGetValue(activeChat.Value, out var recipient))
+ {
+ CurrentChatName.Text = recipient.Name + (string.IsNullOrEmpty(recipient.JobTitle) ? "" : $" ({recipient.JobTitle})");
+ }
+ else
+ {
+ CurrentChatName.Text = Loc.GetString("nano-chat-select-chat");
+ }
+ }
+
+ private void UpdateMessages(Dictionary> messages)
+ {
+ _messages = messages;
+ MessageList.RemoveAllChildren();
+
+ var activeChat = _pendingChat ?? _currentChat;
+ if (activeChat == null || !messages.TryGetValue(activeChat.Value, out var chatMessages))
+ return;
+
+ foreach (var message in chatMessages)
+ {
+ var messageBubble = new NanoChatMessageBubble();
+ messageBubble.SetMessage(message, message.SenderId == _ownNumber);
+ MessageList.AddChild(messageBubble);
+
+ // Add spacing between messages
+ MessageList.AddChild(new Control { MinSize = new Vector2(0, 4) });
+ }
+
+ MessageList.InvalidateMeasure();
+ MessagesScroll.InvalidateMeasure();
+
+ // Scroll to bottom after messages are added
+ if (MessageList.Parent is ScrollContainer scroll)
+ scroll.SetScrollValue(new Vector2(0, float.MaxValue));
+ }
+
+ private void UpdateMuteButton()
+ {
+ if (BellMutedIcon != null)
+ BellMutedIcon.Visible = _notificationsMuted;
+ }
+
+ public void UpdateState(NanoChatUiState state)
+ {
+ _ownNumber = state.OwnNumber;
+ _notificationsMuted = state.NotificationsMuted;
+ OwnNumberLabel.Text = $"#{state.OwnNumber:D4}";
+ UpdateMuteButton();
+
+ // Update new chat button state based on recipient limit
+ var atLimit = state.Recipients.Count >= state.MaxRecipients;
+ NewChatButton.Disabled = atLimit;
+ NewChatButton.ToolTip = atLimit
+ ? Loc.GetString("nano-chat-max-recipients")
+ : Loc.GetString("nano-chat-new-chat");
+
+ // First handle pending chat resolution if we have one
+ if (_pendingChat != null)
+ {
+ if (_pendingChat == state.CurrentChat)
+ _currentChat = _pendingChat; // Server confirmed our selection
+
+ _pendingChat = null; // Clear pending either way
+ }
+
+ // No pending chat or it was just cleared, update current directly
+ if (_pendingChat == null)
+ _currentChat = state.CurrentChat;
+
+ UpdateCurrentChat();
+ UpdateChatList(state.Recipients);
+ UpdateMessages(state.Messages);
+ }
+}
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml
new file mode 100644
index 00000000000..20095c4fce9
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs
new file mode 100644
index 00000000000..8e47e1ee5d4
--- /dev/null
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs
@@ -0,0 +1,87 @@
+using System.Linq;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class NewChatPopup : DefaultWindow
+{
+ private const int MaxInputLength = 16;
+ private const int MaxNumberLength = 4; // i hardcoded it to be 4 so suffer
+
+ public event Action? OnChatCreated;
+
+ public NewChatPopup()
+ {
+ RobustXamlLoader.Load(this);
+
+ // margins trolling
+ ContentsContainer.Margin = new Thickness(3);
+
+ // Button handlers
+ CancelButton.OnPressed += _ => Close();
+ CreateButton.OnPressed += _ => CreateChat();
+
+ // Input validation
+ NumberInput.OnTextChanged += _ => ValidateInputs();
+ NameInput.OnTextChanged += _ => ValidateInputs();
+
+ // Input validation
+ NumberInput.OnTextChanged += args =>
+ {
+ if (args.Text.Length > MaxNumberLength)
+ NumberInput.Text = args.Text[..MaxNumberLength];
+
+ // Filter to digits only
+ var newText = string.Concat(NumberInput.Text.Where(char.IsDigit));
+ if (newText != NumberInput.Text)
+ NumberInput.Text = newText;
+
+ ValidateInputs();
+ };
+
+ NameInput.OnTextChanged += args =>
+ {
+ if (args.Text.Length > MaxInputLength)
+ NameInput.Text = args.Text[..MaxInputLength];
+ ValidateInputs();
+ };
+
+ JobInput.OnTextChanged += args =>
+ {
+ if (args.Text.Length > MaxInputLength)
+ JobInput.Text = args.Text[..MaxInputLength];
+ };
+ }
+
+ private void ValidateInputs()
+ {
+ var isValid = !string.IsNullOrWhiteSpace(NumberInput.Text) &&
+ !string.IsNullOrWhiteSpace(NameInput.Text) &&
+ uint.TryParse(NumberInput.Text, out _);
+
+ CreateButton.Disabled = !isValid;
+ }
+
+ private void CreateChat()
+ {
+ if (!uint.TryParse(NumberInput.Text, out var number))
+ return;
+
+ var name = NameInput.Text.Trim();
+ var job = string.IsNullOrWhiteSpace(JobInput.Text) ? null : JobInput.Text.Trim();
+
+ OnChatCreated?.Invoke(number, name, job);
+ Close();
+ }
+
+ public void ClearInputs()
+ {
+ NumberInput.Text = string.Empty;
+ NameInput.Text = string.Empty;
+ JobInput.Text = string.Empty;
+ ValidateInputs();
+ }
+}
diff --git a/Content.Client/DeltaV/NanoChat/NanoChatSystem.cs b/Content.Client/DeltaV/NanoChat/NanoChatSystem.cs
new file mode 100644
index 00000000000..242deb05b72
--- /dev/null
+++ b/Content.Client/DeltaV/NanoChat/NanoChatSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.DeltaV.NanoChat;
+
+namespace Content.Client.DeltaV.NanoChat;
+
+public sealed class NanoChatSystem : SharedNanoChatSystem;
diff --git a/Content.Client/DeltaV/Shuttles/Systems/DockingConsoleSystem.cs b/Content.Client/DeltaV/Shuttles/Systems/DockingConsoleSystem.cs
new file mode 100644
index 00000000000..5e0df6ae5d7
--- /dev/null
+++ b/Content.Client/DeltaV/Shuttles/Systems/DockingConsoleSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.DeltaV.Shuttles.Systems;
+
+namespace Content.Client.DeltaV.Shuttles.Systems;
+
+public sealed class DockingConsoleSystem : SharedDockingConsoleSystem;
diff --git a/Content.Client/DeltaV/Shuttles/UI/DockingConsoleBoundUserInterface.cs b/Content.Client/DeltaV/Shuttles/UI/DockingConsoleBoundUserInterface.cs
new file mode 100644
index 00000000000..450ffc04a1d
--- /dev/null
+++ b/Content.Client/DeltaV/Shuttles/UI/DockingConsoleBoundUserInterface.cs
@@ -0,0 +1,38 @@
+using Content.Shared.DeltaV.Shuttles;
+
+namespace Content.Client.DeltaV.Shuttles.UI;
+
+public sealed class DockingConsoleBoundUserInterface : BoundUserInterface
+{
+ [ViewVariables]
+ private DockingConsoleWindow? _window;
+
+ public DockingConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+ {
+ }
+
+ protected override void Open()
+ {
+ base.Open();
+
+ _window = new DockingConsoleWindow(Owner);
+ _window.OnFTL += index => SendMessage(new DockingConsoleFTLMessage(index));
+ _window.OnClose += Close;
+ _window.OpenCentered();
+ }
+
+ protected override void UpdateState(BoundUserInterfaceState state)
+ {
+ base.UpdateState(state);
+ if (state is DockingConsoleState cast)
+ _window?.UpdateState(cast);
+ }
+
+ protected override void Dispose(bool disposing)
+ {
+ base.Dispose(disposing);
+
+ if (disposing)
+ _window?.Orphan();
+ }
+}
diff --git a/Content.Client/DeltaV/Shuttles/UI/DockingConsoleWindow.xaml b/Content.Client/DeltaV/Shuttles/UI/DockingConsoleWindow.xaml
new file mode 100644
index 00000000000..595a30be807
--- /dev/null
+++ b/Content.Client/DeltaV/Shuttles/UI/DockingConsoleWindow.xaml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/DeltaV/Shuttles/UI/DockingConsoleWindow.xaml.cs b/Content.Client/DeltaV/Shuttles/UI/DockingConsoleWindow.xaml.cs
new file mode 100644
index 00000000000..eaa489ae868
--- /dev/null
+++ b/Content.Client/DeltaV/Shuttles/UI/DockingConsoleWindow.xaml.cs
@@ -0,0 +1,111 @@
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Access.Systems;
+using Content.Shared.DeltaV.Shuttles;
+using Content.Shared.DeltaV.Shuttles.Components;
+using Content.Shared.Shuttles.Systems;
+using Content.Shared.Timing;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Timing;
+
+namespace Content.Client.DeltaV.Shuttles.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class DockingConsoleWindow : FancyWindow
+{
+ [Dependency] private readonly IEntityManager _entMan = default!;
+ [Dependency] private readonly IGameTiming _timing = default!;
+ [Dependency] private readonly IPlayerManager _player = default!;
+ private readonly AccessReaderSystem _access;
+
+ public event Action? OnFTL;
+
+ private readonly EntityUid _owner;
+ private readonly StyleBoxFlat _ftlStyle;
+
+ private FTLState _state;
+ private int? _selected;
+ private StartEndTime _ftlTime;
+
+ public DockingConsoleWindow(EntityUid owner)
+ {
+ RobustXamlLoader.Load(this);
+ IoCManager.InjectDependencies(this);
+
+ _access = _entMan.System();
+
+ _owner = owner;
+
+ _ftlStyle = new StyleBoxFlat(Color.LimeGreen);
+ FTLBar.ForegroundStyleBoxOverride = _ftlStyle;
+
+ if (!_entMan.TryGetComponent(owner, out var comp))
+ return;
+
+ Title = Loc.GetString(comp.WindowTitle);
+
+ if (!comp.HasShuttle)
+ {
+ MapFTLState.Text = Loc.GetString("docking-console-no-shuttle");
+ _ftlStyle.BackgroundColor = Color.FromHex("#B02E26");
+ }
+
+ Destinations.OnItemSelected += args => _selected = args.ItemIndex;
+ Destinations.OnItemDeselected += _ => _selected = null;
+
+ FTLButton.OnPressed += _ =>
+ {
+ if (_selected is {} index)
+ OnFTL?.Invoke(index);
+ };
+ }
+
+ public void UpdateState(DockingConsoleState state)
+ {
+ _state = state.FTLState;
+ _ftlTime = state.FTLTime;
+
+ MapFTLState.Text = Loc.GetString($"shuttle-console-ftl-state-{_state.ToString()}");
+ _ftlStyle.BackgroundColor = Color.FromHex(_state switch
+ {
+ FTLState.Available => "#80C71F",
+ FTLState.Starting => "#169C9C",
+ FTLState.Travelling => "#8932B8",
+ FTLState.Arriving => "#F9801D",
+ _ => "#B02E26" // cooldown and fallback
+ });
+
+ UpdateButton();
+
+ if (Destinations.Count == state.Destinations.Count)
+ return;
+
+ Destinations.Clear();
+ foreach (var dest in state.Destinations)
+ {
+ Destinations.AddItem(dest.Name);
+ }
+ }
+
+ private void UpdateButton()
+ {
+ FTLButton.Disabled = _selected == null || _state != FTLState.Available || !HasAccess();
+ }
+
+ private bool HasAccess()
+ {
+ return _player.LocalSession?.AttachedEntity is {} player && _access.IsAllowed(player, _owner);
+ }
+
+ protected override void FrameUpdate(FrameEventArgs args)
+ {
+ base.FrameUpdate(args);
+
+ UpdateButton();
+
+ var progress = _ftlTime.ProgressAt(_timing.CurTime);
+ FTLBar.Value = float.IsFinite(progress) ? progress : 1;
+ }
+}
diff --git a/Content.Client/Electrocution/ElectrocutionHUDVisualizerSystem.cs b/Content.Client/Electrocution/ElectrocutionHUDVisualizerSystem.cs
new file mode 100644
index 00000000000..b95c0d585d7
--- /dev/null
+++ b/Content.Client/Electrocution/ElectrocutionHUDVisualizerSystem.cs
@@ -0,0 +1,95 @@
+using Content.Shared.Electrocution;
+using Robust.Client.GameObjects;
+using Robust.Client.Player;
+using Robust.Shared.Player;
+
+namespace Content.Client.Electrocution;
+
+///
+/// Shows the Electrocution HUD to entities with the ShowElectrocutionHUDComponent.
+///
+public sealed class ElectrocutionHUDVisualizerSystem : VisualizerSystem
+{
+ [Dependency] private readonly IPlayerManager _playerMan = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnInit);
+ SubscribeLocalEvent(OnShutdown);
+ SubscribeLocalEvent(OnPlayerAttached);
+ SubscribeLocalEvent(OnPlayerDetached);
+ }
+
+ private void OnPlayerAttached(Entity ent, ref LocalPlayerAttachedEvent args)
+ {
+ ShowHUD();
+ }
+
+ private void OnPlayerDetached(Entity ent, ref LocalPlayerDetachedEvent args)
+ {
+ RemoveHUD();
+ }
+
+ private void OnInit(Entity ent, ref ComponentInit args)
+ {
+ if (_playerMan.LocalEntity == ent)
+ {
+ ShowHUD();
+ }
+ }
+
+ private void OnShutdown(Entity ent, ref ComponentShutdown args)
+ {
+ if (_playerMan.LocalEntity == ent)
+ {
+ RemoveHUD();
+ }
+ }
+
+ // Show the HUD to the client.
+ // We have to look for all current entities that can be electrified and toggle the HUD layer on if they are.
+ private void ShowHUD()
+ {
+ var electrifiedQuery = AllEntityQuery();
+ while (electrifiedQuery.MoveNext(out var uid, out var _, out var appearanceComp, out var spriteComp))
+ {
+ if (!AppearanceSystem.TryGetData(uid, ElectrifiedVisuals.IsElectrified, out var electrified, appearanceComp))
+ continue;
+
+ if (electrified)
+ spriteComp.LayerSetVisible(ElectrifiedLayers.HUD, true);
+ else
+ spriteComp.LayerSetVisible(ElectrifiedLayers.HUD, false);
+ }
+ }
+
+ // Remove the HUD from the client.
+ // Find all current entities that can be electrified and hide the HUD layer.
+ private void RemoveHUD()
+ {
+ var electrifiedQuery = AllEntityQuery();
+ while (electrifiedQuery.MoveNext(out var uid, out var _, out var appearanceComp, out var spriteComp))
+ {
+
+ spriteComp.LayerSetVisible(ElectrifiedLayers.HUD, false);
+ }
+ }
+
+ // Toggle the HUD layer if an entity becomes (de-)electrified
+ protected override void OnAppearanceChange(EntityUid uid, ElectrocutionHUDVisualsComponent comp, ref AppearanceChangeEvent args)
+ {
+ if (args.Sprite == null)
+ return;
+
+ if (!AppearanceSystem.TryGetData(uid, ElectrifiedVisuals.IsElectrified, out var electrified, args.Component))
+ return;
+
+ var player = _playerMan.LocalEntity;
+ if (electrified && HasComp(player))
+ args.Sprite.LayerSetVisible(ElectrifiedLayers.HUD, true);
+ else
+ args.Sprite.LayerSetVisible(ElectrifiedLayers.HUD, false);
+ }
+}
diff --git a/Content.Client/Eui/BaseEui.cs b/Content.Client/Eui/BaseEui.cs
index 7f86ded7e48..c11ba5a9b69 100644
--- a/Content.Client/Eui/BaseEui.cs
+++ b/Content.Client/Eui/BaseEui.cs
@@ -55,7 +55,7 @@ public virtual void HandleMessage(EuiMessageBase msg)
///
protected void SendMessage(EuiMessageBase msg)
{
- var netMsg = _netManager.CreateNetMessage();
+ var netMsg = new MsgEuiMessage();
netMsg.Id = Id;
netMsg.Message = msg;
diff --git a/Content.Client/Info/LinkBanner.cs b/Content.Client/Info/LinkBanner.cs
index a30aa413761..7366a8f8565 100644
--- a/Content.Client/Info/LinkBanner.cs
+++ b/Content.Client/Info/LinkBanner.cs
@@ -34,6 +34,7 @@ public LinkBanner()
AddInfoButton("server-info-website-button", CCVars.InfoLinksWebsite);
AddInfoButton("server-info-wiki-button", CCVars.InfoLinksWiki);
AddInfoButton("server-info-forum-button", CCVars.InfoLinksForum);
+ AddInfoButton("server-info-telegram-button", CCVars.InfoLinksTelegram);
var guidebookController = UserInterfaceManager.GetUIController();
var guidebookButton = new Button() { Text = Loc.GetString("server-info-guidebook-button") };
diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs
index 2ce07758c96..90e52d72837 100644
--- a/Content.Client/Inventory/StrippableBoundUserInterface.cs
+++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs
@@ -17,6 +17,7 @@
using Content.Shared.Strip.Components;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
+using Robust.Client.Player;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.Input;
@@ -29,10 +30,13 @@ namespace Content.Client.Inventory
[UsedImplicitly]
public sealed class StrippableBoundUserInterface : BoundUserInterface
{
+ [Dependency] private readonly IPlayerManager _player = default!;
[Dependency] private readonly IUserInterfaceManager _ui = default!;
+
private readonly ExamineSystem _examine;
private readonly InventorySystem _inv;
private readonly SharedCuffableSystem _cuffable;
+ private readonly StrippableSystem _strippable;
[ViewVariables]
private const int ButtonSeparation = 4;
@@ -51,6 +55,8 @@ public StrippableBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, u
_examine = EntMan.System();
_inv = EntMan.System();
_cuffable = EntMan.System();
+ _strippable = EntMan.System();
+
_virtualHiddenEntity = EntMan.SpawnEntity(HiddenPocketEntityId, MapCoordinates.Nullspace);
}
@@ -185,9 +191,15 @@ private void SlotPressed(GUIBoundKeyEventArgs ev, SlotControl slot)
return;
if (ev.Function == ContentKeyFunctions.ExamineEntity)
+ {
_examine.DoExamine(slot.Entity.Value);
+ ev.Handle();
+ }
else if (ev.Function == EngineKeyFunctions.UseSecondary)
+ {
_ui.GetUIController().OpenVerbMenu(slot.Entity.Value);
+ ev.Handle();
+ }
}
private void AddInventoryButton(EntityUid invUid, string slotId, InventoryComponent inv)
@@ -198,7 +210,8 @@ private void AddInventoryButton(EntityUid invUid, string slotId, InventoryCompon
var entity = container.ContainedEntity;
// If this is a full pocket, obscure the real entity
- if (entity != null && slotDef.StripHidden)
+ // this does not work for modified clients because they are still sent the real entity
+ if (entity != null && _strippable.IsStripHidden(slotDef, _player.LocalEntity))
entity = _virtualHiddenEntity;
var button = new SlotButton(new SlotData(slotDef, container));
diff --git a/Content.Client/Lathe/UI/LatheBoundUserInterface.cs b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs
index a599f79152e..66f09aa41da 100644
--- a/Content.Client/Lathe/UI/LatheBoundUserInterface.cs
+++ b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs
@@ -1,3 +1,4 @@
+using Content.Shared.DeltaV.Salvage; // DeltaV
using Content.Shared.Lathe;
using Content.Shared.Research.Components;
using JetBrains.Annotations;
@@ -31,6 +32,8 @@ protected override void Open()
{
SendMessage(new LatheQueueRecipeMessage(recipe, amount));
};
+
+ _menu.OnClaimMiningPoints += () => SendMessage(new LatheClaimMiningPointsMessage()); // DeltaV
}
protected override void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml b/Content.Client/Lathe/UI/LatheMenu.xaml
index 5b21f0bae66..d84449ce43e 100644
--- a/Content.Client/Lathe/UI/LatheMenu.xaml
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml
@@ -132,6 +132,12 @@
HorizontalExpand="True">
+
+
+
+
+
+
diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
index 02464d22e12..c2289632052 100644
--- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
@@ -1,16 +1,20 @@
using System.Linq;
using System.Text;
using Content.Client.Materials;
+using Content.Shared.DeltaV.Salvage.Components; // DeltaV
+using Content.Shared.DeltaV.Salvage.Systems; // DeltaV
using Content.Shared.Lathe;
using Content.Shared.Lathe.Prototypes;
using Content.Shared.Research.Prototypes;
using Robust.Client.AutoGenerated;
using Robust.Client.GameObjects;
+using Robust.Client.Player; // DeltaV
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Prototypes;
+using Robust.Shared.Timing; // DeltaV
namespace Content.Client.Lathe.UI;
@@ -18,14 +22,17 @@ namespace Content.Client.Lathe.UI;
public sealed partial class LatheMenu : DefaultWindow
{
[Dependency] private readonly IEntityManager _entityManager = default!;
+ [Dependency] private readonly IPlayerManager _player = default!; // DeltaV
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
private readonly SpriteSystem _spriteSystem;
private readonly LatheSystem _lathe;
private readonly MaterialStorageSystem _materialStorage;
+ private readonly MiningPointsSystem _miningPoints; // DeltaV
public event Action? OnServerListButtonPressed;
public event Action? RecipeQueueAction;
+ public event Action? OnClaimMiningPoints; // DeltaV
public List> Recipes = new();
@@ -35,6 +42,8 @@ public sealed partial class LatheMenu : DefaultWindow
public EntityUid Entity;
+ private uint? _lastMiningPoints; // DeltaV: used to avoid Loc.GetString every frame
+
public LatheMenu()
{
RobustXamlLoader.Load(this);
@@ -43,6 +52,7 @@ public LatheMenu()
_spriteSystem = _entityManager.System();
_lathe = _entityManager.System();
_materialStorage = _entityManager.System();
+ _miningPoints = _entityManager.System(); // DeltaV
SearchBar.OnTextChanged += _ =>
{
@@ -70,9 +80,31 @@ public void SetEntity(EntityUid uid)
}
}
+ // Begin DeltaV Additions: Mining points UI
+ MiningPointsContainer.Visible = _entityManager.TryGetComponent(Entity, out var points);
+ MiningPointsClaimButton.OnPressed += _ => OnClaimMiningPoints?.Invoke();
+ if (points != null)
+ UpdateMiningPoints(points.Points);
+ // End DeltaV Additions
+
MaterialsList.SetOwner(Entity);
}
+ ///
+ /// DeltaV: Updates the UI elements for mining points.
+ ///
+ private void UpdateMiningPoints(uint points)
+ {
+ MiningPointsClaimButton.Disabled = points == 0 ||
+ _player.LocalSession?.AttachedEntity is not {} player ||
+ _miningPoints.TryFindIdCard(player) == null;
+ if (points == _lastMiningPoints)
+ return;
+
+ _lastMiningPoints = points;
+ MiningPointsLabel.Text = Loc.GetString("lathe-menu-mining-points", ("points", points));
+ }
+
protected override void Opened()
{
base.Opened();
@@ -83,6 +115,17 @@ protected override void Opened()
}
}
+ ///
+ /// DeltaV: Update mining points UI whenever it changes.
+ ///
+ protected override void FrameUpdate(FrameEventArgs args)
+ {
+ base.FrameUpdate(args);
+
+ if (_entityManager.TryGetComponent(Entity, out var points))
+ UpdateMiningPoints(points.Points);
+ }
+
///
/// Populates the list of all the recipes
///
diff --git a/Content.Client/Light/HandheldLightSystem.cs b/Content.Client/Light/HandheldLightSystem.cs
index ddd99c7c483..d25b28756f8 100644
--- a/Content.Client/Light/HandheldLightSystem.cs
+++ b/Content.Client/Light/HandheldLightSystem.cs
@@ -21,6 +21,22 @@ public override void Initialize()
SubscribeLocalEvent(OnAppearanceChange);
}
+ ///
+ /// TODO: Not properly predicted yet. Don't call this function if you want a the actual return value!
+ ///
+ public override bool TurnOff(Entity ent, bool makeNoise = true)
+ {
+ return true;
+ }
+
+ ///
+ /// TODO: Not properly predicted yet. Don't call this function if you want a the actual return value!
+ ///
+ public override bool TurnOn(EntityUid user, Entity uid)
+ {
+ return true;
+ }
+
private void OnAppearanceChange(EntityUid uid, HandheldLightComponent? component, ref AppearanceChangeEvent args)
{
if (!Resolve(uid, ref component))
diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs
index 1aabc4ff381..1361ca57cd2 100644
--- a/Content.Client/Lobby/LobbyState.cs
+++ b/Content.Client/Lobby/LobbyState.cs
@@ -116,7 +116,7 @@ public override void FrameUpdate(FrameEventArgs e)
return;
}
- Lobby!.StationTime.Text = Loc.GetString("lobby-state-player-status-round-not-started");
+ Lobby!.StationTime.Text = Loc.GetString("lobby-state-player-status-round-not-started");
string text;
if (_gameTicker.Paused)
@@ -136,6 +136,10 @@ public override void FrameUpdate(FrameEventArgs e)
{
text = Loc.GetString(seconds < -5 ? "lobby-state-right-now-question" : "lobby-state-right-now-confirmation");
}
+ else if (difference.TotalHours >= 1)
+ {
+ text = $"{Math.Floor(difference.TotalHours)}:{difference.Minutes:D2}:{difference.Seconds:D2}";
+ }
else
{
text = $"{difference.Minutes}:{difference.Seconds:D2}";
diff --git a/Content.Client/Lobby/LobbyUIController.cs b/Content.Client/Lobby/LobbyUIController.cs
index 3cf98c98aba..50a25519988 100644
--- a/Content.Client/Lobby/LobbyUIController.cs
+++ b/Content.Client/Lobby/LobbyUIController.cs
@@ -279,7 +279,7 @@ private void OpenSavePanel()
_profileEditor.OnOpenGuidebook += _guide.OpenHelp;
- _characterSetup = new CharacterSetupGui(EntityManager, _prototypeManager, _resourceCache, _preferencesManager, _profileEditor);
+ _characterSetup = new CharacterSetupGui(_profileEditor);
_characterSetup.CloseButton.OnPressed += _ =>
{
diff --git a/Content.Client/Lobby/UI/CharacterSetupGui.xaml b/Content.Client/Lobby/UI/CharacterSetupGui.xaml
index f83be265884..c463987a1fe 100644
--- a/Content.Client/Lobby/UI/CharacterSetupGui.xaml
+++ b/Content.Client/Lobby/UI/CharacterSetupGui.xaml
@@ -2,6 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
xmlns:style="clr-namespace:Content.Client.Stylesheets"
+ xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
VerticalExpand="True">
@@ -10,10 +11,15 @@
+
+
diff --git a/Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs b/Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs
index 777725b9eda..45799161324 100644
--- a/Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs
+++ b/Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs
@@ -1,6 +1,7 @@
using Content.Client.Info;
using Content.Client.Info.PlaytimeStats;
using Content.Client.Resources;
+using Content.Shared.CCVar;
using Content.Shared.Preferences;
using Robust.Client.AutoGenerated;
using Robust.Client.Graphics;
@@ -8,6 +9,7 @@
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Configuration;
using Robust.Shared.Prototypes;
namespace Content.Client.Lobby.UI
@@ -18,28 +20,23 @@ namespace Content.Client.Lobby.UI
[GenerateTypedNameReferences]
public sealed partial class CharacterSetupGui : Control
{
- private readonly IClientPreferencesManager _preferencesManager;
- private readonly IEntityManager _entManager;
- private readonly IPrototypeManager _protomanager;
+ [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!;
+ [Dependency] private readonly IEntityManager _entManager = default!;
+ [Dependency] private readonly IPrototypeManager _protomanager = default!;
+ [Dependency] private readonly IResourceCache _resourceCache = default!;
+ [Dependency] private readonly IConfigurationManager _cfg = default!;
private readonly Button _createNewCharacterButton;
public event Action? SelectCharacter;
public event Action? DeleteCharacter;
- public CharacterSetupGui(
- IEntityManager entManager,
- IPrototypeManager protoManager,
- IResourceCache resourceCache,
- IClientPreferencesManager preferencesManager,
- HumanoidProfileEditor profileEditor)
+ public CharacterSetupGui(HumanoidProfileEditor profileEditor)
{
RobustXamlLoader.Load(this);
- _preferencesManager = preferencesManager;
- _entManager = entManager;
- _protomanager = protoManager;
+ IoCManager.InjectDependencies(this);
- var panelTex = resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
+ var panelTex = _resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
var back = new StyleBoxTexture
{
Texture = panelTex,
@@ -56,7 +53,7 @@ public CharacterSetupGui(
_createNewCharacterButton.OnPressed += args =>
{
- preferencesManager.CreateCharacter(HumanoidCharacterProfile.Random());
+ _preferencesManager.CreateCharacter(HumanoidCharacterProfile.Random());
ReloadCharacterPickers();
args.Event.Handle();
};
@@ -65,6 +62,8 @@ public CharacterSetupGui(
RulesButton.OnPressed += _ => new RulesAndInfoWindow().Open();
StatsButton.OnPressed += _ => new PlaytimeStatsWindow().OpenCentered();
+
+ _cfg.OnValueChanged(CCVars.SeeOwnNotes, p => AdminRemarksButton.Visible = p, true);
}
///
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml.cs b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
index 81230130a1d..6471edb6f37 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml.cs
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
@@ -2,7 +2,6 @@
using Content.Client.UserInterface.Systems.EscapeMenu;
using Robust.Client.AutoGenerated;
using Robust.Client.Console;
-using Robust.Client.State;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Overlays/StencilOverlay.Weather.cs b/Content.Client/Overlays/StencilOverlay.Weather.cs
index bc514548036..ad69522dfda 100644
--- a/Content.Client/Overlays/StencilOverlay.Weather.cs
+++ b/Content.Client/Overlays/StencilOverlay.Weather.cs
@@ -35,7 +35,7 @@ private void DrawWeather(in OverlayDrawArgs args, WeatherPrototype weatherProto,
var matty = Matrix3x2.Multiply(matrix, invMatrix);
worldHandle.SetTransform(matty);
- foreach (var tile in grid.Comp.GetTilesIntersecting(worldAABB))
+ foreach (var tile in _map.GetTilesIntersecting(grid.Owner, grid, worldAABB))
{
// Ignored tiles for stencil
if (_weather.CanWeatherAffect(grid.Owner, grid, tile))
diff --git a/Content.Client/Overlays/StencilOverlay.cs b/Content.Client/Overlays/StencilOverlay.cs
index 78b1c4d2b15..eb5c27156ed 100644
--- a/Content.Client/Overlays/StencilOverlay.cs
+++ b/Content.Client/Overlays/StencilOverlay.cs
@@ -24,6 +24,7 @@ public sealed partial class StencilOverlay : Overlay
[Dependency] private readonly IPrototypeManager _protoManager = default!;
private readonly ParallaxSystem _parallax;
private readonly SharedTransformSystem _transform;
+ private readonly SharedMapSystem _map;
private readonly SpriteSystem _sprite;
private readonly WeatherSystem _weather;
@@ -33,11 +34,12 @@ public sealed partial class StencilOverlay : Overlay
private readonly ShaderInstance _shader;
- public StencilOverlay(ParallaxSystem parallax, SharedTransformSystem transform, SpriteSystem sprite, WeatherSystem weather)
+ public StencilOverlay(ParallaxSystem parallax, SharedTransformSystem transform, SharedMapSystem map, SpriteSystem sprite, WeatherSystem weather)
{
ZIndex = ParallaxSystem.ParallaxZIndex + 1;
_parallax = parallax;
_transform = transform;
+ _map = map;
_sprite = sprite;
_weather = weather;
IoCManager.InjectDependencies(this);
diff --git a/Content.Client/Overlays/StencilOverlaySystem.cs b/Content.Client/Overlays/StencilOverlaySystem.cs
index c8a9553cfdd..364ec0fddbf 100644
--- a/Content.Client/Overlays/StencilOverlaySystem.cs
+++ b/Content.Client/Overlays/StencilOverlaySystem.cs
@@ -10,13 +10,14 @@ public sealed class StencilOverlaySystem : EntitySystem
[Dependency] private readonly IOverlayManager _overlay = default!;
[Dependency] private readonly ParallaxSystem _parallax = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
+ [Dependency] private readonly SharedMapSystem _map = default!;
[Dependency] private readonly SpriteSystem _sprite = default!;
[Dependency] private readonly WeatherSystem _weather = default!;
public override void Initialize()
{
base.Initialize();
- _overlay.AddOverlay(new StencilOverlay(_parallax, _transform, _sprite, _weather));
+ _overlay.AddOverlay(new StencilOverlay(_parallax, _transform, _map, _sprite, _weather));
}
public override void Shutdown()
diff --git a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs
index d691f9acef3..64fc975b98c 100644
--- a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs
+++ b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs
@@ -1,7 +1,9 @@
using System.Linq;
using Content.Client.Message;
+using Content.Shared.DeltaV.Salvage.Systems; // DeltaV
using Content.Shared.Salvage;
using Content.Shared.Salvage.Magnet;
+using Robust.Client.Player; // DeltaV
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
@@ -10,12 +12,16 @@ namespace Content.Client.Salvage.UI;
public sealed class SalvageMagnetBoundUserInterface : BoundUserInterface
{
[Dependency] private readonly IEntityManager _entManager = default!;
+ [Dependency] private readonly IPlayerManager _player = default!; // DeltaV
+
+ private readonly MiningPointsSystem _points; // DeltaV
private OfferingWindow? _window;
public SalvageMagnetBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
{
IoCManager.InjectDependencies(this);
+ _points = _entManager.System(); // DeltaV
}
protected override void Open()
@@ -61,6 +67,21 @@ protected override void UpdateState(BoundUserInterfaceState state)
});
};
+ // Begin DeltaV Additions: Mining points cost for wrecks
+ if (offer.Cost > 0)
+ {
+ if (_player.LocalSession?.AttachedEntity is not {} user || !_points.UserHasPoints(user, offer.Cost))
+ option.Disabled = true;
+
+ var label = new Label
+ {
+ Text = Loc.GetString("salvage-magnet-mining-points-cost", ("points", offer.Cost)),
+ HorizontalAlignment = Control.HAlignment.Center
+ };
+ option.AddContent(label);
+ }
+ // End DeltaV Additions
+
switch (offer)
{
case AsteroidOffering asteroid:
diff --git a/Content.Client/Sandbox/SandboxSystem.cs b/Content.Client/Sandbox/SandboxSystem.cs
index 8a4c93fa354..abc717642c8 100644
--- a/Content.Client/Sandbox/SandboxSystem.cs
+++ b/Content.Client/Sandbox/SandboxSystem.cs
@@ -110,7 +110,7 @@ public bool Copy(ICommonSession? session, EntityCoordinates coords, EntityUid ui
}
// Try copy tile.
-
+
if (!_map.TryFindGridAt(_transform.ToMapCoordinates(coords), out var gridUid, out var grid) || !_mapSystem.TryGetTileRef(gridUid, grid, coords, out var tileRef))
return false;
@@ -157,10 +157,5 @@ public void ShowBb()
{
_consoleHost.ExecuteCommand("physics shapes");
}
-
- public void MachineLinking()
- {
- _consoleHost.ExecuteCommand("signallink");
- }
}
}
diff --git a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
index b50d8fa6b21..a5411005391 100644
--- a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
@@ -116,7 +116,7 @@ protected void DrawCircles(DrawingHandleScreen handle)
}
}
- protected void DrawGrid(DrawingHandleScreen handle, Matrix3x2 matrix, Entity grid, Color color, float alpha = 0.01f)
+ protected void DrawGrid(DrawingHandleScreen handle, Matrix3x2 gridToView, Entity grid, Color color, float alpha = 0.01f)
{
var rator = Maps.GetAllTilesEnumerator(grid.Owner, grid.Comp);
var minimapScale = MinimapScale;
@@ -264,7 +264,7 @@ protected void DrawGrid(DrawingHandleScreen handle, Matrix3x2 matrix, Entity
private EntityCoordinates? _coordinates;
+ ///
+ /// Entity of controlling console
+ ///
+ private EntityUid? _consoleEntity;
+
private Angle? _rotation;
private Dictionary> _docks = new();
@@ -57,6 +62,11 @@ public void SetMatrix(EntityCoordinates? coordinates, Angle? angle)
_rotation = angle;
}
+ public void SetConsole(EntityUid? consoleEntity)
+ {
+ _consoleEntity = consoleEntity;
+ }
+
protected override void KeyBindUp(GUIBoundKeyEventArgs args)
{
base.KeyBindUp(args);
@@ -139,40 +149,35 @@ protected override void Draw(DrawingHandleScreen handle)
}
var mapPos = _transform.ToMapCoordinates(_coordinates.Value);
- var offset = _coordinates.Value.Position;
- var posMatrix = Matrix3Helpers.CreateTransform(offset, _rotation.Value);
+ var posMatrix = Matrix3Helpers.CreateTransform(_coordinates.Value.Position, _rotation.Value);
var ourEntRot = RotateWithEntity ? _transform.GetWorldRotation(xform) : _rotation.Value;
var ourEntMatrix = Matrix3Helpers.CreateTransform(_transform.GetWorldPosition(xform), ourEntRot);
- var ourWorldMatrix = Matrix3x2.Multiply(posMatrix, ourEntMatrix);
- Matrix3x2.Invert(ourWorldMatrix, out var ourWorldMatrixInvert);
+ var shuttleToWorld = Matrix3x2.Multiply(posMatrix, ourEntMatrix);
+ Matrix3x2.Invert(shuttleToWorld, out var worldToShuttle);
+ var shuttleToView = Matrix3x2.CreateScale(new Vector2(MinimapScale, -MinimapScale)) * Matrix3x2.CreateTranslation(MidPointVector);
// Draw our grid in detail
var ourGridId = xform.GridUid;
if (EntManager.TryGetComponent(ourGridId, out var ourGrid) &&
fixturesQuery.HasComponent(ourGridId.Value))
{
- var ourGridMatrix = _transform.GetWorldMatrix(ourGridId.Value);
- var matrix = Matrix3x2.Multiply(ourGridMatrix, ourWorldMatrixInvert);
+ var ourGridToWorld = _transform.GetWorldMatrix(ourGridId.Value);
+ var ourGridToShuttle = Matrix3x2.Multiply(ourGridToWorld, worldToShuttle);
+ var ourGridToView = ourGridToShuttle * shuttleToView;
var color = _shuttles.GetIFFColor(ourGridId.Value, self: true);
- DrawGrid(handle, matrix, (ourGridId.Value, ourGrid), color);
- DrawDocks(handle, ourGridId.Value, matrix);
+ DrawGrid(handle, ourGridToView, (ourGridId.Value, ourGrid), color);
+ DrawDocks(handle, ourGridId.Value, ourGridToView);
}
- var invertedPosition = _coordinates.Value.Position - offset;
- invertedPosition.Y = -invertedPosition.Y;
- // Don't need to transform the InvWorldMatrix again as it's already offset to its position.
-
// Draw radar position on the station
- var radarPos = invertedPosition;
const float radarVertRadius = 2f;
-
var radarPosVerts = new Vector2[]
{
- ScalePosition(radarPos + new Vector2(0f, -radarVertRadius)),
- ScalePosition(radarPos + new Vector2(radarVertRadius / 2f, 0f)),
- ScalePosition(radarPos + new Vector2(0f, radarVertRadius)),
- ScalePosition(radarPos + new Vector2(radarVertRadius / -2f, 0f)),
+ ScalePosition(new Vector2(0f, -radarVertRadius)),
+ ScalePosition(new Vector2(radarVertRadius / 2f, 0f)),
+ ScalePosition(new Vector2(0f, radarVertRadius)),
+ ScalePosition(new Vector2(radarVertRadius / -2f, 0f)),
};
handle.DrawPrimitives(DrawPrimitiveTopology.TriangleFan, radarPosVerts, Color.Lime);
@@ -197,8 +202,8 @@ protected override void Draw(DrawingHandleScreen handle)
if (!_shuttles.CanDraw(gUid, gridBody, iff))
continue;
- var gridMatrix = _transform.GetWorldMatrix(gUid);
- var matty = Matrix3x2.Multiply(gridMatrix, ourWorldMatrixInvert);
+ var curGridToWorld = _transform.GetWorldMatrix(gUid);
+ var curGridToView = curGridToWorld * worldToShuttle * shuttleToView;
var labelColor = _shuttles.GetIFFColor(grid, self: false, iff);
var coordColor = new Color(labelColor.R * 0.8f, labelColor.G * 0.8f, labelColor.B * 0.8f, 0.5f);
@@ -213,8 +218,7 @@ protected override void Draw(DrawingHandleScreen handle)
{
var gridBounds = grid.Comp.LocalAABB;
- var gridCentre = Vector2.Transform(gridBody.LocalCenter, matty);
- gridCentre.Y = -gridCentre.Y;
+ var gridCentre = Vector2.Transform(gridBody.LocalCenter, curGridToView);
var distance = gridCentre.Length();
var labelText = Loc.GetString("shuttle-console-iff-label", ("name", labelName),
@@ -230,9 +234,8 @@ protected override void Draw(DrawingHandleScreen handle)
// y-offset the control to always render below the grid (vertically)
var yOffset = Math.Max(gridBounds.Height, gridBounds.Width) * MinimapScale / 1.8f;
- // The actual position in the UI. We centre the label by offsetting the matrix position
- // by half the label's width, plus the y-offset
- var gridScaledPosition = ScalePosition(gridCentre) - new Vector2(0, -yOffset);
+ // The actual position in the UI.
+ var gridScaledPosition = gridCentre - new Vector2(0, -yOffset);
// Normalize the grid position if it exceeds the viewport bounds
// normalizing it instead of clamping it preserves the direction of the vector and prevents corner-hugging
@@ -264,18 +267,32 @@ protected override void Draw(DrawingHandleScreen handle)
}
// Detailed view
- var gridAABB = gridMatrix.TransformBox(grid.Comp.LocalAABB);
+ var gridAABB = curGridToWorld.TransformBox(grid.Comp.LocalAABB);
// Skip drawing if it's out of range.
if (!gridAABB.Intersects(viewAABB))
continue;
- DrawGrid(handle, matty, grid, labelColor);
- DrawDocks(handle, gUid, matty);
+ DrawGrid(handle, curGridToView, grid, labelColor);
+ DrawDocks(handle, gUid, curGridToView);
}
+
+ // If we've set the controlling console, and it's on a different grid
+ // to the shuttle itself, then draw an additional marker to help the
+ // player determine where they are relative to the shuttle.
+ if (_consoleEntity != null && xformQuery.TryGetComponent(_consoleEntity, out var consoleXform))
+ {
+ if (consoleXform.ParentUid != _coordinates.Value.EntityId)
+ {
+ var consolePositionWorld = _transform.GetWorldPosition((EntityUid)_consoleEntity);
+ var p = Vector2.Transform(consolePositionWorld, worldToShuttle * shuttleToView);
+ handle.DrawCircle(p, 5, Color.ToSrgb(Color.Cyan), true);
+ }
+ }
+
}
- private void DrawDocks(DrawingHandleScreen handle, EntityUid uid, Matrix3x2 matrix)
+ private void DrawDocks(DrawingHandleScreen handle, EntityUid uid, Matrix3x2 gridToView)
{
if (!ShowDocks)
return;
@@ -283,33 +300,32 @@ private void DrawDocks(DrawingHandleScreen handle, EntityUid uid, Matrix3x2 matr
const float DockScale = 0.6f;
var nent = EntManager.GetNetEntity(uid);
+ const float sqrt2 = 1.41421356f;
+ const float dockRadius = DockScale * sqrt2;
+ // Worst-case bounds used to cull a dock:
+ Box2 viewBounds = new Box2(-dockRadius, -dockRadius, Size.X + dockRadius, Size.Y + dockRadius);
if (_docks.TryGetValue(nent, out var docks))
{
foreach (var state in docks)
{
var position = state.Coordinates.Position;
- var uiPosition = Vector2.Transform(position, matrix);
- if (uiPosition.Length() > (WorldRange * 2f) - DockScale)
+ var positionInView = Vector2.Transform(position, gridToView);
+ if (!viewBounds.Contains(positionInView))
+ {
continue;
+ }
var color = Color.ToSrgb(Color.Magenta);
var verts = new[]
{
- Vector2.Transform(position + new Vector2(-DockScale, -DockScale), matrix),
- Vector2.Transform(position + new Vector2(DockScale, -DockScale), matrix),
- Vector2.Transform(position + new Vector2(DockScale, DockScale), matrix),
- Vector2.Transform(position + new Vector2(-DockScale, DockScale), matrix),
+ Vector2.Transform(position + new Vector2(-DockScale, -DockScale), gridToView),
+ Vector2.Transform(position + new Vector2(DockScale, -DockScale), gridToView),
+ Vector2.Transform(position + new Vector2(DockScale, DockScale), gridToView),
+ Vector2.Transform(position + new Vector2(-DockScale, DockScale), gridToView),
};
- for (var i = 0; i < verts.Length; i++)
- {
- var vert = verts[i];
- vert.Y = -vert.Y;
- verts[i] = ScalePosition(vert);
- }
-
handle.DrawPrimitives(DrawPrimitiveTopology.TriangleFan, verts, color.WithAlpha(0.8f));
handle.DrawPrimitives(DrawPrimitiveTopology.LineStrip, verts, color);
}
diff --git a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs
index 4e412df8581..bb0dba2f57d 100644
--- a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs
+++ b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs
@@ -9,6 +9,7 @@
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
using Robust.Shared.Utility;
namespace Content.Client.Silicons.Laws.Ui;
@@ -18,8 +19,13 @@ public sealed partial class LawDisplay : Control
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IChatManager _chatManager = default!;
+ [Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly EntityManager _entityManager = default!;
+ private static readonly TimeSpan PressCooldown = TimeSpan.FromSeconds(3);
+
+ private readonly Dictionary _nextAllowedPress = new();
+
public LawDisplay(EntityUid uid, SiliconLaw law, HashSet? radioChannels)
{
RobustXamlLoader.Load(this);
@@ -47,9 +53,12 @@ public LawDisplay(EntityUid uid, SiliconLaw law, HashSet? radioChannels)
MinWidth = 75,
};
+ _nextAllowedPress[localButton] = TimeSpan.Zero;
+
localButton.OnPressed += _ =>
{
_chatManager.SendMessage($"{lawIdentifierPlaintext}: {lawDescriptionPlaintext}", ChatSelectChannel.Local);
+ _nextAllowedPress[localButton] = _timing.CurTime + PressCooldown;
};
LawAnnouncementButtons.AddChild(localButton);
@@ -71,6 +80,8 @@ public LawDisplay(EntityUid uid, SiliconLaw law, HashSet? radioChannels)
MinWidth = 75,
};
+ _nextAllowedPress[radioChannelButton] = TimeSpan.Zero;
+
radioChannelButton.OnPressed += _ =>
{
switch (radioChannel)
@@ -80,9 +91,21 @@ public LawDisplay(EntityUid uid, SiliconLaw law, HashSet? radioChannels)
default:
_chatManager.SendMessage($"{SharedChatSystem.RadioChannelPrefix}{radioChannelProto.KeyCode} {lawIdentifierPlaintext}: {lawDescriptionPlaintext}", ChatSelectChannel.Radio); break;
}
+ _nextAllowedPress[radioChannelButton] = _timing.CurTime + PressCooldown;
};
LawAnnouncementButtons.AddChild(radioChannelButton);
}
}
+
+ protected override void FrameUpdate(FrameEventArgs args)
+ {
+ base.FrameUpdate(args);
+
+ var curTime = _timing.CurTime;
+ foreach (var (button, nextPress) in _nextAllowedPress)
+ {
+ button.Disabled = curTime < nextPress;
+ }
+ }
}
diff --git a/Content.Client/Singularity/Systems/EventHorizonSystem.cs b/Content.Client/Singularity/Systems/EventHorizonSystem.cs
index 3dd63a0c9c8..606116fced4 100644
--- a/Content.Client/Singularity/Systems/EventHorizonSystem.cs
+++ b/Content.Client/Singularity/Systems/EventHorizonSystem.cs
@@ -1,7 +1,7 @@
using Content.Shared.Singularity.EntitySystems;
using Content.Shared.Singularity.Components;
-namespace Content.Client.Singularity.EntitySystems;
+namespace Content.Client.Singularity.Systems;
///
/// The client-side version of .
diff --git a/Content.Client/Singularity/Systems/SingularityGeneratorSystem.cs b/Content.Client/Singularity/Systems/SingularityGeneratorSystem.cs
new file mode 100644
index 00000000000..f5b85f8b3cf
--- /dev/null
+++ b/Content.Client/Singularity/Systems/SingularityGeneratorSystem.cs
@@ -0,0 +1,12 @@
+using Content.Shared.Singularity.EntitySystems;
+using Content.Shared.Singularity.Components;
+
+namespace Content.Client.Singularity.Systems;
+
+///
+/// The client-side version of .
+/// Manages s.
+/// Exists to make relevant signal handlers (ie: ) work on the client.
+///
+public sealed class SingularityGeneratorSystem : SharedSingularityGeneratorSystem
+{}
diff --git a/Content.Client/Singularity/Systems/SingularitySystem.cs b/Content.Client/Singularity/Systems/SingularitySystem.cs
index 5293ad499d0..50a12466be1 100644
--- a/Content.Client/Singularity/Systems/SingularitySystem.cs
+++ b/Content.Client/Singularity/Systems/SingularitySystem.cs
@@ -5,7 +5,7 @@
using Robust.Shared.GameStates;
using Robust.Shared.Utility;
-namespace Content.Client.Singularity.EntitySystems;
+namespace Content.Client.Singularity.Systems;
///
/// The client-side version of .
diff --git a/Content.Client/Stack/StackSystem.cs b/Content.Client/Stack/StackSystem.cs
index 7e681aeba3e..f57f4d4e170 100644
--- a/Content.Client/Stack/StackSystem.cs
+++ b/Content.Client/Stack/StackSystem.cs
@@ -8,7 +8,7 @@
namespace Content.Client.Stack
{
[UsedImplicitly]
- public sealed class StackSystem : SharedStackSystem
+ public sealed partial class StackSystem : SharedStackSystem // Frontier: add partial to class definition
{
[Dependency] private readonly AppearanceSystem _appearanceSystem = default!;
[Dependency] private readonly ItemCounterSystem _counterSystem = default!;
@@ -44,7 +44,7 @@ public override void SetCount(EntityUid uid, int amount, StackComponent? compone
// TODO PREDICT ENTITY DELETION: This should really just be a normal entity deletion call.
if (component.Count <= 0 && !component.Lingering)
{
- Xform.DetachEntity(uid, Transform(uid));
+ Xform.DetachParentToNull(uid, Transform(uid));
return;
}
@@ -56,20 +56,25 @@ private void OnAppearanceChange(EntityUid uid, StackComponent comp, ref Appearan
if (args.Sprite == null || comp.LayerStates.Count < 1)
return;
+ StackLayerData data = new StackLayerData(); // Frontier: use structure to store StackLayerData
+
// Skip processing if no actual
- if (!_appearanceSystem.TryGetData(uid, StackVisuals.Actual, out var actual, args.Component))
+ if (!_appearanceSystem.TryGetData(uid, StackVisuals.Actual, out data.Actual, args.Component))
return;
- if (!_appearanceSystem.TryGetData(uid, StackVisuals.MaxCount, out var maxCount, args.Component))
- maxCount = comp.LayerStates.Count;
+ if (!_appearanceSystem.TryGetData(uid, StackVisuals.MaxCount, out data.MaxCount, args.Component))
+ data.MaxCount = comp.LayerStates.Count;
+
+ if (!_appearanceSystem.TryGetData(uid, StackVisuals.Hide, out data.Hidden, args.Component))
+ data.Hidden = false;
- if (!_appearanceSystem.TryGetData(uid, StackVisuals.Hide, out var hidden, args.Component))
- hidden = false;
+ if (comp.LayerFunction != StackLayerFunction.None) // Frontier: use stack layer function to modify appearance if provided.
+ ApplyLayerFunction(uid, comp, ref data); // Frontier: definition in _NF/Stack/StackSystem.Layers.cs
if (comp.IsComposite)
- _counterSystem.ProcessCompositeSprite(uid, actual, maxCount, comp.LayerStates, hidden, sprite: args.Sprite);
+ _counterSystem.ProcessCompositeSprite(uid, data.Actual, data.MaxCount, comp.LayerStates, data.Hidden, sprite: args.Sprite);
else
- _counterSystem.ProcessOpaqueSprite(uid, comp.BaseLayer, actual, maxCount, comp.LayerStates, hidden, sprite: args.Sprite);
+ _counterSystem.ProcessOpaqueSprite(uid, comp.BaseLayer, data.Actual, data.MaxCount, comp.LayerStates, data.Hidden, sprite: args.Sprite);
}
}
}
diff --git a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
index 0696ae9d3f9..62b3b19e38b 100644
--- a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
@@ -16,9 +16,8 @@
namespace Content.Client.UserInterface.Systems.Chat.Widgets;
[GenerateTypedNameReferences]
-#pragma warning disable RA0003
+[Virtual]
public partial class ChatBox : UIWidget
-#pragma warning restore RA0003
{
private readonly ChatUIController _controller;
private readonly IEntityManager _entManager;
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs
index 627ecfe987a..9e2ff816b36 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs
@@ -71,6 +71,7 @@ public void AddEntry(string name, string description, bool hasAccess, FormattedM
buttonHeading.AddStyleClass(ContainerButton.StyleClassButton);
buttonHeading.Label.HorizontalAlignment = HAlignment.Center;
buttonHeading.Label.HorizontalExpand = true;
+ buttonHeading.Margin = new Thickness(8, 0, 8, 2);
var body = new CollapsibleBody
{
diff --git a/Content.Client/UserInterface/Systems/Hands/HandsUIController.cs b/Content.Client/UserInterface/Systems/Hands/HandsUIController.cs
index 9ee429ba7e9..edc02600611 100644
--- a/Content.Client/UserInterface/Systems/Hands/HandsUIController.cs
+++ b/Content.Client/UserInterface/Systems/Hands/HandsUIController.cs
@@ -83,22 +83,27 @@ private void HandPressed(GUIBoundKeyEventArgs args, SlotControl hand)
if (args.Function == EngineKeyFunctions.UIClick)
{
_handsSystem.UIHandClick(_playerHandsComponent, hand.SlotName);
+ args.Handle();
}
else if (args.Function == EngineKeyFunctions.UseSecondary)
{
_handsSystem.UIHandOpenContextMenu(hand.SlotName);
+ args.Handle();
}
else if (args.Function == ContentKeyFunctions.ActivateItemInWorld)
{
_handsSystem.UIHandActivate(hand.SlotName);
+ args.Handle();
}
else if (args.Function == ContentKeyFunctions.AltActivateItemInWorld)
{
_handsSystem.UIHandAltActivateItem(hand.SlotName);
+ args.Handle();
}
else if (args.Function == ContentKeyFunctions.ExamineEntity)
{
_handsSystem.UIInventoryExamine(hand.SlotName);
+ args.Handle();
}
}
diff --git a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml b/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
index dc8972970ac..5368d5d8721 100644
--- a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
+++ b/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
@@ -11,17 +11,21 @@
Orientation="Horizontal"
HorizontalAlignment="Stretch"
VerticalAlignment="Top"
- SeparationOverride="5"
>
+
@@ -39,7 +43,7 @@
Icon="{xe:Tex '/Textures/Interface/character.svg.192dpi.png'}"
ToolTip="{Loc 'game-hud-open-character-menu-button-tooltip'}"
BoundKey = "{x:Static is:ContentKeyFunctions.OpenCharacterMenu}"
- MinSize="42 64"
+ MinSize="48 64"
HorizontalExpand="True"
AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
/>
@@ -49,7 +53,7 @@
Icon="{xe:Tex '/Textures/Interface/emotes.svg.192dpi.png'}"
ToolTip="{Loc 'game-hud-open-emotes-menu-button-tooltip'}"
BoundKey = "{x:Static is:ContentKeyFunctions.OpenEmotesMenu}"
- MinSize="42 64"
+ MinSize="48 64"
HorizontalExpand="True"
AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
/>
@@ -59,7 +63,7 @@
Icon="{xe:Tex '/Textures/Interface/hammer.svg.192dpi.png'}"
BoundKey = "{x:Static is:ContentKeyFunctions.OpenCraftingMenu}"
ToolTip="{Loc 'game-hud-open-crafting-menu-button-tooltip'}"
- MinSize="42 64"
+ MinSize="48 64"
HorizontalExpand="True"
AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
/>
@@ -69,7 +73,7 @@
Icon="{xe:Tex '/Textures/Interface/fist.svg.192dpi.png'}"
BoundKey = "{x:Static is:ContentKeyFunctions.OpenActionsMenu}"
ToolTip="{Loc 'game-hud-open-actions-menu-button-tooltip'}"
- MinSize="42 64"
+ MinSize="48 64"
HorizontalExpand="True"
AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
/>
@@ -79,7 +83,7 @@
Icon="{xe:Tex '/Textures/Interface/gavel.svg.192dpi.png'}"
BoundKey = "{x:Static is:ContentKeyFunctions.OpenAdminMenu}"
ToolTip="{Loc 'game-hud-open-admin-menu-button-tooltip'}"
- MinSize="42 64"
+ MinSize="48 64"
HorizontalExpand="True"
AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
/>
@@ -89,7 +93,7 @@
Icon="{xe:Tex '/Textures/Interface/sandbox.svg.192dpi.png'}"
BoundKey = "{x:Static is:ContentKeyFunctions.OpenSandboxWindow}"
ToolTip="{Loc 'game-hud-open-sandbox-menu-button-tooltip'}"
- MinSize="42 64"
+ MinSize="48 64"
HorizontalExpand="True"
AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
/>
@@ -99,8 +103,9 @@
Icon="{xe:Tex '/Textures/Interface/info.svg.192dpi.png'}"
BoundKey = "{x:Static is:ContentKeyFunctions.OpenAHelp}"
ToolTip="{Loc 'ui-options-function-open-a-help'}"
- MinSize="42 64"
+ MinSize="48 64"
HorizontalExpand="True"
- AppendStyleClass="{x:Static style:StyleBase.ButtonOpenLeft}"
+ AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
/>
+
diff --git a/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs b/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
index 58c8a1451bd..1924bf2b24c 100644
--- a/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
+++ b/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
@@ -1,4 +1,5 @@
-using Content.Client.Administration.Managers;
+using System.Numerics;
+using Content.Client.Administration.Managers;
using Content.Client.Gameplay;
using Content.Client.Markers;
using Content.Client.Sandbox;
@@ -7,9 +8,7 @@
using Content.Client.UserInterface.Systems.DecalPlacer;
using Content.Client.UserInterface.Systems.Sandbox.Windows;
using Content.Shared.Input;
-using Content.Shared.Silicons.StationAi;
using JetBrains.Annotations;
-using Robust.Client.Console;
using Robust.Client.Debugging;
using Robust.Client.Graphics;
using Robust.Client.Input;
@@ -109,9 +108,13 @@ public void LoadButton()
private void EnsureWindow()
{
- if(_window is { Disposed: false })
+ if (_window is { Disposed: false })
return;
_window = UIManager.CreateWindow();
+ // Pre-center the window without forcing it to the center every time.
+ _window.OpenCentered();
+ _window.Close();
+
_window.OnOpen += () => { SandboxButton!.Pressed = true; };
_window.OnClose += () => { SandboxButton!.Pressed = false; };
_window.ToggleLightButton.Pressed = !_light.Enabled;
@@ -149,7 +152,6 @@ private void EnsureWindow()
_window.ToggleSubfloorButton.OnPressed += _ => _sandbox.ToggleSubFloor();
_window.ShowMarkersButton.OnPressed += _ => _sandbox.ShowMarkers();
_window.ShowBbButton.OnPressed += _ => _sandbox.ShowBb();
- _window.MachineLinkingButton.OnPressed += _ => _sandbox.MachineLinking();
}
private void CheckSandboxVisibility()
@@ -164,7 +166,7 @@ public void OnStateExited(GameplayState state)
{
if (_window != null)
{
- _window.Dispose();
+ _window.Close();
_window = null;
}
@@ -209,7 +211,7 @@ private void ToggleWindow()
if (_sandbox.SandboxAllowed && _window.IsOpen != true)
{
UIManager.ClickSound();
- _window.OpenCentered();
+ _window.Open();
}
else
{
diff --git a/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml b/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml
index 05e65cf29c3..bec1d6b4d6f 100644
--- a/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml
+++ b/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml
@@ -4,20 +4,24 @@
Title="{Loc sandbox-window-title}"
Resizable="False">
-
-
-
+
+
-
-
+
+
-
+
-
+
+
+
+
+
+
diff --git a/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs b/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
index 97c9d8b7959..1e61ad98380 100644
--- a/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
+++ b/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
@@ -307,12 +307,6 @@ private void OnPieceUnpressed(GUIBoundKeyEventArgs args, ItemGridPiece control)
_entity.GetNetEntity(storageEnt),
new ItemStorageLocation(DraggingRotation, position)));
}
- else
- {
- _entity.RaisePredictiveEvent(new StorageRemoveItemEvent(
- _entity.GetNetEntity(draggingGhost.Entity),
- _entity.GetNetEntity(storageEnt)));
- }
_menuDragHelper.EndDrag();
_container?.BuildItemPieces();
diff --git a/Content.Client/Wires/UI/WiresMenu.cs b/Content.Client/Wires/UI/WiresMenu.cs
index 77fc3accceb..01c88bcd0c6 100644
--- a/Content.Client/Wires/UI/WiresMenu.cs
+++ b/Content.Client/Wires/UI/WiresMenu.cs
@@ -206,8 +206,7 @@ public WiresMenu()
(_statusContainer = new GridContainer
{
Margin = new Thickness(8, 4),
- // TODO: automatically change columns count.
- Columns = 3
+ Rows = 2
})
}
}
@@ -227,7 +226,8 @@ public WiresMenu()
PanelOverride = new StyleBoxFlat {BackgroundColor = Color.FromHex("#525252ff")}
});
CloseButton.OnPressed += _ => Close();
- SetSize = new Vector2(320, 200);
+ SetHeight = 200;
+ MinWidth = 320;
}
@@ -503,6 +503,8 @@ private sealed class StatusLight : Control
public StatusLight(StatusLightData data, IResourceCache resourceCache)
{
+ HorizontalAlignment = HAlignment.Right;
+
var hsv = Color.ToHsv(data.Color);
hsv.Z /= 2;
var dimColor = Color.FromHsv(hsv);
diff --git a/Content.Client/_NF/Stack/StackSystem.Layers.cs b/Content.Client/_NF/Stack/StackSystem.Layers.cs
new file mode 100644
index 00000000000..2893d32d3f5
--- /dev/null
+++ b/Content.Client/_NF/Stack/StackSystem.Layers.cs
@@ -0,0 +1,56 @@
+using Content.Shared.Stacks.Components;
+using Content.Shared.Stacks;
+
+namespace Content.Client.Stack
+{
+ ///
+ /// Data used to determine which layers of a stack's sprite are visible.
+ ///
+ public struct StackLayerData
+ {
+ public int Actual;
+ public int MaxCount;
+ public bool Hidden;
+ }
+
+ public sealed partial class StackSystem : SharedStackSystem
+ {
+ // Modifies a given stack component to adjust the layers to display.
+ private bool ApplyLayerFunction(EntityUid uid, StackComponent comp, ref StackLayerData data)
+ {
+ switch (comp.LayerFunction)
+ {
+ case StackLayerFunction.Threshold:
+ if (TryComp(uid, out var threshold))
+ {
+ ApplyThreshold(threshold, ref data);
+ return true;
+ }
+ break;
+ }
+ // No function applied.
+ return false;
+ }
+
+ ///
+ /// Sets Actual to the number of thresholds that Actual exceeds from the beginning of the list.
+ /// Sets MaxCount to the total number of thresholds plus one (for values under thresholds).
+ ///
+ private static void ApplyThreshold(StackLayerThresholdComponent comp, ref StackLayerData data)
+ {
+ // We must stop before we run out of thresholds or layers, whichever's smaller.
+ data.MaxCount = Math.Min(comp.Thresholds.Count + 1, data.MaxCount);
+ int newActual = 0;
+ foreach (var threshold in comp.Thresholds)
+ {
+ //If our value exceeds threshold, the next layer should be displayed.
+ //Note: we must ensure actual <= MaxCount.
+ if (data.Actual >= threshold && newActual < data.MaxCount)
+ newActual++;
+ else
+ break;
+ }
+ data.Actual = newActual;
+ }
+ }
+}
diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
index 42bea8989cd..55056de1471 100644
--- a/Content.IntegrationTests/Tests/EntityTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -268,6 +268,11 @@ await server.WaitPost(() =>
if (protoId == "MobHumanSpaceNinja")
continue;
+ // TODO fix tests properly upstream
+ // Fails due to audio components made when making anouncements
+ if (protoId == "StandardNanotrasenStation")
+ continue;
+
var count = server.EntMan.EntityCount;
var clientCount = client.EntMan.EntityCount;
EntityUid uid = default;
diff --git a/Content.PatreonParser/Content.PatreonParser.csproj b/Content.PatreonParser/Content.PatreonParser.csproj
index 3206ad42e9d..ec259e6f1dc 100644
--- a/Content.PatreonParser/Content.PatreonParser.csproj
+++ b/Content.PatreonParser/Content.PatreonParser.csproj
@@ -2,7 +2,7 @@
Exe
- net7.0
+ net8.0
enable
enable
true
diff --git a/Content.Server/Access/Systems/AgentIDCardSystem.cs b/Content.Server/Access/Systems/AgentIDCardSystem.cs
index a38aefce935..51fa6e29d0b 100644
--- a/Content.Server/Access/Systems/AgentIDCardSystem.cs
+++ b/Content.Server/Access/Systems/AgentIDCardSystem.cs
@@ -9,6 +9,7 @@
using Robust.Shared.Prototypes;
using Content.Shared.Roles;
using System.Diagnostics.CodeAnalysis;
+using Content.Shared.DeltaV.NanoChat; // DeltaV
namespace Content.Server.Access.Systems
{
@@ -18,6 +19,7 @@ public sealed class AgentIDCardSystem : SharedAgentIdCardSystem
[Dependency] private readonly IdCardSystem _cardSystem = default!;
[Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+ [Dependency] private readonly SharedNanoChatSystem _nanoChat = default!; // DeltaV
public override void Initialize()
{
@@ -28,6 +30,17 @@ public override void Initialize()
SubscribeLocalEvent(OnNameChanged);
SubscribeLocalEvent(OnJobChanged);
SubscribeLocalEvent(OnJobIconChanged);
+ SubscribeLocalEvent(OnNumberChanged); // DeltaV
+ }
+
+ // DeltaV - Add number change handler
+ private void OnNumberChanged(Entity ent, ref AgentIDCardNumberChangedMessage args)
+ {
+ if (!TryComp(ent, out var comp))
+ return;
+
+ _nanoChat.SetNumber((ent, comp), args.Number);
+ Dirty(ent, comp);
}
private void OnAfterInteract(EntityUid uid, AgentIDCardComponent component, AfterInteractEvent args)
@@ -42,6 +55,34 @@ private void OnAfterInteract(EntityUid uid, AgentIDCardComponent component, Afte
access.Tags.UnionWith(targetAccess.Tags);
var addedLength = access.Tags.Count - beforeLength;
+ // DeltaV - Copy NanoChat data if available
+ if (TryComp(args.Target, out var targetNanoChat) &&
+ TryComp(uid, out var agentNanoChat))
+ {
+ // First clear existing data
+ _nanoChat.Clear((uid, agentNanoChat));
+
+ // Copy the number
+ if (_nanoChat.GetNumber((args.Target.Value, targetNanoChat)) is { } number)
+ _nanoChat.SetNumber((uid, agentNanoChat), number);
+
+ // Copy all recipients and their messages
+ foreach (var (recipientNumber, recipient) in _nanoChat.GetRecipients((args.Target.Value, targetNanoChat)))
+ {
+ _nanoChat.SetRecipient((uid, agentNanoChat), recipientNumber, recipient);
+
+ if (_nanoChat.GetMessagesForRecipient((args.Target.Value, targetNanoChat), recipientNumber) is not
+ { } messages)
+ continue;
+
+ foreach (var message in messages)
+ {
+ _nanoChat.AddMessage((uid, agentNanoChat), recipientNumber, message);
+ }
+ }
+ }
+ // End DeltaV
+
if (addedLength == 0)
{
_popupSystem.PopupEntity(Loc.GetString("agent-id-no-new", ("card", args.Target)), args.Target.Value, args.User);
@@ -67,7 +108,17 @@ private void AfterUIOpen(EntityUid uid, AgentIDCardComponent component, AfterAct
if (!TryComp(uid, out var idCard))
return;
- var state = new AgentIDCardBoundUserInterfaceState(idCard.FullName ?? "", idCard.LocalizedJobTitle ?? "", idCard.JobIcon);
+ // DeltaV - Get current number if it exists
+ uint? currentNumber = null;
+ if (TryComp(uid, out var comp))
+ currentNumber = comp.Number;
+
+ var state = new AgentIDCardBoundUserInterfaceState(
+ idCard.FullName ?? "",
+ idCard.LocalizedJobTitle ?? "",
+ idCard.JobIcon,
+ currentNumber); // DeltaV - Pass current number
+
_uiSystem.SetUiState(uid, AgentIDCardUiKey.Key, state);
}
diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs
index e67ec326df1..be3195f9ed5 100644
--- a/Content.Server/Administration/Systems/AdminSystem.cs
+++ b/Content.Server/Administration/Systems/AdminSystem.cs
@@ -340,7 +340,7 @@ private void UpdatePanicBunker()
var admins = PanicBunker.CountDeadminnedAdmins
? _adminManager.AllAdmins
: _adminManager.ActiveAdmins;
- var hasAdmins = admins.Any();
+ var hasAdmins = admins.Any(p => _adminManager.HasAdminFlag(p, AdminFlags.Ban)); // DeltaV: Add predicate to require someone that can handle ahelps, not just curators
// TODO Fix order dependent Cvars
// Please for the sake of my sanity don't make cvars & order dependent.
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
index d57898d9d98..5e002198056 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
@@ -23,6 +23,7 @@
using Content.Shared.Administration.Components;
using Content.Shared.Body.Components;
using Content.Shared.Body.Part;
+using Content.Shared.Clumsy;
using Content.Shared.Clothing.Components;
using Content.Shared.Cluwne;
using Content.Shared.Damage;
diff --git a/Content.Server/Administration/Systems/SuperBonkSystem.cs b/Content.Server/Administration/Systems/SuperBonkSystem.cs
index 5488a8d6f46..5cd62d83572 100644
--- a/Content.Server/Administration/Systems/SuperBonkSystem.cs
+++ b/Content.Server/Administration/Systems/SuperBonkSystem.cs
@@ -1,27 +1,27 @@
using Content.Server.Administration.Components;
using Content.Shared.Climbing.Components;
-using Content.Shared.Climbing.Events;
-using Content.Shared.Climbing.Systems;
-using Content.Shared.Interaction.Components;
+using Content.Shared.Clumsy;
using Content.Shared.Mobs;
using Content.Shared.Mobs.Components;
+using Robust.Shared.Audio.Systems;
namespace Content.Server.Administration.Systems;
-public sealed class SuperBonkSystem: EntitySystem
+public sealed class SuperBonkSystem : EntitySystem
{
[Dependency] private readonly SharedTransformSystem _transformSystem = default!;
- [Dependency] private readonly BonkSystem _bonkSystem = default!;
+ [Dependency] private readonly ClumsySystem _clumsySystem = default!;
+ [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
public override void Initialize()
{
base.Initialize();
- SubscribeLocalEvent(OnBonkShutdown);
SubscribeLocalEvent(OnMobStateChanged);
+ SubscribeLocalEvent(OnBonkShutdown);
}
- public void StartSuperBonk(EntityUid target, float delay = 0.1f, bool stopWhenDead = false )
+ public void StartSuperBonk(EntityUid target, float delay = 0.1f, bool stopWhenDead = false)
{
//The other check in the code to stop when the target dies does not work if the target is already dead.
@@ -31,7 +31,6 @@ public void StartSuperBonk(EntityUid target, float delay = 0.1f, bool stopWhenDe
return;
}
-
var hadClumsy = EnsureComp(target, out _);
var tables = EntityQueryEnumerator();
@@ -79,16 +78,17 @@ public override void Update(float frameTime)
private void Bonk(SuperBonkComponent comp)
{
var uid = comp.Tables.Current.Key;
- var bonkComp = comp.Tables.Current.Value;
// It would be very weird for something without a transform component to have a bonk component
// but just in case because I don't want to crash the server.
- if (!HasComp(uid))
+ if (!HasComp(uid) || !TryComp(comp.Target, out var clumsyComp))
return;
_transformSystem.SetCoordinates(comp.Target, Transform(uid).Coordinates);
- _bonkSystem.TryBonk(comp.Target, uid, bonkComp);
+ _clumsySystem.HitHeadClumsy((comp.Target, clumsyComp), uid);
+
+ _audioSystem.PlayPvs(clumsyComp.TableBonkSound, comp.Target);
}
private void OnMobStateChanged(EntityUid uid, SuperBonkComponent comp, MobStateChangedEvent args)
diff --git a/Content.Server/Announcements/AnnounceCommand.cs b/Content.Server/Announcements/AnnounceCommand.cs
index 2307f36a5d0..3249fcc95d2 100644
--- a/Content.Server/Announcements/AnnounceCommand.cs
+++ b/Content.Server/Announcements/AnnounceCommand.cs
@@ -28,7 +28,8 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
}
else
{
- var message = string.Join(' ', new ArraySegment(args, 1, args.Length-1));
+ // Explicit IEnumerable due to overload ambiguity on .NET 9
+ var message = string.Join(' ', (IEnumerable)new ArraySegment(args, 1, args.Length-1));
chat.DispatchGlobalAnnouncement(message, args[0], colorOverride: Color.Gold);
}
shell.WriteLine("Sent!");
diff --git a/Content.Server/Anomaly/Effects/GasProducerAnomalySystem.cs b/Content.Server/Anomaly/Effects/GasProducerAnomalySystem.cs
index 7fee8fdb985..b6bc012d83e 100644
--- a/Content.Server/Anomaly/Effects/GasProducerAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/GasProducerAnomalySystem.cs
@@ -16,6 +16,7 @@ public sealed class GasProducerAnomalySystem : EntitySystem
{
[Dependency] private readonly AtmosphereSystem _atmosphere = default!;
[Dependency] private readonly IRobustRandom _random = default!;
+ [Dependency] private readonly SharedMapSystem _map = default!;
public override void Initialize()
{
@@ -56,8 +57,11 @@ private void ReleaseGas(EntityUid uid, Gas gas, float mols, float radius, int co
return;
var localpos = xform.Coordinates.Position;
- var tilerefs = grid.GetLocalTilesIntersecting(
- new Box2(localpos + new Vector2(-radius, -radius), localpos + new Vector2(radius, radius))).ToArray();
+ var tilerefs = _map.GetLocalTilesIntersecting(
+ xform.GridUid.Value,
+ grid,
+ new Box2(localpos + new Vector2(-radius, -radius), localpos + new Vector2(radius, radius)))
+ .ToArray();
if (tilerefs.Length == 0)
return;
diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index 610c0ad182a..45daa7a312f 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -184,7 +184,7 @@ protected override void Started(EntityUid uid, AntagSelectionComponent component
return;
var players = _playerManager.Sessions
- .Where(x => GameTicker.PlayerGameStatuses[x.UserId] == PlayerGameStatus.JoinedGame)
+ .Where(x => GameTicker.PlayerGameStatuses.TryGetValue(x.UserId, out var status) && status == PlayerGameStatus.JoinedGame)
.ToList();
ChooseAntags((uid, component), players, midround: true);
diff --git a/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs b/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs
index cb6d4d16301..830479561de 100644
--- a/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs
+++ b/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs
@@ -48,7 +48,9 @@ public sealed partial class AtmosMonitorComponent : Component
[DataField("gasThresholds")]
public Dictionary? GasThresholds;
- // Stores a reference to the gas on the tile this is on.
+ ///
+ /// Stores a reference to the gas on the tile this entity is on (or the pipe network it monitors; see ).
+ ///
[ViewVariables]
public GasMixture? TileGas;
@@ -65,4 +67,19 @@ public sealed partial class AtmosMonitorComponent : Component
///
[DataField("registeredDevices")]
public HashSet RegisteredDevices = new();
+
+ ///
+ /// Specifies whether this device monitors its own internal pipe network rather than the surrounding atmosphere.
+ ///
+ ///
+ /// If 'true', the entity will require a NodeContainerComponent with one or more PipeNodes to function.
+ ///
+ [DataField]
+ public bool MonitorsPipeNet = false;
+
+ ///
+ /// Specifies the name of the pipe node that this device is monitoring.
+ ///
+ [DataField]
+ public string NodeNameMonitoredPipe = "monitored";
}
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
index fbe74cbab7f..875d8ad1cda 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
@@ -4,10 +4,14 @@
using Content.Server.Atmos.Piping.EntitySystems;
using Content.Server.DeviceNetwork;
using Content.Server.DeviceNetwork.Systems;
+using Content.Server.NodeContainer;
+using Content.Server.NodeContainer.EntitySystems;
+using Content.Server.NodeContainer.Nodes;
using Content.Server.Power.Components;
using Content.Server.Power.EntitySystems;
using Content.Shared.Atmos;
using Content.Shared.Atmos.Monitor;
+using Content.Shared.Atmos.Piping.Components;
using Content.Shared.DeviceNetwork;
using Content.Shared.Power;
using Content.Shared.Tag;
@@ -25,6 +29,7 @@ public sealed class AtmosMonitorSystem : EntitySystem
[Dependency] private readonly AtmosDeviceSystem _atmosDeviceSystem = default!;
[Dependency] private readonly DeviceNetworkSystem _deviceNetSystem = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+ [Dependency] private readonly NodeContainerSystem _nodeContainerSystem = default!;
// Commands
public const string AtmosMonitorSetThresholdCmd = "atmos_monitor_set_threshold";
@@ -56,8 +61,15 @@ private void OnAtmosDeviceLeaveAtmosphere(EntityUid uid, AtmosMonitorComponent a
private void OnAtmosDeviceEnterAtmosphere(EntityUid uid, AtmosMonitorComponent atmosMonitor, ref AtmosDeviceEnabledEvent args)
{
+ if (atmosMonitor.MonitorsPipeNet && _nodeContainerSystem.TryGetNode(uid, atmosMonitor.NodeNameMonitoredPipe, out var pipeNode))
+ {
+ atmosMonitor.TileGas = pipeNode.Air;
+ return;
+ }
+
atmosMonitor.TileGas = _atmosphereSystem.GetContainingMixture(uid, true);
}
+
private void OnMapInit(EntityUid uid, AtmosMonitorComponent component, MapInitEvent args)
{
if (component.TemperatureThresholdId != null)
@@ -206,7 +218,7 @@ private void OnAtmosUpdate(EntityUid uid, AtmosMonitorComponent component, ref A
if (!this.IsPowered(uid, EntityManager))
return;
- if (args.Grid == null)
+ if (args.Grid == null)
return;
// if we're not monitoring atmos, don't bother
@@ -215,6 +227,10 @@ private void OnAtmosUpdate(EntityUid uid, AtmosMonitorComponent component, ref A
&& component.GasThresholds == null)
return;
+ // If monitoring a pipe network, get its most recent gas mixture
+ if (component.MonitorsPipeNet && _nodeContainerSystem.TryGetNode(uid, component.NodeNameMonitoredPipe, out var pipeNode))
+ component.TileGas = pipeNode.Air;
+
UpdateState(uid, component.TileGas, component);
}
diff --git a/Content.Server/Atmos/Piping/Binary/Components/GasPressurePumpComponent.cs b/Content.Server/Atmos/Piping/Binary/Components/GasPressurePumpComponent.cs
deleted file mode 100644
index 8816e1af220..00000000000
--- a/Content.Server/Atmos/Piping/Binary/Components/GasPressurePumpComponent.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Content.Shared.Atmos;
-
-namespace Content.Server.Atmos.Piping.Binary.Components
-{
- [RegisterComponent]
- public sealed partial class GasPressurePumpComponent : Component
- {
- [ViewVariables(VVAccess.ReadWrite)]
- [DataField("enabled")]
- public bool Enabled { get; set; } = true;
-
- [ViewVariables(VVAccess.ReadWrite)]
- [DataField("inlet")]
- public string InletName { get; set; } = "inlet";
-
- [ViewVariables(VVAccess.ReadWrite)]
- [DataField("outlet")]
- public string OutletName { get; set; } = "outlet";
-
- [ViewVariables(VVAccess.ReadWrite)]
- [DataField("targetPressure")]
- public float TargetPressure { get; set; } = Atmospherics.OneAtmosphere;
-
- ///
- /// Max pressure of the target gas (NOT relative to source).
- ///
- [ViewVariables(VVAccess.ReadWrite)]
- [DataField("maxTargetPressure")]
- public float MaxTargetPressure = Atmospherics.MaxOutputPressure;
- }
-}
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
index abd34396a0c..5f0092f3778 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
@@ -1,169 +1,57 @@
-using Content.Server.Administration.Logs;
using Content.Server.Atmos.EntitySystems;
-using Content.Server.Atmos.Piping.Binary.Components;
using Content.Server.Atmos.Piping.Components;
using Content.Server.NodeContainer.EntitySystems;
using Content.Server.NodeContainer.Nodes;
using Content.Server.Power.Components;
using Content.Shared.Atmos;
-using Content.Shared.Atmos.Piping;
-using Content.Shared.Atmos.Piping.Binary.Components;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.EntitySystems;
using Content.Shared.Audio;
-using Content.Shared.Database;
-using Content.Shared.Examine;
-using Content.Shared.Interaction;
-using Content.Shared.Popups;
-using Content.Shared.Power;
using JetBrains.Annotations;
-using Robust.Server.GameObjects;
-using Robust.Shared.Player;
-namespace Content.Server.Atmos.Piping.Binary.EntitySystems
-{
- [UsedImplicitly]
- public sealed class GasPressurePumpSystem : EntitySystem
- {
- [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
- [Dependency] private readonly IAdminLogManager _adminLogger = default!;
- [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
- [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!;
- [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
- [Dependency] private readonly NodeContainerSystem _nodeContainer = default!;
- [Dependency] private readonly SharedPopupSystem _popup = default!;
-
- public override void Initialize()
- {
- base.Initialize();
-
- SubscribeLocalEvent(OnInit);
- SubscribeLocalEvent(OnPumpUpdated);
- SubscribeLocalEvent(OnPumpLeaveAtmosphere);
- SubscribeLocalEvent(OnExamined);
- SubscribeLocalEvent(OnPumpActivate);
- SubscribeLocalEvent(OnPowerChanged);
- // Bound UI subscriptions
- SubscribeLocalEvent(OnOutputPressureChangeMessage);
- SubscribeLocalEvent(OnToggleStatusMessage);
- }
-
- private void OnInit(EntityUid uid, GasPressurePumpComponent pump, ComponentInit args)
- {
- UpdateAppearance(uid, pump);
- }
-
- private void OnExamined(EntityUid uid, GasPressurePumpComponent pump, ExaminedEvent args)
- {
- if (!EntityManager.GetComponent(uid).Anchored || !args.IsInDetailsRange) // Not anchored? Out of range? No status.
- return;
-
- if (Loc.TryGetString("gas-pressure-pump-system-examined", out var str,
- ("statusColor", "lightblue"), // TODO: change with pressure?
- ("pressure", pump.TargetPressure)
- ))
- {
- args.PushMarkup(str);
- }
- }
-
- private void OnPowerChanged(EntityUid uid, GasPressurePumpComponent component, ref PowerChangedEvent args)
- {
- UpdateAppearance(uid, component);
- }
-
- private void OnPumpUpdated(EntityUid uid, GasPressurePumpComponent pump, ref AtmosDeviceUpdateEvent args)
- {
- if (!pump.Enabled
- || (TryComp(uid, out var power) && !power.Powered)
- || !_nodeContainer.TryGetNodes(uid, pump.InletName, pump.OutletName, out PipeNode? inlet, out PipeNode? outlet))
- {
- _ambientSoundSystem.SetAmbience(uid, false);
- return;
- }
-
- var outputStartingPressure = outlet.Air.Pressure;
+namespace Content.Server.Atmos.Piping.Binary.EntitySystems;
- if (outputStartingPressure >= pump.TargetPressure)
- {
- _ambientSoundSystem.SetAmbience(uid, false);
- return; // No need to pump gas if target has been reached.
- }
-
- if (inlet.Air.TotalMoles > 0 && inlet.Air.Temperature > 0)
- {
- // We calculate the necessary moles to transfer using our good ol' friend PV=nRT.
- var pressureDelta = pump.TargetPressure - outputStartingPressure;
- var transferMoles = (pressureDelta * outlet.Air.Volume) / (inlet.Air.Temperature * Atmospherics.R);
-
- var removed = inlet.Air.Remove(transferMoles);
- _atmosphereSystem.Merge(outlet.Air, removed);
- _ambientSoundSystem.SetAmbience(uid, removed.TotalMoles > 0f);
- }
- }
-
- private void OnPumpLeaveAtmosphere(EntityUid uid, GasPressurePumpComponent pump, ref AtmosDeviceDisabledEvent args)
- {
- pump.Enabled = false;
- UpdateAppearance(uid, pump);
-
- DirtyUI(uid, pump);
- _userInterfaceSystem.CloseUi(uid, GasPressurePumpUiKey.Key);
- }
-
- private void OnPumpActivate(EntityUid uid, GasPressurePumpComponent pump, ActivateInWorldEvent args)
- {
- if (args.Handled || !args.Complex)
- return;
-
- if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
- return;
+[UsedImplicitly]
+public sealed class GasPressurePumpSystem : SharedGasPressurePumpSystem
+{
+ [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
+ [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!;
+ [Dependency] private readonly NodeContainerSystem _nodeContainer = default!;
- if (Transform(uid).Anchored)
- {
- _userInterfaceSystem.OpenUi(uid, GasPressurePumpUiKey.Key, actor.PlayerSession);
- DirtyUI(uid, pump);
- }
- else
- {
- _popup.PopupCursor(Loc.GetString("comp-gas-pump-ui-needs-anchor"), args.User);
- }
+ public override void Initialize()
+ {
+ base.Initialize();
- args.Handled = true;
- }
+ SubscribeLocalEvent(OnPumpUpdated);
+ }
- private void OnToggleStatusMessage(EntityUid uid, GasPressurePumpComponent pump, GasPressurePumpToggleStatusMessage args)
+ private void OnPumpUpdated(EntityUid uid, GasPressurePumpComponent pump, ref AtmosDeviceUpdateEvent args)
+ {
+ if (!pump.Enabled
+ || (TryComp(uid, out var power) && !power.Powered)
+ || !_nodeContainer.TryGetNodes(uid, pump.InletName, pump.OutletName, out PipeNode? inlet, out PipeNode? outlet))
{
- pump.Enabled = args.Enabled;
- _adminLogger.Add(LogType.AtmosPowerChanged, LogImpact.Medium,
- $"{ToPrettyString(args.Actor):player} set the power on {ToPrettyString(uid):device} to {args.Enabled}");
- DirtyUI(uid, pump);
- UpdateAppearance(uid, pump);
+ _ambientSoundSystem.SetAmbience(uid, false);
+ return;
}
- private void OnOutputPressureChangeMessage(EntityUid uid, GasPressurePumpComponent pump, GasPressurePumpChangeOutputPressureMessage args)
- {
- pump.TargetPressure = Math.Clamp(args.Pressure, 0f, Atmospherics.MaxOutputPressure);
- _adminLogger.Add(LogType.AtmosPressureChanged, LogImpact.Medium,
- $"{ToPrettyString(args.Actor):player} set the pressure on {ToPrettyString(uid):device} to {args.Pressure}kPa");
- DirtyUI(uid, pump);
-
- }
+ var outputStartingPressure = outlet.Air.Pressure;
- private void DirtyUI(EntityUid uid, GasPressurePumpComponent? pump)
+ if (outputStartingPressure >= pump.TargetPressure)
{
- if (!Resolve(uid, ref pump))
- return;
-
- _userInterfaceSystem.SetUiState(uid, GasPressurePumpUiKey.Key,
- new GasPressurePumpBoundUserInterfaceState(EntityManager.GetComponent(uid).EntityName, pump.TargetPressure, pump.Enabled));
+ _ambientSoundSystem.SetAmbience(uid, false);
+ return; // No need to pump gas if target has been reached.
}
- private void UpdateAppearance(EntityUid uid, GasPressurePumpComponent? pump = null, AppearanceComponent? appearance = null)
+ if (inlet.Air.TotalMoles > 0 && inlet.Air.Temperature > 0)
{
- if (!Resolve(uid, ref pump, ref appearance, false))
- return;
+ // We calculate the necessary moles to transfer using our good ol' friend PV=nRT.
+ var pressureDelta = pump.TargetPressure - outputStartingPressure;
+ var transferMoles = (pressureDelta * outlet.Air.Volume) / (inlet.Air.Temperature * Atmospherics.R);
- bool pumpOn = pump.Enabled && (TryComp(uid, out var power) && power.Powered);
- _appearance.SetData(uid, PumpVisuals.Enabled, pumpOn, appearance);
+ var removed = inlet.Air.Remove(transferMoles);
+ _atmosphereSystem.Merge(outlet.Air, removed);
+ _ambientSoundSystem.SetAmbience(uid, removed.TotalMoles > 0f);
}
}
}
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs
index 3ebc5094926..f7789794096 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs
@@ -6,6 +6,7 @@
using Content.Server.NodeContainer.Nodes;
using Content.Shared.Atmos;
using Content.Shared.Atmos.Piping;
+using Content.Shared.Atmos.Piping.Components;
using Content.Shared.Audio;
using Content.Shared.Examine;
using JetBrains.Annotations;
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
index 9ddd7dce67d..d593324b190 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
@@ -10,6 +10,7 @@
using Content.Server.NodeContainer.Nodes;
using Content.Server.Power.Components;
using Content.Shared.Atmos.Piping.Binary.Components;
+using Content.Shared.Atmos.Piping.Components;
using Content.Shared.Atmos.Visuals;
using Content.Shared.Audio;
using Content.Shared.Database;
diff --git a/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs b/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs
index b70262e857b..5b55d9d3b67 100644
--- a/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs
+++ b/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs
@@ -67,15 +67,3 @@ public readonly struct AtmosDeviceUpdateEvent(float dt, Entity
public readonly Entity? Map = map;
}
-
-///
-/// Raised directed on an atmos device when it is enabled.
-///
-[ByRefEvent]
-public record struct AtmosDeviceEnabledEvent;
-
-///
-/// Raised directed on an atmos device when it is enabled.
-///
-[ByRefEvent]
-public record struct AtmosDeviceDisabledEvent;
diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
index f932ef36208..3feaf79eb73 100644
--- a/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
+++ b/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
@@ -1,6 +1,7 @@
using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Atmos.Piping.Components;
+using Content.Shared.Atmos.Piping.Components;
using JetBrains.Annotations;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
index 752d1e9eb83..c5a91895b2e 100644
--- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
+++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
@@ -7,6 +7,7 @@
using Content.Server.NodeContainer.Nodes;
using Content.Shared.Atmos;
using Content.Shared.Atmos.Piping;
+using Content.Shared.Atmos.Piping.Components;
using Content.Shared.Atmos.Piping.Trinary.Components;
using Content.Shared.Audio;
using Content.Shared.Database;
diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
index 178caeaa4a9..0852051487b 100644
--- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
+++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
@@ -7,6 +7,7 @@
using Content.Server.NodeContainer.Nodes;
using Content.Shared.Atmos;
using Content.Shared.Atmos.Piping;
+using Content.Shared.Atmos.Piping.Components;
using Content.Shared.Atmos.Piping.Trinary.Components;
using Content.Shared.Audio;
using Content.Shared.Database;
diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/PressureControlledValveSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/PressureControlledValveSystem.cs
index 1bab2abd8e9..d1570b11292 100644
--- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/PressureControlledValveSystem.cs
+++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/PressureControlledValveSystem.cs
@@ -5,6 +5,7 @@
using Content.Server.NodeContainer.EntitySystems;
using Content.Server.NodeContainer.Nodes;
using Content.Shared.Atmos.Piping;
+using Content.Shared.Atmos.Piping.Components;
using Content.Shared.Audio;
using JetBrains.Annotations;
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
index 9d9862ff1dd..23016debeb6 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
@@ -11,6 +11,7 @@
using Content.Server.NodeContainer.Nodes;
using Content.Shared.Atmos;
using Content.Shared.Atmos.Monitor;
+using Content.Shared.Atmos.Piping.Components;
using Content.Shared.Atmos.Piping.Unary;
using Content.Shared.Atmos.Piping.Unary.Components;
using Content.Shared.Atmos.Visuals;
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
index a35cf6c2e30..a633d29e41d 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
@@ -13,6 +13,7 @@
using Content.Shared.Atmos;
using Content.Shared.Atmos.Piping.Unary.Visuals;
using Content.Shared.Atmos.Monitor;
+using Content.Shared.Atmos.Piping.Components;
using Content.Shared.Atmos.Piping.Unary.Components;
using Content.Shared.Audio;
using Content.Shared.DeviceNetwork;
diff --git a/Content.Server/Bed/Cryostorage/CryostorageSystem.cs b/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
index 345f51783ca..21f43c31956 100644
--- a/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
+++ b/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
@@ -1,6 +1,6 @@
+using System.Globalization;
using Content.Server.Chat.Managers;
using Content.Server.Chat.Systems;
-using Content.Server.GameTicking;
using Content.Server.Ghost;
using Content.Server.Hands.Systems;
using Content.Server.Inventory;
@@ -14,6 +14,7 @@
using Content.Shared.Chat;
using Content.Shared.Climbing.Systems;
using Content.Shared.Database;
+using Content.Shared.GameTicking;
using Content.Shared.Hands.Components;
using Content.Shared.Mind.Components;
using Content.Shared.StationRecords;
@@ -26,7 +27,6 @@
using Robust.Shared.Enums;
using Robust.Shared.Network;
using Robust.Shared.Player;
-using System.Globalization;
namespace Content.Server.Bed.Cryostorage;
diff --git a/Content.Server/Body/Components/LungComponent.cs b/Content.Server/Body/Components/LungComponent.cs
index 72af4d9e63a..256c6d67298 100644
--- a/Content.Server/Body/Components/LungComponent.cs
+++ b/Content.Server/Body/Components/LungComponent.cs
@@ -34,4 +34,11 @@ public sealed partial class LungComponent : Component
///
[DataField]
public ProtoId Alert = "LowOxygen";
+
+ ///
+ /// DeltaV: Multiplier on saturation passively lost.
+ /// Higher values require more air, lower require less.
+ ///
+ [DataField]
+ public float SaturationLoss = 1f;
}
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index 6209f00419d..b5975326b3e 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -74,7 +74,15 @@ public override void Update(float frameTime)
if (_mobState.IsDead(uid))
continue;
- UpdateSaturation(uid, -(float) respirator.UpdateInterval.TotalSeconds, respirator);
+ // Begin DeltaV Code: Addition:
+ var organs = _bodySystem.GetBodyOrganEntityComps((uid, body));
+ var multiplier = -1f;
+ foreach (var (_, lung, _) in organs)
+ {
+ multiplier *= lung.SaturationLoss;
+ }
+ // End DeltaV Code
+ UpdateSaturation(uid, multiplier * (float) respirator.UpdateInterval.TotalSeconds, respirator); // DeltaV: use multiplier instead of negating
if (!_mobState.IsIncapacitated(uid)) // cannot breathe in crit.
{
diff --git a/Content.Server/Botany/Systems/SeedExtractorSystem.cs b/Content.Server/Botany/Systems/SeedExtractorSystem.cs
index 93f76473ff8..c7e20983a7a 100644
--- a/Content.Server/Botany/Systems/SeedExtractorSystem.cs
+++ b/Content.Server/Botany/Systems/SeedExtractorSystem.cs
@@ -38,6 +38,7 @@ private void OnInteractUsing(EntityUid uid, SeedExtractorComponent seedExtractor
args.User, PopupType.Medium);
QueueDel(args.Used);
+ args.Handled = true;
var amount = _random.Next(seedExtractor.BaseMinSeeds, seedExtractor.BaseMaxSeeds + 1);
var coords = Transform(uid).Coordinates;
diff --git a/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs b/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs
index a7735787cbb..f58b5450ba4 100644
--- a/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs
+++ b/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs
@@ -21,6 +21,13 @@ public sealed partial class StationCargoBountyDatabaseComponent : Component
[DataField, ViewVariables(VVAccess.ReadWrite)]
public List Bounties = new();
+ ///
+ /// A list of all the bounties that have been completed or
+ /// skipped for a station.
+ ///
+ [DataField, ViewVariables(VVAccess.ReadWrite)]
+ public List History = new();
+
///
/// Used to determine unique order IDs
///
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
index 373e8e243ba..236b018a9da 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
@@ -8,6 +8,7 @@
using Content.Shared.Cargo.Components;
using Content.Shared.Cargo.Prototypes;
using Content.Shared.Database;
+using Content.Shared.IdentityManagement;
using Content.Shared.NameIdentifier;
using Content.Shared.Paper;
using Content.Shared.Stacks;
@@ -16,6 +17,7 @@
using Robust.Server.Containers;
using Robust.Shared.Containers;
using Robust.Shared.Random;
+using Robust.Shared.Timing;
using Robust.Shared.Utility;
namespace Content.Server.Cargo.Systems;
@@ -25,6 +27,7 @@ public sealed partial class CargoSystem
[Dependency] private readonly ContainerSystem _container = default!;
[Dependency] private readonly NameIdentifierSystem _nameIdentifier = default!;
[Dependency] private readonly EntityWhitelistSystem _whitelistSys = default!;
+ [Dependency] private readonly IGameTiming _gameTiming = default!;
[ValidatePrototypeId]
private const string BountyNameIdentifierGroup = "Bounty";
@@ -54,7 +57,7 @@ private void OnBountyConsoleOpened(EntityUid uid, CargoBountyConsoleComponent co
return;
var untilNextSkip = bountyDb.NextSkipTime - _timing.CurTime;
- _uiSystem.SetUiState(uid, CargoConsoleUiKey.Bounty, new CargoBountyConsoleState(bountyDb.Bounties, untilNextSkip));
+ _uiSystem.SetUiState(uid, CargoConsoleUiKey.Bounty, new CargoBountyConsoleState(bountyDb.Bounties, bountyDb.History, untilNextSkip));
}
private void OnPrintLabelMessage(EntityUid uid, CargoBountyConsoleComponent component, BountyPrintLabelMessage args)
@@ -95,13 +98,13 @@ private void OnSkipBountyMessage(EntityUid uid, CargoBountyConsoleComponent comp
return;
}
- if (!TryRemoveBounty(station, bounty.Value))
+ if (!TryRemoveBounty(station, bounty.Value, null, args.Actor))
return;
FillBountyDatabase(station);
db.NextSkipTime = _timing.CurTime + db.SkipDelay;
var untilNextSkip = db.NextSkipTime - _timing.CurTime;
- _uiSystem.SetUiState(uid, CargoConsoleUiKey.Bounty, new CargoBountyConsoleState(db.Bounties, untilNextSkip));
+ _uiSystem.SetUiState(uid, CargoConsoleUiKey.Bounty, new CargoBountyConsoleState(db.Bounties, db.History, untilNextSkip));
_audio.PlayPvs(component.SkipSound, uid);
}
@@ -434,15 +437,15 @@ public bool TryAddBounty(EntityUid uid, CargoBountyPrototype bounty, StationCarg
}
[PublicAPI]
- public bool TryRemoveBounty(EntityUid uid, string dataId, StationCargoBountyDatabaseComponent? component = null)
+ public bool TryRemoveBounty(EntityUid uid, string dataId, StationCargoBountyDatabaseComponent? component = null, EntityUid? actor = null)
{
if (!TryGetBountyFromId(uid, dataId, out var data, component))
return false;
- return TryRemoveBounty(uid, data.Value, component);
+ return TryRemoveBounty(uid, data.Value, component, actor);
}
- public bool TryRemoveBounty(EntityUid uid, CargoBountyData data, StationCargoBountyDatabaseComponent? component = null)
+ public bool TryRemoveBounty(EntityUid uid, CargoBountyData data, StationCargoBountyDatabaseComponent? component = null, EntityUid? actor = null)
{
if (!Resolve(uid, ref component))
return false;
@@ -451,6 +454,15 @@ public bool TryRemoveBounty(EntityUid uid, CargoBountyData data, StationCargoBou
{
if (component.Bounties[i].Id == data.Id)
{
+ string? actorName = default;
+ if (actor != null)
+ {
+ var getIdentityEvent = new TryGetIdentityShortInfoEvent(uid, actor.Value);
+ RaiseLocalEvent(getIdentityEvent);
+ actorName = getIdentityEvent.Title;
+ }
+
+ component.History.Add(new CargoBountyHistoryData(data, _gameTiming.CurTime, actorName));
component.Bounties.RemoveAt(i);
return true;
}
@@ -492,7 +504,7 @@ public void UpdateBountyConsoles()
}
var untilNextSkip = db.NextSkipTime - _timing.CurTime;
- _uiSystem.SetUiState((uid, ui), CargoConsoleUiKey.Bounty, new CargoBountyConsoleState(db.Bounties, untilNextSkip));
+ _uiSystem.SetUiState((uid, ui), CargoConsoleUiKey.Bounty, new CargoBountyConsoleState(db.Bounties, db.History, untilNextSkip));
}
}
diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs
index 830368baa3c..5362dae964d 100644
--- a/Content.Server/Cargo/Systems/PricingSystem.cs
+++ b/Content.Server/Cargo/Systems/PricingSystem.cs
@@ -23,7 +23,7 @@ namespace Content.Server.Cargo.Systems;
///
/// This handles calculating the price of items, and implements two basic methods of pricing materials.
///
-public sealed class PricingSystem : EntitySystem
+public sealed partial class PricingSystem : EntitySystem // DeltaV - Made partial
{
[Dependency] private readonly IComponentFactory _factory = default!;
[Dependency] private readonly IConsoleHost _consoleHost = default!;
@@ -208,7 +208,7 @@ public double GetEstimatedPrice(EntityPrototype prototype)
// TODO: Proper container support.
- return price;
+ return ApplyPrototypePriceModifier(prototype, price); // DeltaV
}
///
@@ -254,7 +254,7 @@ public double GetPrice(EntityUid uid, bool includeContents = true)
}
}
- return price;
+ return ApplyPriceModifier(uid, price); // DeltaV
}
private double GetMaterialsPrice(EntityUid uid)
@@ -424,7 +424,7 @@ public record struct PriceCalculationEvent()
[ByRefEvent]
public record struct EstimatedPriceCalculationEvent()
{
- public EntityPrototype Prototype;
+ public required EntityPrototype Prototype;
///
/// The total price of the entity.
diff --git a/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeComponent.cs b/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeComponent.cs
index cfa92dd67f7..048fa777fc9 100644
--- a/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeComponent.cs
+++ b/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeComponent.cs
@@ -1,4 +1,5 @@
using Content.Shared.CartridgeLoader.Cartridges;
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges; // DeltaV
using Robust.Shared.Audio;
namespace Content.Server.CartridgeLoader.Cartridges;
@@ -18,4 +19,10 @@ public sealed partial class LogProbeCartridgeComponent : Component
///
[DataField, ViewVariables(VVAccess.ReadWrite)]
public SoundSpecifier SoundScan = new SoundPathSpecifier("/Audio/Machines/scan_finish.ogg");
+
+ ///
+ /// DeltaV: The last scanned NanoChat data, if any
+ ///
+ [DataField]
+ public NanoChatData? ScannedNanoChatData;
}
diff --git a/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs
index f5ccea95900..725901620d0 100644
--- a/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs
+++ b/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs
@@ -2,13 +2,14 @@
using Content.Shared.Audio;
using Content.Shared.CartridgeLoader;
using Content.Shared.CartridgeLoader.Cartridges;
+using Content.Shared.DeltaV.NanoChat; // DeltaV
using Content.Shared.Popups;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Random;
namespace Content.Server.CartridgeLoader.Cartridges;
-public sealed class LogProbeCartridgeSystem : EntitySystem
+public sealed partial class LogProbeCartridgeSystem : EntitySystem // DeltaV - Made partial
{
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly CartridgeLoaderSystem? _cartridgeLoaderSystem = default!;
@@ -18,6 +19,7 @@ public sealed class LogProbeCartridgeSystem : EntitySystem
public override void Initialize()
{
base.Initialize();
+ InitializeNanoChat(); // DeltaV
SubscribeLocalEvent(OnUiReady);
SubscribeLocalEvent(AfterInteract);
}
@@ -33,6 +35,15 @@ private void AfterInteract(Entity ent, ref Cartridge
if (args.InteractEvent.Handled || !args.InteractEvent.CanReach || args.InteractEvent.Target is not { } target)
return;
+ // DeltaV begin - Add NanoChat card scanning
+ if (TryComp(target, out var nanoChatCard))
+ {
+ ScanNanoChatCard(ent, args, target, nanoChatCard);
+ args.InteractEvent.Handled = true;
+ return;
+ }
+ // DeltaV end
+
if (!TryComp(target, out AccessReaderComponent? accessReaderComponent))
return;
@@ -41,6 +52,7 @@ private void AfterInteract(Entity ent, ref Cartridge
_popupSystem.PopupCursor(Loc.GetString("log-probe-scan", ("device", target)), args.InteractEvent.User);
ent.Comp.PulledAccessLogs.Clear();
+ ent.Comp.ScannedNanoChatData = null; // DeltaV - Clear any previous NanoChat data
foreach (var accessRecord in accessReaderComponent.AccessLog)
{
@@ -65,7 +77,7 @@ private void OnUiReady(Entity ent, ref CartridgeUiRe
private void UpdateUiState(Entity ent, EntityUid loaderUid)
{
- var state = new LogProbeUiState(ent.Comp.PulledAccessLogs);
+ var state = new LogProbeUiState(ent.Comp.PulledAccessLogs, ent.Comp.ScannedNanoChatData); // DeltaV - NanoChat support
_cartridgeLoaderSystem?.UpdateCartridgeUiState(loaderUid, state);
}
}
diff --git a/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs b/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
index 9b78e81aa00..8345aa3c3dd 100644
--- a/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
@@ -1,6 +1,7 @@
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.Hypospray.Events;
using Content.Shared.Chemistry;
using Content.Shared.Database;
using Content.Shared.FixedPoint;
@@ -85,14 +86,44 @@ public bool TryDoInject(Entity entity, EntityUid target, Ent
string? msgFormat = null;
- if (target == user)
- msgFormat = "hypospray-component-inject-self-message";
- else if (EligibleEntity(user, EntityManager, component) && _interaction.TryRollClumsy(user, component.ClumsyFailChance))
+ // Self event
+ var selfEvent = new SelfBeforeHyposprayInjectsEvent(user, entity.Owner, target);
+ RaiseLocalEvent(user, selfEvent);
+
+ if (selfEvent.Cancelled)
+ {
+ _popup.PopupEntity(Loc.GetString(selfEvent.InjectMessageOverride ?? "hypospray-cant-inject", ("owner", Identity.Entity(target, EntityManager))), target, user);
+ return false;
+ }
+
+ target = selfEvent.TargetGettingInjected;
+
+ if (!EligibleEntity(target, EntityManager, component))
+ return false;
+
+ // Target event
+ var targetEvent = new TargetBeforeHyposprayInjectsEvent(user, entity.Owner, target);
+ RaiseLocalEvent(target, targetEvent);
+
+ if (targetEvent.Cancelled)
{
- msgFormat = "hypospray-component-inject-self-clumsy-message";
- target = user;
+ _popup.PopupEntity(Loc.GetString(targetEvent.InjectMessageOverride ?? "hypospray-cant-inject", ("owner", Identity.Entity(target, EntityManager))), target, user);
+ return false;
}
+ target = targetEvent.TargetGettingInjected;
+
+ if (!EligibleEntity(target, EntityManager, component))
+ return false;
+
+ // The target event gets priority for the overriden message.
+ if (targetEvent.InjectMessageOverride != null)
+ msgFormat = targetEvent.InjectMessageOverride;
+ else if (selfEvent.InjectMessageOverride != null)
+ msgFormat = selfEvent.InjectMessageOverride;
+ else if (target == user)
+ msgFormat = "hypospray-component-inject-self-message";
+
if (!_solutionContainers.TryGetSolution(uid, component.SolutionName, out var hypoSpraySoln, out var hypoSpraySolution) || hypoSpraySolution.Volume == 0)
{
_popup.PopupEntity(Loc.GetString("hypospray-component-empty-message"), target, user);
diff --git a/Content.Server/Cluwne/CluwneSystem.cs b/Content.Server/Cluwne/CluwneSystem.cs
index f24f0143f31..1fbb0c72690 100644
--- a/Content.Server/Cluwne/CluwneSystem.cs
+++ b/Content.Server/Cluwne/CluwneSystem.cs
@@ -16,6 +16,7 @@
using Content.Shared.Interaction.Components;
using Robust.Shared.Audio.Systems;
using Content.Shared.NameModifier.EntitySystems;
+using Content.Shared.Clumsy;
namespace Content.Server.Cluwne;
diff --git a/Content.Server/Crayon/CrayonSystem.cs b/Content.Server/Crayon/CrayonSystem.cs
index 07a13d8a34a..4257c436c23 100644
--- a/Content.Server/Crayon/CrayonSystem.cs
+++ b/Content.Server/Crayon/CrayonSystem.cs
@@ -82,6 +82,8 @@ private void OnCrayonAfterInteract(EntityUid uid, CrayonComponent component, Aft
if (component.DeleteEmpty && component.Charges <= 0)
UseUpCrayon(uid, args.User);
+ else
+ _uiSystem.ServerSendUiMessage(uid, SharedCrayonComponent.CrayonUiKey.Key, new CrayonUsedMessage(component.SelectedState));
}
private void OnCrayonUse(EntityUid uid, CrayonComponent component, UseInHandEvent args)
diff --git a/Content.Server/DeltaV/AACTablet/AACTabletComponent.cs b/Content.Server/DeltaV/AACTablet/AACTabletComponent.cs
index 3c1ce5c8eb3..196678190c4 100644
--- a/Content.Server/DeltaV/AACTablet/AACTabletComponent.cs
+++ b/Content.Server/DeltaV/AACTablet/AACTabletComponent.cs
@@ -1,6 +1,8 @@
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
namespace Content.Server.DeltaV.AACTablet;
-[RegisterComponent]
+[RegisterComponent, AutoGenerateComponentPause]
public sealed partial class AACTabletComponent : Component
{
// Minimum time between each phrase, to prevent spam
@@ -8,6 +10,6 @@ public sealed partial class AACTabletComponent : Component
public TimeSpan Cooldown = TimeSpan.FromSeconds(1);
// Time that the next phrase can be sent.
- [DataField]
+ [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
public TimeSpan NextPhrase;
}
diff --git a/Content.Server/DeltaV/AACTablet/AACTabletSystem.cs b/Content.Server/DeltaV/AACTablet/AACTabletSystem.cs
index daa90417a76..ecb3e1dd52d 100644
--- a/Content.Server/DeltaV/AACTablet/AACTabletSystem.cs
+++ b/Content.Server/DeltaV/AACTablet/AACTabletSystem.cs
@@ -1,7 +1,6 @@
using Content.Server.Chat.Systems;
using Content.Server.Speech.Components;
using Content.Shared.DeltaV.AACTablet;
-using Content.Shared.DeltaV.QuickPhrase;
using Content.Shared.IdentityManagement;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
@@ -11,9 +10,8 @@ namespace Content.Server.DeltaV.AACTablet;
public sealed class AACTabletSystem : EntitySystem
{
[Dependency] private readonly ChatSystem _chat = default!;
- [Dependency] private readonly ILocalizationManager _loc = default!;
- [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
- [Dependency] protected readonly IGameTiming Timing = default!;
+ [Dependency] private readonly IGameTiming _timing = default!;
+ [Dependency] private readonly IPrototypeManager _prototype = default!;
public override void Initialize()
{
@@ -21,30 +19,28 @@ public override void Initialize()
SubscribeLocalEvent(OnSendPhrase);
}
- private void OnSendPhrase(EntityUid uid, AACTabletComponent component, AACTabletSendPhraseMessage message)
+ private void OnSendPhrase(Entity ent, ref AACTabletSendPhraseMessage message)
{
- if (component.NextPhrase > Timing.CurTime)
+ if (ent.Comp.NextPhrase > _timing.CurTime)
return;
- // the AAC tablet uses the name of the person who pressed the tablet button
- // for quality of life
var senderName = Identity.Entity(message.Actor, EntityManager);
var speakerName = Loc.GetString("speech-name-relay",
- ("speaker", Name(uid)),
+ ("speaker", Name(ent)),
("originalName", senderName));
- if (!_prototypeManager.TryIndex(message.PhraseID, out var phrase))
+ if (!_prototype.TryIndex(message.PhraseId, out var phrase))
return;
- EnsureComp(uid).NameOverride = speakerName;
+ EnsureComp(ent).NameOverride = speakerName;
- _chat.TrySendInGameICMessage(uid,
- _loc.GetString(phrase.Text),
+ _chat.TrySendInGameICMessage(ent,
+ Loc.GetString(phrase.Text),
InGameICChatType.Speak,
hideChat: false,
nameOverride: speakerName);
- var curTime = Timing.CurTime;
- component.NextPhrase = curTime + component.Cooldown;
+ var curTime = _timing.CurTime;
+ ent.Comp.NextPhrase = curTime + ent.Comp.Cooldown;
}
}
diff --git a/Content.Server/DeltaV/Abilities/Psionics/PrecognitionPowerSystem.cs b/Content.Server/DeltaV/Abilities/Psionics/PrecognitionPowerSystem.cs
new file mode 100644
index 00000000000..23fe9d7e3eb
--- /dev/null
+++ b/Content.Server/DeltaV/Abilities/Psionics/PrecognitionPowerSystem.cs
@@ -0,0 +1,232 @@
+using Content.Server.Chat.Managers;
+using Content.Server.DoAfter;
+using Content.Server.DeltaV.StationEvents.NextEvent;
+using Content.Server.GameTicking;
+using Content.Server.Mind;
+using Content.Shared.Abilities.Psionics;
+using Content.Shared.Actions.Events;
+using Content.Shared.Actions;
+using Content.Shared.DoAfter;
+using Content.Shared.Eye.Blinding.Components;
+using Content.Shared.Popups;
+using Content.Shared.Psionics.Events;
+using Content.Shared.StatusEffect;
+using Content.Shared.Stunnable;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+using Robust.Shared.Player;
+
+namespace Content.Server.Abilities.Psionics;
+
+public sealed class PrecognitionPowerSystem : EntitySystem
+{
+ [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
+ [Dependency] private readonly GameTicker _gameTicker = default!;
+ [Dependency] private readonly MindSystem _mind = default!;
+ [Dependency] private readonly SharedActionsSystem _actions = default!;
+ [Dependency] private readonly SharedAudioSystem _audio = default!;
+ [Dependency] private readonly SharedPopupSystem _popups = default!;
+ [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
+ [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
+ [Dependency] private readonly IChatManager _chat = default!;
+ [Dependency] private readonly IComponentFactory _factory = default!;
+ [Dependency] private readonly IGameTiming _gameTiming = default!;
+ [Dependency] private readonly IPrototypeManager _prototype = default!;
+ [Dependency] private readonly IRobustRandom _random = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+ SubscribeLocalEvent(OnMapInit);
+ SubscribeLocalEvent(OnShutdown);
+ SubscribeLocalEvent(OnPowerUsed);
+ SubscribeLocalEvent(OnDoAfter);
+ }
+
+ private void OnMapInit(Entity ent, ref MapInitEvent args)
+ {
+ ent.Comp.AllResults = GetAllPrecognitionResults();
+ _actions.AddAction(ent, ref ent.Comp.PrecognitionActionEntity, ent.Comp.PrecognitionActionId);
+ _actions.StartUseDelay(ent.Comp.PrecognitionActionEntity);
+ if (TryComp(ent, out var psionic) && psionic.PsionicAbility == null)
+ {
+ psionic.PsionicAbility = ent.Comp.PrecognitionActionEntity;
+ psionic.ActivePowers.Add(ent.Comp);
+ }
+ }
+
+ private void OnShutdown(EntityUid uid, PrecognitionPowerComponent component, ComponentShutdown args)
+ {
+ _actions.RemoveAction(uid, component.PrecognitionActionEntity);
+ if (TryComp(uid, out var psionic))
+ psionic.ActivePowers.Remove(component);
+ }
+
+ private void OnPowerUsed(EntityUid uid, PrecognitionPowerComponent component, PrecognitionPowerActionEvent args)
+ {
+ var ev = new PrecognitionDoAfterEvent(_gameTiming.CurTime);
+ var doAfterArgs = new DoAfterArgs(EntityManager, uid, component.UseDelay, ev, uid)
+ {
+ BreakOnDamage = true
+ };
+
+ // A custom shader for seeing visions would be nice but this will do for now.
+ _statusEffects.TryAddStatusEffect(uid, "TemporaryBlindness", component.UseDelay, true);
+ _statusEffects.TryAddStatusEffect(uid, "SlowedDown", component.UseDelay, true);
+
+ _doAfterSystem.TryStartDoAfter(doAfterArgs, out var doAfterId);
+ component.DoAfter = doAfterId;
+
+ var player = _audio.PlayGlobal(component.VisionSound, Filter.Entities(uid), true);
+ if (player != null)
+ component.SoundStream = player.Value.Entity;
+ _psionics.LogPowerUsed(uid, "Precognition");
+ args.Handled = true;
+ }
+
+ ///
+ /// Upon completion will send a message to the user corrosponding to the next station event to occour.
+ ///
+ ///
+ ///
+ ///
+ private void OnDoAfter(EntityUid uid, PrecognitionPowerComponent component, PrecognitionDoAfterEvent args)
+ {
+ if (args.Handled)
+ return;
+
+ if (args.Cancelled)
+ {
+ // Need to clean up the applied effects in case of cancel and alert the player.
+ component.SoundStream = _audio.Stop(component.SoundStream);
+ _statusEffects.TryRemoveStatusEffect(uid, "TemporaryBlindness");
+ _statusEffects.TryRemoveStatusEffect(uid, "SlowedDown");
+
+ _popups.PopupEntity(
+ Loc.GetString("psionic-power-precognition-failure-by-damage"),
+ uid,
+ uid,
+ PopupType.SmallCaution);
+
+ if (_actions.TryGetActionData(component.PrecognitionActionEntity, out var actionData))
+ // If canceled give a short delay before being able to try again
+ actionData.Cooldown =
+ (_gameTicker.RoundDuration(),
+ _gameTicker.RoundDuration() + TimeSpan.FromSeconds(15));
+ return;
+ }
+
+ // Determines the window that will be looked at for events, avoiding events that are too close or too far to be useful.
+ var minDetectWindow = TimeSpan.FromSeconds(30);
+ var maxDetectWindow = TimeSpan.FromMinutes(10);
+ string? message = null;
+
+ if (!_mind.TryGetMind(uid, out _, out var mindComponent) || mindComponent.Session == null)
+ return;
+
+ var nextEvent = (FindEarliestNextEvent(minDetectWindow, maxDetectWindow));
+ if (nextEvent == null) // A special message given if there is no event within the time window.
+ message = "psionic-power-precognition-no-event-result-message";
+
+ if (nextEvent != null && nextEvent.NextEventId != null)
+ message = GetResultMessage(nextEvent.NextEventId, component);
+
+ if (_random.Prob(component.RandomResultChance)) // This will replace the proper result message with a random one occasionaly to simulate some unreliablity.
+ message = GetRandomResult();
+
+ if (string.IsNullOrEmpty(message)) // If there is no message to send don't bother trying to send it.
+ return;
+
+ // Send a message describing the vision they see
+ message = Loc.GetString(message);
+ _chat.ChatMessageToOne(Shared.Chat.ChatChannel.Server,
+ message,
+ Loc.GetString("chat-manager-server-wrap-message", ("message", message)),
+ uid,
+ false,
+ mindComponent.Session.Channel,
+ Color.PaleVioletRed);
+
+ component.DoAfter = null;
+ }
+
+ ///
+ /// Gets the precognition result message corosponding to the passed event id.
+ ///
+ /// message string corosponding to the event id passed
+ private string GetResultMessage(EntProtoId? eventId, PrecognitionPowerComponent component)
+ {
+ foreach (var (eventProto, precognitionResult) in component.AllResults)
+ {
+ if (eventProto.ID == eventId && precognitionResult != null)
+ return precognitionResult.Message;
+ }
+ Log.Error($"Prototype {eventId} does not have an associated precognitionResult!");
+ return string.Empty;
+ }
+
+ ///
+ ///
+ /// The localized string of a weighted randomly chosen precognition result
+ public string? GetRandomResult()
+ {
+ var precognitionResults = GetAllPrecognitionResults();
+ var sumOfWeights = 0;
+ foreach (var precognitionResult in precognitionResults.Values)
+ sumOfWeights += (int)precognitionResult.Weight;
+
+ sumOfWeights = _random.Next(sumOfWeights);
+ foreach (var precognitionResult in precognitionResults.Values)
+ {
+ sumOfWeights -= (int)precognitionResult.Weight;
+
+ if (sumOfWeights <= 0)
+ return precognitionResult.Message;
+ }
+
+ Log.Error("Result was not found after weighted pick process!");
+ return null;
+ }
+
+ ///
+ /// Gets the soonest nextEvent to occur within the window.
+ ///
+ /// The earliest reletive time that will be return a nextEvent
+ /// The latest reletive latest time that will be return a nextEvent
+ /// Component for the next event to occour if one exists in the window.
+ private NextEventComponent? FindEarliestNextEvent(TimeSpan minDetectWindow, TimeSpan maxDetectWindow)
+ {
+ TimeSpan? earliestNextEventTime = null;
+ NextEventComponent? earliestNextEvent = null;
+ var query = EntityQueryEnumerator();
+ while (query.MoveNext(out var nextEventComponent))
+ {
+ // Update if the event is the most recent event that isnt too close or too far from happening to be of use
+ if (nextEventComponent.NextEventTime > _gameTicker.RoundDuration() + minDetectWindow
+ && nextEventComponent.NextEventTime < _gameTicker.RoundDuration() + maxDetectWindow
+ && earliestNextEvent == null
+ || nextEventComponent.NextEventTime < earliestNextEventTime)
+ earliestNextEvent ??= nextEventComponent;
+ }
+ return earliestNextEvent;
+ }
+
+ public Dictionary GetAllPrecognitionResults()
+ {
+ var allEvents = new Dictionary();
+ foreach (var prototype in _prototype.EnumeratePrototypes())
+ {
+ if (prototype.Abstract)
+ continue;
+
+ if (!prototype.TryGetComponent(out var precognitionResult, _factory))
+ continue;
+
+ allEvents.Add(prototype, precognitionResult);
+ }
+
+ return allEvents;
+ }
+}
diff --git a/Content.Server/DeltaV/Cabinet/SpareIDSafeComponent.cs b/Content.Server/DeltaV/Cabinet/SpareIDSafeComponent.cs
new file mode 100644
index 00000000000..40f97486ce3
--- /dev/null
+++ b/Content.Server/DeltaV/Cabinet/SpareIDSafeComponent.cs
@@ -0,0 +1,4 @@
+namespace Content.Server.DeltaV.Cabinet;
+
+[RegisterComponent]
+public sealed partial class SpareIDSafeComponent : Component;
diff --git a/Content.Server/DeltaV/Cargo/Components/PriceModifierComponent.cs b/Content.Server/DeltaV/Cargo/Components/PriceModifierComponent.cs
new file mode 100644
index 00000000000..955e62e1765
--- /dev/null
+++ b/Content.Server/DeltaV/Cargo/Components/PriceModifierComponent.cs
@@ -0,0 +1,14 @@
+namespace Content.Server.DeltaV.Cargo.Components;
+
+///
+/// This is used for modifying the sell price of an entity.
+///
+[RegisterComponent]
+public sealed partial class PriceModifierComponent : Component
+{
+ ///
+ /// The price modifier.
+ ///
+ [DataField]
+ public float Modifier;
+}
diff --git a/Content.Server/DeltaV/Cargo/Systems/PricingSystem.Modifier.cs b/Content.Server/DeltaV/Cargo/Systems/PricingSystem.Modifier.cs
new file mode 100644
index 00000000000..edbda1aba52
--- /dev/null
+++ b/Content.Server/DeltaV/Cargo/Systems/PricingSystem.Modifier.cs
@@ -0,0 +1,41 @@
+using Content.Server.DeltaV.Cargo.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Cargo.Systems;
+
+public sealed partial class PricingSystem
+{
+ ///
+ /// Applies any price modifiers defined in the entity prototype.
+ ///
+ /// The entity prototype.
+ /// The base price before modification.
+ /// The modified price.
+ private double ApplyPrototypePriceModifier(EntityPrototype prototype, double basePrice)
+ {
+ if (prototype.Components.TryGetValue(_factory.GetComponentName(typeof(PriceModifierComponent)),
+ out var modProto))
+ {
+ var priceModifier = (PriceModifierComponent)modProto.Component;
+ return basePrice * priceModifier.Modifier;
+ }
+
+ return basePrice;
+ }
+
+ ///
+ /// Applies any price modifiers to the calculated price.
+ ///
+ /// The entity whose price is being modified.
+ /// The base price before modification.
+ /// The modified price.
+ private double ApplyPriceModifier(EntityUid uid, double basePrice)
+ {
+ if (TryComp(uid, out var modifier))
+ {
+ return basePrice * modifier.Modifier;
+ }
+
+ return basePrice;
+ }
+}
diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.NanoChat.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.NanoChat.cs
new file mode 100644
index 00000000000..89a2bd21eb3
--- /dev/null
+++ b/Content.Server/DeltaV/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.NanoChat.cs
@@ -0,0 +1,82 @@
+using Content.Shared.Audio;
+using Content.Shared.CartridgeLoader;
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
+using Content.Shared.DeltaV.NanoChat;
+
+namespace Content.Server.CartridgeLoader.Cartridges;
+
+public sealed partial class LogProbeCartridgeSystem
+{
+ private void InitializeNanoChat()
+ {
+ SubscribeLocalEvent(OnRecipientUpdated);
+ SubscribeLocalEvent(OnMessageReceived);
+ }
+
+ private void OnRecipientUpdated(ref NanoChatRecipientUpdatedEvent args)
+ {
+ var query = EntityQueryEnumerator();
+ while (query.MoveNext(out var uid, out var probe, out var cartridge))
+ {
+ if (probe.ScannedNanoChatData == null || GetEntity(probe.ScannedNanoChatData.Value.Card) != args.CardUid)
+ continue;
+
+ if (!TryComp(args.CardUid, out var card))
+ continue;
+
+ probe.ScannedNanoChatData = new NanoChatData(
+ new Dictionary(card.Recipients),
+ probe.ScannedNanoChatData.Value.Messages,
+ card.Number,
+ GetNetEntity(args.CardUid));
+
+ if (cartridge.LoaderUid != null)
+ UpdateUiState((uid, probe), cartridge.LoaderUid.Value);
+ }
+ }
+
+ private void OnMessageReceived(ref NanoChatMessageReceivedEvent args)
+ {
+ var query = EntityQueryEnumerator();
+ while (query.MoveNext(out var uid, out var probe, out var cartridge))
+ {
+ if (probe.ScannedNanoChatData == null || GetEntity(probe.ScannedNanoChatData.Value.Card) != args.CardUid)
+ continue;
+
+ if (!TryComp(args.CardUid, out var card))
+ continue;
+
+ probe.ScannedNanoChatData = new NanoChatData(
+ probe.ScannedNanoChatData.Value.Recipients,
+ new Dictionary>(card.Messages),
+ card.Number,
+ GetNetEntity(args.CardUid));
+
+ if (cartridge.LoaderUid != null)
+ UpdateUiState((uid, probe), cartridge.LoaderUid.Value);
+ }
+ }
+
+ private void ScanNanoChatCard(Entity ent,
+ CartridgeAfterInteractEvent args,
+ EntityUid target,
+ NanoChatCardComponent card)
+ {
+ _audioSystem.PlayEntity(ent.Comp.SoundScan,
+ args.InteractEvent.User,
+ target,
+ AudioHelpers.WithVariation(0.25f, _random));
+ _popupSystem.PopupCursor(Loc.GetString("log-probe-scan-nanochat", ("card", target)), args.InteractEvent.User);
+
+ ent.Comp.PulledAccessLogs.Clear();
+
+ ent.Comp.ScannedNanoChatData = new NanoChatData(
+ new Dictionary(card.Recipients),
+ new Dictionary>(card.Messages),
+ card.Number,
+ GetNetEntity(target)
+ );
+
+ UpdateUiState(ent, args.Loader);
+ }
+}
diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeComponent.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeComponent.cs
new file mode 100644
index 00000000000..2b95462a663
--- /dev/null
+++ b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeComponent.cs
@@ -0,0 +1,26 @@
+using Content.Shared.Radio;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.DeltaV.CartridgeLoader.Cartridges;
+
+[RegisterComponent, Access(typeof(NanoChatCartridgeSystem))]
+public sealed partial class NanoChatCartridgeComponent : Component
+{
+ ///
+ /// Station entity to keep track of.
+ ///
+ [DataField]
+ public EntityUid? Station;
+
+ ///
+ /// The NanoChat card to keep track of.
+ ///
+ [DataField]
+ public EntityUid? Card;
+
+ ///
+ /// The required to send or receive messages.
+ ///
+ [DataField]
+ public ProtoId RadioChannel = "Common";
+}
diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
new file mode 100644
index 00000000000..ea3c58226ad
--- /dev/null
+++ b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
@@ -0,0 +1,514 @@
+using System.Linq;
+using Content.Server.Administration.Logs;
+using Content.Server.CartridgeLoader;
+using Content.Server.Power.Components;
+using Content.Server.Radio;
+using Content.Server.Radio.Components;
+using Content.Server.Station.Systems;
+using Content.Shared.Access.Components;
+using Content.Shared.CartridgeLoader;
+using Content.Shared.Database;
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
+using Content.Shared.DeltaV.NanoChat;
+using Content.Shared.PDA;
+using Content.Shared.Radio.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Server.DeltaV.CartridgeLoader.Cartridges;
+
+public sealed class NanoChatCartridgeSystem : EntitySystem
+{
+ [Dependency] private readonly CartridgeLoaderSystem _cartridge = default!;
+ [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+ [Dependency] private readonly IGameTiming _timing = default!;
+ [Dependency] private readonly IPrototypeManager _prototype = default!;
+ [Dependency] private readonly SharedNanoChatSystem _nanoChat = default!;
+ [Dependency] private readonly StationSystem _station = default!;
+
+ // Messages in notifications get cut off after this point
+ // no point in storing it on the comp
+ private const int NotificationMaxLength = 64;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnUiReady);
+ SubscribeLocalEvent(OnMessage);
+ }
+
+ public override void Update(float frameTime)
+ {
+ base.Update(frameTime);
+
+ // Update card references for any cartridges that need it
+ var query = EntityQueryEnumerator();
+ while (query.MoveNext(out var uid, out var nanoChat, out var cartridge))
+ {
+ if (cartridge.LoaderUid == null)
+ continue;
+
+ // Check if we need to update our card reference
+ if (!TryComp(cartridge.LoaderUid, out var pda))
+ continue;
+
+ var newCard = pda.ContainedId;
+ var currentCard = nanoChat.Card;
+
+ // If the cards match, nothing to do
+ if (newCard == currentCard)
+ continue;
+
+ // Update card reference
+ nanoChat.Card = newCard;
+
+ // Update UI state since card reference changed
+ UpdateUI((uid, nanoChat), cartridge.LoaderUid.Value);
+ }
+ }
+
+ ///
+ /// Handles incoming UI messages from the NanoChat cartridge.
+ ///
+ private void OnMessage(Entity ent, ref CartridgeMessageEvent args)
+ {
+ if (args is not NanoChatUiMessageEvent msg)
+ return;
+
+ if (!GetCardEntity(GetEntity(args.LoaderUid), out var card))
+ return;
+
+ switch (msg.Type)
+ {
+ case NanoChatUiMessageType.NewChat:
+ HandleNewChat(card, msg);
+ break;
+ case NanoChatUiMessageType.SelectChat:
+ HandleSelectChat(card, msg);
+ break;
+ case NanoChatUiMessageType.CloseChat:
+ HandleCloseChat(card);
+ break;
+ case NanoChatUiMessageType.ToggleMute:
+ HandleToggleMute(card);
+ break;
+ case NanoChatUiMessageType.DeleteChat:
+ HandleDeleteChat(card, msg);
+ break;
+ case NanoChatUiMessageType.SendMessage:
+ HandleSendMessage(ent, card, msg);
+ break;
+ }
+
+ UpdateUI(ent, GetEntity(args.LoaderUid));
+ }
+
+ ///
+ /// Gets the ID card entity associated with a PDA.
+ ///
+ /// The PDA entity ID
+ /// Output parameter containing the found card entity and component
+ /// True if a valid NanoChat card was found
+ private bool GetCardEntity(
+ EntityUid loaderUid,
+ out Entity card)
+ {
+ card = default;
+
+ // Get the PDA and check if it has an ID card
+ if (!TryComp(loaderUid, out var pda) ||
+ pda.ContainedId == null ||
+ !TryComp(pda.ContainedId, out var idCard))
+ return false;
+
+ card = (pda.ContainedId.Value, idCard);
+ return true;
+ }
+
+ ///
+ /// Handles creation of a new chat conversation.
+ ///
+ private void HandleNewChat(Entity card, NanoChatUiMessageEvent msg)
+ {
+ if (msg.RecipientNumber == null || msg.Content == null || msg.RecipientNumber == card.Comp.Number)
+ return;
+
+ // Add new recipient
+ var recipient = new NanoChatRecipient(msg.RecipientNumber.Value,
+ msg.Content,
+ msg.RecipientJob);
+
+ // Initialize or update recipient
+ _nanoChat.SetRecipient((card, card.Comp), msg.RecipientNumber.Value, recipient);
+
+ _adminLogger.Add(LogType.Action,
+ LogImpact.Low,
+ $"{ToPrettyString(msg.Actor):user} created new NanoChat conversation with #{msg.RecipientNumber:D4} ({msg.Content})");
+
+ var recipientEv = new NanoChatRecipientUpdatedEvent(card);
+ RaiseLocalEvent(ref recipientEv);
+ UpdateUIForCard(card);
+ }
+
+ ///
+ /// Handles selecting a chat conversation.
+ ///
+ private void HandleSelectChat(Entity card, NanoChatUiMessageEvent msg)
+ {
+ if (msg.RecipientNumber == null)
+ return;
+
+ _nanoChat.SetCurrentChat((card, card.Comp), msg.RecipientNumber);
+
+ // Clear unread flag when selecting chat
+ if (_nanoChat.GetRecipient((card, card.Comp), msg.RecipientNumber.Value) is { } recipient)
+ {
+ _nanoChat.SetRecipient((card, card.Comp),
+ msg.RecipientNumber.Value,
+ recipient with { HasUnread = false });
+ }
+ }
+
+ ///
+ /// Handles closing the current chat conversation.
+ ///
+ private void HandleCloseChat(Entity card)
+ {
+ _nanoChat.SetCurrentChat((card, card.Comp), null);
+ }
+
+ ///
+ /// Handles deletion of a chat conversation.
+ ///
+ private void HandleDeleteChat(Entity card, NanoChatUiMessageEvent msg)
+ {
+ if (msg.RecipientNumber == null || card.Comp.Number == null)
+ return;
+
+ // Delete chat but keep the messages
+ var deleted = _nanoChat.TryDeleteChat((card, card.Comp), msg.RecipientNumber.Value, true);
+
+ if (!deleted)
+ return;
+
+ _adminLogger.Add(LogType.Action,
+ LogImpact.Low,
+ $"{ToPrettyString(msg.Actor):user} deleted NanoChat conversation with #{msg.RecipientNumber:D4}");
+
+ UpdateUIForCard(card);
+ }
+
+ ///
+ /// Handles toggling notification mute state.
+ ///
+ private void HandleToggleMute(Entity card)
+ {
+ _nanoChat.SetNotificationsMuted((card, card.Comp), !_nanoChat.GetNotificationsMuted((card, card.Comp)));
+ UpdateUIForCard(card);
+ }
+
+ ///
+ /// Handles sending a new message in a chat conversation.
+ ///
+ private void HandleSendMessage(Entity cartridge,
+ Entity card,
+ NanoChatUiMessageEvent msg)
+ {
+ if (msg.RecipientNumber == null || msg.Content == null || card.Comp.Number == null)
+ return;
+
+ if (!EnsureRecipientExists(card, msg.RecipientNumber.Value))
+ return;
+
+ // Create and store message for sender
+ var message = new NanoChatMessage(
+ _timing.CurTime,
+ msg.Content,
+ (uint)card.Comp.Number
+ );
+
+ // Attempt delivery
+ var (deliveryFailed, recipients) = AttemptMessageDelivery(cartridge, msg.RecipientNumber.Value);
+
+ // Update delivery status
+ message = message with { DeliveryFailed = deliveryFailed };
+
+ // Store message in sender's outbox under recipient's number
+ _nanoChat.AddMessage((card, card.Comp), msg.RecipientNumber.Value, message);
+
+ // Log message attempt
+ var recipientsText = recipients.Count > 0
+ ? string.Join(", ", recipients.Select(r => ToPrettyString(r)))
+ : $"#{msg.RecipientNumber:D4}";
+
+ _adminLogger.Add(LogType.Chat,
+ LogImpact.Low,
+ $"{ToPrettyString(card):user} sent NanoChat message to {recipientsText}: {msg.Content}{(deliveryFailed ? " [DELIVERY FAILED]" : "")}");
+
+ var msgEv = new NanoChatMessageReceivedEvent(card);
+ RaiseLocalEvent(ref msgEv);
+
+ if (deliveryFailed)
+ return;
+
+ foreach (var recipient in recipients)
+ {
+ DeliverMessageToRecipient(card, recipient, message);
+ }
+ }
+
+ ///
+ /// Ensures a recipient exists in the sender's contacts.
+ ///
+ /// The card to check contacts for
+ /// The recipient's number to check
+ /// True if the recipient exists or was created successfully
+ private bool EnsureRecipientExists(Entity card, uint recipientNumber)
+ {
+ return _nanoChat.EnsureRecipientExists((card, card.Comp), recipientNumber, GetCardInfo(recipientNumber));
+ }
+
+ ///
+ /// Attempts to deliver a message to recipients.
+ ///
+ /// The sending cartridge entity
+ /// The recipient's number
+ /// Tuple containing delivery status and recipients if found.
+ private (bool failed, List> recipient) AttemptMessageDelivery(
+ Entity sender,
+ uint recipientNumber)
+ {
+ // First verify we can send from this device
+ var channel = _prototype.Index(sender.Comp.RadioChannel);
+ var sendAttemptEvent = new RadioSendAttemptEvent(channel, sender);
+ RaiseLocalEvent(ref sendAttemptEvent);
+ if (sendAttemptEvent.Cancelled)
+ return (true, new List>());
+
+ var foundRecipients = new List>();
+
+ // Find all cards with matching number
+ var cardQuery = EntityQueryEnumerator();
+ while (cardQuery.MoveNext(out var cardUid, out var card))
+ {
+ if (card.Number != recipientNumber)
+ continue;
+
+ foundRecipients.Add((cardUid, card));
+ }
+
+ if (foundRecipients.Count == 0)
+ return (true, foundRecipients);
+
+ // Now check if any of these cards can receive
+ var deliverableRecipients = new List>();
+ foreach (var recipient in foundRecipients)
+ {
+ // Find any cartridges that have this card
+ var cartridgeQuery = EntityQueryEnumerator();
+ while (cartridgeQuery.MoveNext(out var receiverUid, out var receiverCart, out _))
+ {
+ if (receiverCart.Card != recipient.Owner)
+ continue;
+
+ // Check if devices are on same station/map
+ var recipientStation = _station.GetOwningStation(receiverUid);
+ var senderStation = _station.GetOwningStation(sender);
+
+ // Both entities must be on a station
+ if (recipientStation == null || senderStation == null)
+ continue;
+
+ // Must be on same map/station unless long range allowed
+ if (!channel.LongRange && recipientStation != senderStation)
+ continue;
+
+ // Needs telecomms
+ if (!HasActiveServer(senderStation.Value) || !HasActiveServer(recipientStation.Value))
+ continue;
+
+ // Check if recipient can receive
+ var receiveAttemptEv = new RadioReceiveAttemptEvent(channel, sender, receiverUid);
+ RaiseLocalEvent(ref receiveAttemptEv);
+ if (receiveAttemptEv.Cancelled)
+ continue;
+
+ // Found valid cartridge that can receive
+ deliverableRecipients.Add(recipient);
+ break; // Only need one valid cartridge per card
+ }
+ }
+
+ return (deliverableRecipients.Count == 0, deliverableRecipients);
+ }
+
+ ///
+ /// Checks if there are any active telecomms servers on the given station
+ ///
+ private bool HasActiveServer(EntityUid station)
+ {
+ // I have no idea why this isn't public in the RadioSystem
+ var query =
+ EntityQueryEnumerator();
+
+ while (query.MoveNext(out var uid, out _, out _, out var power))
+ {
+ if (_station.GetOwningStation(uid) == station && power.Powered)
+ return true;
+ }
+
+ return false;
+ }
+
+ ///
+ /// Delivers a message to the recipient and handles associated notifications.
+ ///
+ /// The sender's card entity
+ /// The recipient's card entity
+ /// The to deliver
+ private void DeliverMessageToRecipient(Entity sender,
+ Entity recipient,
+ NanoChatMessage message)
+ {
+ var senderNumber = sender.Comp.Number;
+ if (senderNumber == null)
+ return;
+
+ // Always try to get and add sender info to recipient's contacts
+ if (!EnsureRecipientExists(recipient, senderNumber.Value))
+ return;
+
+ _nanoChat.AddMessage((recipient, recipient.Comp), senderNumber.Value, message with { DeliveryFailed = false });
+
+
+ if (_nanoChat.GetCurrentChat((recipient, recipient.Comp)) != senderNumber)
+ HandleUnreadNotification(recipient, message);
+
+ var msgEv = new NanoChatMessageReceivedEvent(recipient);
+ RaiseLocalEvent(ref msgEv);
+ UpdateUIForCard(recipient);
+ }
+
+ ///
+ /// Handles unread message notifications and updates unread status.
+ ///
+ private void HandleUnreadNotification(Entity recipient, NanoChatMessage message)
+ {
+ // Get sender name from contacts or fall back to number
+ var recipients = _nanoChat.GetRecipients((recipient, recipient.Comp));
+ var senderName = recipients.TryGetValue(message.SenderId, out var existingRecipient)
+ ? existingRecipient.Name
+ : $"#{message.SenderId:D4}";
+
+ if (!recipient.Comp.Recipients[message.SenderId].HasUnread && !recipient.Comp.NotificationsMuted)
+ {
+ var pdaQuery = EntityQueryEnumerator();
+ while (pdaQuery.MoveNext(out var pdaUid, out var pdaComp))
+ {
+ if (pdaComp.ContainedId != recipient)
+ continue;
+
+ _cartridge.SendNotification(pdaUid,
+ Loc.GetString("nano-chat-new-message-title", ("sender", senderName)),
+ Loc.GetString("nano-chat-new-message-body", ("message", TruncateMessage(message.Content))));
+ break;
+ }
+ }
+
+ // Update unread status
+ _nanoChat.SetRecipient((recipient, recipient.Comp),
+ message.SenderId,
+ existingRecipient with { HasUnread = true });
+ }
+
+ ///
+ /// Updates the UI for any PDAs containing the specified card.
+ ///
+ private void UpdateUIForCard(EntityUid cardUid)
+ {
+ // Find any PDA containing this card and update its UI
+ var query = EntityQueryEnumerator();
+ while (query.MoveNext(out var uid, out var comp, out var cartridge))
+ {
+ if (comp.Card != cardUid || cartridge.LoaderUid == null)
+ continue;
+
+ UpdateUI((uid, comp), cartridge.LoaderUid.Value);
+ }
+ }
+
+ ///
+ /// Gets the for a given NanoChat number.
+ ///
+ private NanoChatRecipient? GetCardInfo(uint number)
+ {
+ // Find card with this number to get its info
+ var query = EntityQueryEnumerator();
+ while (query.MoveNext(out var uid, out var card))
+ {
+ if (card.Number != number)
+ continue;
+
+ // Try to get job title from ID card if possible
+ string? jobTitle = null;
+ var name = "Unknown";
+ if (TryComp(uid, out var idCard))
+ {
+ jobTitle = idCard.LocalizedJobTitle;
+ name = idCard.FullName ?? name;
+ }
+
+ return new NanoChatRecipient(number, name, jobTitle);
+ }
+
+ return null;
+ }
+
+ ///
+ /// Truncates a message to the notification maximum length.
+ ///
+ private static string TruncateMessage(string message)
+ {
+ return message.Length <= NotificationMaxLength
+ ? message
+ : message[..(NotificationMaxLength - 4)] + " [...]";
+ }
+
+ private void OnUiReady(Entity ent, ref CartridgeUiReadyEvent args)
+ {
+ _cartridge.RegisterBackgroundProgram(args.Loader, ent);
+ UpdateUI(ent, args.Loader);
+ }
+
+ private void UpdateUI(Entity ent, EntityUid loader)
+ {
+ if (_station.GetOwningStation(loader) is { } station)
+ ent.Comp.Station = station;
+
+ var recipients = new Dictionary();
+ var messages = new Dictionary>();
+ uint? currentChat = null;
+ uint ownNumber = 0;
+ var maxRecipients = 50;
+ var notificationsMuted = false;
+
+ if (ent.Comp.Card != null && TryComp(ent.Comp.Card, out var card))
+ {
+ recipients = card.Recipients;
+ messages = card.Messages;
+ currentChat = card.CurrentChat;
+ ownNumber = card.Number ?? 0;
+ maxRecipients = card.MaxRecipients;
+ notificationsMuted = card.NotificationsMuted;
+ }
+
+ var state = new NanoChatUiState(recipients,
+ messages,
+ currentChat,
+ ownNumber,
+ maxRecipients,
+ notificationsMuted);
+ _cartridge.UpdateCartridgeUiState(loader, state);
+ }
+}
diff --git a/Content.Server/Execution/ExecutionSystem.cs b/Content.Server/DeltaV/Execution/ExecutionSystem.cs
similarity index 91%
rename from Content.Server/Execution/ExecutionSystem.cs
rename to Content.Server/DeltaV/Execution/ExecutionSystem.cs
index 25491127b1d..5de3332494b 100644
--- a/Content.Server/Execution/ExecutionSystem.cs
+++ b/Content.Server/DeltaV/Execution/ExecutionSystem.cs
@@ -2,6 +2,7 @@
using Content.Server.Kitchen.Components;
using Content.Server.Weapons.Ranged.Systems;
using Content.Shared.ActionBlocker;
+using Content.Shared.Clumsy;
using Content.Shared.Damage;
using Content.Shared.Database;
using Content.Shared.DoAfter;
@@ -20,12 +21,16 @@
using Robust.Shared.Audio.Systems;
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
namespace Content.Server.Execution;
///
-/// Verb for violently murdering cuffed creatures.
+/// Verb for violently murdering cuffed creatures using guns.
///
+///
+/// Upstream won't have this for years so it goes in the DeltaV folder.
+///
public sealed class ExecutionSystem : EntitySystem
{
[Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
@@ -35,6 +40,7 @@ public sealed class ExecutionSystem : EntitySystem
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
[Dependency] private readonly DamageableSystem _damageableSystem = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+ [Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly IComponentFactory _componentFactory = default!;
[Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
[Dependency] private readonly SharedAudioSystem _audioSystem = default!;
@@ -256,18 +262,17 @@ private void OnDoafterGun(EntityUid uid, GunComponent component, DoAfterEvent ar
}
// Clumsy people have a chance to shoot themselves
- if (TryComp(attacker, out var clumsy) && component.ClumsyProof == false)
+ if (!component.ClumsyProof &&
+ TryComp(attacker, out var clumsy) &&
+ _random.Prob(1f/3f))
{
- if (_interactionSystem.TryRollClumsy(attacker, 0.33333333f, clumsy))
- {
- ShowExecutionPopup("execution-popup-gun-clumsy-internal", Filter.Entities(attacker), PopupType.Medium, attacker, victim, weapon);
- ShowExecutionPopup("execution-popup-gun-clumsy-external", Filter.PvsExcept(attacker), PopupType.MediumCaution, attacker, victim, weapon);
+ ShowExecutionPopup("execution-popup-gun-clumsy-internal", Filter.Entities(attacker), PopupType.Medium, attacker, victim, weapon);
+ ShowExecutionPopup("execution-popup-gun-clumsy-external", Filter.PvsExcept(attacker), PopupType.MediumCaution, attacker, victim, weapon);
- // You shoot yourself with the gun (no damage multiplier)
- _damageableSystem.TryChangeDamage(attacker, damage, origin: attacker);
- _audioSystem.PlayEntity(component.SoundGunshot, Filter.Pvs(weapon), weapon, true, AudioParams.Default);
- return;
- }
+ // You shoot yourself with the gun (no damage multiplier)
+ _damageableSystem.TryChangeDamage(attacker, damage, origin: attacker);
+ _audioSystem.PlayEntity(component.SoundGunshot, Filter.Pvs(weapon), weapon, true, AudioParams.Default);
+ return;
}
// Gun successfully fired, deal damage
diff --git a/Content.Server/DeltaV/GlimmerWisp/LifeDrainerSystem.cs b/Content.Server/DeltaV/GlimmerWisp/LifeDrainerSystem.cs
index ec800db2a30..079ec77bbf3 100644
--- a/Content.Server/DeltaV/GlimmerWisp/LifeDrainerSystem.cs
+++ b/Content.Server/DeltaV/GlimmerWisp/LifeDrainerSystem.cs
@@ -1,5 +1,6 @@
using Content.Shared.ActionBlocker;
using Content.Shared.Damage;
+using Content.Shared.DeltaV.Carrying;
using Content.Shared.DoAfter;
using Content.Shared.Interaction;
using Content.Shared.Mobs.Systems;
@@ -11,7 +12,6 @@
using Content.Shared.Verbs;
using Content.Shared.Whitelist;
using Content.Server.NPC.Components;
-using Content.Server.Carrying;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Player;
using Robust.Shared.Utility;
diff --git a/Content.Server/DeltaV/NanoChat/NanoChatSystem.cs b/Content.Server/DeltaV/NanoChat/NanoChatSystem.cs
new file mode 100644
index 00000000000..fb0ca32aa66
--- /dev/null
+++ b/Content.Server/DeltaV/NanoChat/NanoChatSystem.cs
@@ -0,0 +1,130 @@
+using System.Linq;
+using Content.Server.Access.Systems;
+using Content.Server.Administration.Logs;
+using Content.Server.Kitchen.Components;
+using Content.Server.NameIdentifier;
+using Content.Shared.Database;
+using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
+using Content.Shared.DeltaV.NanoChat;
+using Content.Shared.NameIdentifier;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server.DeltaV.NanoChat;
+
+///
+/// Handles NanoChat features that are specific to the server but not related to the cartridge itself.
+///
+public sealed class NanoChatSystem : SharedNanoChatSystem
+{
+ [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+ [Dependency] private readonly IRobustRandom _random = default!;
+ [Dependency] private readonly NameIdentifierSystem _name = default!;
+
+ private readonly ProtoId _nameIdentifierGroup = "NanoChat";
+
+ public override void Initialize()
+ {
+ base.Initialize();
+ SubscribeLocalEvent(OnCardInit);
+ SubscribeLocalEvent(OnMicrowaved, after: [typeof(IdCardSystem)]);
+ }
+
+ private void OnMicrowaved(Entity ent, ref BeingMicrowavedEvent args)
+ {
+ // Skip if the entity was deleted (e.g., by ID card system burning it)
+ if (Deleted(ent))
+ return;
+
+ if (!TryComp(args.Microwave, out var micro) || micro.Broken)
+ return;
+
+ var randomPick = _random.NextFloat();
+
+ // Super lucky - erase all messages (10% chance)
+ if (randomPick <= 0.10f)
+ {
+ ent.Comp.Messages.Clear();
+ // TODO: these shouldn't be shown at the same time as the popups from IdCardSystem
+ // _popup.PopupEntity(Loc.GetString("nanochat-card-microwave-erased", ("card", ent)),
+ // ent,
+ // PopupType.Medium);
+
+ _adminLogger.Add(LogType.Action,
+ LogImpact.Medium,
+ $"{ToPrettyString(args.Microwave)} erased all messages on {ToPrettyString(ent)}");
+ }
+ else
+ {
+ // Scramble random messages for random recipients
+ ScrambleMessages(ent);
+ // _popup.PopupEntity(Loc.GetString("nanochat-card-microwave-scrambled", ("card", ent)),
+ // ent,
+ // PopupType.Medium);
+
+ _adminLogger.Add(LogType.Action,
+ LogImpact.Medium,
+ $"{ToPrettyString(args.Microwave)} scrambled messages on {ToPrettyString(ent)}");
+ }
+
+ Dirty(ent);
+ }
+
+ private void ScrambleMessages(NanoChatCardComponent component)
+ {
+ foreach (var (recipientNumber, messages) in component.Messages)
+ {
+ for (var i = 0; i < messages.Count; i++)
+ {
+ // 50% chance to scramble each message
+ if (!_random.Prob(0.5f))
+ continue;
+
+ var message = messages[i];
+ message.Content = ScrambleText(message.Content);
+ messages[i] = message;
+ }
+
+ // 25% chance to reassign the conversation to a random recipient
+ if (_random.Prob(0.25f) && component.Recipients.Count > 0)
+ {
+ var newRecipient = _random.Pick(component.Recipients.Keys.ToList());
+ if (newRecipient == recipientNumber)
+ continue;
+
+ if (!component.Messages.ContainsKey(newRecipient))
+ component.Messages[newRecipient] = new List();
+
+ component.Messages[newRecipient].AddRange(messages);
+ component.Messages[recipientNumber].Clear();
+ }
+ }
+ }
+
+ private string ScrambleText(string text)
+ {
+ var chars = text.ToCharArray();
+ var n = chars.Length;
+
+ // Fisher-Yates shuffle of characters
+ while (n > 1)
+ {
+ n--;
+ var k = _random.Next(n + 1);
+ (chars[k], chars[n]) = (chars[n], chars[k]);
+ }
+
+ return new string(chars);
+ }
+
+ private void OnCardInit(Entity ent, ref MapInitEvent args)
+ {
+ if (ent.Comp.Number != null)
+ return;
+
+ // Assign a random number
+ _name.GenerateUniqueName(ent, _nameIdentifierGroup, out var number);
+ ent.Comp.Number = (uint)number;
+ Dirty(ent);
+ }
+}
diff --git a/Content.Server/DeltaV/Objectives/Components/PickRandomTraitorComponent.cs b/Content.Server/DeltaV/Objectives/Components/PickRandomTraitorComponent.cs
new file mode 100644
index 00000000000..8f870ed7738
--- /dev/null
+++ b/Content.Server/DeltaV/Objectives/Components/PickRandomTraitorComponent.cs
@@ -0,0 +1,9 @@
+using Content.Server.Objectives.Systems;
+
+namespace Content.Server.DeltaV.Objectives.Components;
+
+///
+/// Sets the target for to a random traitor.
+///
+[RegisterComponent]
+public sealed partial class PickRandomTraitorComponent : Component;
diff --git a/Content.Server/DeltaV/Objectives/Components/TeachLessonConditionComponent.cs b/Content.Server/DeltaV/Objectives/Components/TeachLessonConditionComponent.cs
index ee86f4851b3..e8592c3d73e 100644
--- a/Content.Server/DeltaV/Objectives/Components/TeachLessonConditionComponent.cs
+++ b/Content.Server/DeltaV/Objectives/Components/TeachLessonConditionComponent.cs
@@ -1,6 +1,7 @@
-using Content.Server.Objectives.Systems;
+using Content.Server.DeltaV.Objectives.Systems;
+using Content.Server.Objectives.Components;
-namespace Content.Server.Objectives.Components;
+namespace Content.Server.DeltaV.Objectives.Components;
///
/// Requires that a target dies once and only once.
diff --git a/Content.Server/DeltaV/Objectives/Systems/KillFellowTraitorObjectiveSystem.cs b/Content.Server/DeltaV/Objectives/Systems/KillFellowTraitorObjectiveSystem.cs
new file mode 100644
index 00000000000..781040ddc0a
--- /dev/null
+++ b/Content.Server/DeltaV/Objectives/Systems/KillFellowTraitorObjectiveSystem.cs
@@ -0,0 +1,73 @@
+using Content.Server.DeltaV.Objectives.Components;
+using Content.Server.Objectives.Components;
+using Content.Server.GameTicking.Rules;
+using Content.Server.Objectives.Systems;
+using Content.Shared.Objectives.Components;
+using Robust.Shared.Random;
+
+namespace Content.Server.DeltaV.Objectives.Systems;
+
+///
+/// Handles the kill fellow traitor objective.
+///
+public sealed class KillFellowTraitorObjectiveSystem : EntitySystem
+{
+ [Dependency] private readonly IRobustRandom _random = default!;
+ [Dependency] private readonly TargetObjectiveSystem _target = default!;
+ [Dependency] private readonly TraitorRuleSystem _traitorRule = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+ SubscribeLocalEvent(OnTraitorKillAssigned);
+ }
+
+ private void OnTraitorKillAssigned(EntityUid uid, PickRandomTraitorComponent comp, ref ObjectiveAssignedEvent args)
+ {
+ if (!TryComp(uid, out var target))
+ {
+ Log.Error($"Missing components for {uid}.");
+ args.Cancelled = true;
+ return;
+ }
+
+ // Target already assigned
+ if (target.Target != null)
+ {
+ Log.Error($"Target already assigned for {uid}.");
+ args.Cancelled = true;
+ return;
+ }
+
+ var traitors = _traitorRule.GetOtherTraitorMindsAliveAndConnected(args.Mind);
+
+ List validTraitorMinds = [];
+
+ // Going through each OTHER traitor
+ foreach (var traitor in traitors)
+ {
+ var valid = true;
+ // Going through each of OUR objectives.
+ foreach (var objective in args.Mind.Objectives)
+ {
+ // If one of OUR objectives already targets a traitor, don't add it to the list.
+ if (TryComp(objective, out var targetComp) && targetComp.Target == traitor.Id)
+ {
+ valid = false;
+ break;
+ }
+ }
+ if (valid)
+ validTraitorMinds.Add(traitor.Id);
+ }
+
+ // No other traitors
+ if (validTraitorMinds.Count == 0)
+ {
+ args.Cancelled = true;
+ return;
+ }
+
+ _target.SetTarget(uid, _random.Pick(validTraitorMinds), target);
+ }
+}
diff --git a/Content.Server/DeltaV/Objectives/Systems/TeachLessonConditionSystem.cs b/Content.Server/DeltaV/Objectives/Systems/TeachLessonConditionSystem.cs
index 8e3ca19f885..660380ba80b 100644
--- a/Content.Server/DeltaV/Objectives/Systems/TeachLessonConditionSystem.cs
+++ b/Content.Server/DeltaV/Objectives/Systems/TeachLessonConditionSystem.cs
@@ -1,48 +1,46 @@
-using Content.Server.Objectives.Components;
-using Content.Shared.GameTicking;
+using Content.Server.DeltaV.Objectives.Components;
+using Content.Server.Objectives.Components;
+using Content.Server.Objectives.Systems;
using Content.Shared.Mind;
-using Content.Shared.Objectives.Components;
+using Content.Shared.Mobs;
-namespace Content.Server.Objectives.Systems;
+namespace Content.Server.DeltaV.Objectives.Systems;
///
/// Handles teach a lesson condition logic, does not assign target.
///
public sealed class TeachLessonConditionSystem : EntitySystem
{
+ [Dependency] private readonly CodeConditionSystem _codeCondition = default!;
[Dependency] private readonly SharedMindSystem _mind = default!;
- [Dependency] private readonly TargetObjectiveSystem _target = default!;
-
- private readonly List _wasKilled = [];
public override void Initialize()
{
base.Initialize();
- SubscribeLocalEvent(OnGetProgress);
- SubscribeLocalEvent(OnRoundEnd);
+ SubscribeLocalEvent(OnMobStateChanged);
}
- private void OnGetProgress(Entity ent, ref ObjectiveGetProgressEvent args)
+ // TODO: subscribe by ref at some point in the future
+ private void OnMobStateChanged(MobStateChangedEvent args)
{
- if (!_target.GetTarget(ent, out var target))
+ if (args.NewMobState != MobState.Dead)
return;
- args.Progress = GetProgress(target.Value);
- }
+ // Get the mind of the entity that just died (if it has one)
+ if (!_mind.TryGetMind(args.Target, out var mindId, out _))
+ return;
- private float GetProgress(EntityUid target)
- {
- if (TryComp(target, out var mind) && mind.OwnedEntity != null && !_mind.IsCharacterDeadIc(mind))
- return _wasKilled.Contains(target) ? 1f : 0f;
+ // Get all TeachLessonConditionComponent entities
+ var query = EntityQueryEnumerator();
- _wasKilled.Add(target);
- return 1f;
- }
+ while (query.MoveNext(out var uid, out _, out var targetObjective))
+ {
+ // Check if this objective's target matches the entity that died
+ if (targetObjective.Target != mindId)
+ continue;
- // Clear the wasKilled list on round end
- private void OnRoundEnd(RoundRestartCleanupEvent ev)
- {
- _wasKilled.Clear();
+ _codeCondition.SetCompleted(uid);
+ }
}
}
diff --git a/Content.Server/DeltaV/Planet/PlanetSystem.cs b/Content.Server/DeltaV/Planet/PlanetSystem.cs
new file mode 100644
index 00000000000..0178a45bb1b
--- /dev/null
+++ b/Content.Server/DeltaV/Planet/PlanetSystem.cs
@@ -0,0 +1,76 @@
+using Content.Server.Atmos.EntitySystems;
+using Content.Server.Parallax;
+using Content.Shared.DeltaV.Planet;
+using Content.Shared.Parallax.Biomes;
+using Robust.Server.GameObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.DeltaV.Planet;
+
+public sealed class PlanetSystem : EntitySystem
+{
+ [Dependency] private readonly AtmosphereSystem _atmos = default!;
+ [Dependency] private readonly BiomeSystem _biome = default!;
+ [Dependency] private readonly IPrototypeManager _proto = default!;
+ [Dependency] private readonly MapSystem _map = default!;
+ [Dependency] private readonly MapLoaderSystem _mapLoader = default!;
+ [Dependency] private readonly MetaDataSystem _meta = default!;
+
+ private readonly List<(Vector2i, Tile)> _setTiles = new();
+
+ ///
+ /// Spawn a planet map from a planet prototype.
+ ///
+ public EntityUid SpawnPlanet(ProtoId id, bool runMapInit = true)
+ {
+ var planet = _proto.Index(id);
+
+ var map = _map.CreateMap(out _, runMapInit: runMapInit);
+ _biome.EnsurePlanet(map, _proto.Index(planet.Biome), mapLight: planet.MapLight);
+
+ // add each marker layer
+ var biome = Comp(map);
+ foreach (var layer in planet.BiomeMarkerLayers)
+ {
+ _biome.AddMarkerLayer(map, biome, layer);
+ }
+
+ if (planet.AddedComponents is {} added)
+ EntityManager.AddComponents(map, added);
+
+ _atmos.SetMapAtmosphere(map, false, planet.Atmosphere);
+
+ _meta.SetEntityName(map, Loc.GetString(planet.MapName));
+
+ return map;
+ }
+
+ ///
+ /// Spawns an initialized planet map from a planet prototype and loads a grid onto it.
+ /// Returns the map entity if loading succeeded.
+ ///
+ public EntityUid? LoadPlanet(ProtoId id, string path)
+ {
+ var map = SpawnPlanet(id, runMapInit: false);
+ var mapId = Comp(map).MapId;
+ if (!_mapLoader.TryLoad(mapId, path, out var grids))
+ {
+ Log.Error($"Failed to load planet grid {path} for planet {id}!");
+ Del(map);
+ return null;
+ }
+
+ // don't want rocks spawning inside the base
+ foreach (var gridUid in grids)
+ {
+ _setTiles.Clear();
+ var aabb = Comp(gridUid).LocalAABB;
+ _biome.ReserveTiles(map, aabb.Enlarged(0.2f), _setTiles);
+ }
+
+ _map.InitializeMap(map);
+ return map;
+ }
+}
diff --git a/Content.Server/DeltaV/Shuttles/Systems/DockingConsoleSystem.cs b/Content.Server/DeltaV/Shuttles/Systems/DockingConsoleSystem.cs
new file mode 100644
index 00000000000..d331d7231b6
--- /dev/null
+++ b/Content.Server/DeltaV/Shuttles/Systems/DockingConsoleSystem.cs
@@ -0,0 +1,176 @@
+using Content.Server.Shuttles.Components;
+using Content.Server.Shuttles.Events;
+using Content.Server.Shuttles.Systems;
+using Content.Server.Station.Components;
+using Content.Server.Station.Systems;
+using Content.Shared.DeltaV.Shuttles;
+using Content.Shared.DeltaV.Shuttles.Components;
+using Content.Shared.DeltaV.Shuttles.Systems;
+using Content.Shared.Shuttles.Components;
+using Content.Shared.Shuttles.Systems;
+using Content.Shared.Timing;
+using Content.Shared.Whitelist;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+
+namespace Content.Server.DeltaV.Shuttles.Systems;
+
+public sealed class DockingConsoleSystem : SharedDockingConsoleSystem
+{
+ [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+ [Dependency] private readonly SharedMapSystem _map = default!;
+ [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
+ [Dependency] private readonly ShuttleSystem _shuttle = default!;
+ [Dependency] private readonly StationSystem _station = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnDock);
+ SubscribeLocalEvent(OnUndock);
+
+ Subs.BuiEvents(DockingConsoleUiKey.Key, subs =>
+ {
+ subs.Event(OnOpened);
+ subs.Event(OnFTL);
+ });
+ }
+
+ private void OnDock(DockEvent args)
+ {
+ UpdateConsoles(args.GridAUid, args.GridBUid);
+ }
+
+ private void OnUndock(UndockEvent args)
+ {
+ UpdateConsoles(args.GridAUid, args.GridBUid);
+ }
+
+ private void OnOpened(Entity ent, ref BoundUIOpenedEvent args)
+ {
+ if (TerminatingOrDeleted(ent.Comp.Shuttle))
+ UpdateShuttle(ent);
+
+ UpdateUI(ent);
+ }
+
+ private void UpdateConsoles(EntityUid gridA, EntityUid gridB)
+ {
+ UpdateConsolesUsing(gridA);
+ UpdateConsolesUsing(gridB);
+ }
+
+ ///
+ /// Update the UI of every console that is using a certain shuttle.
+ ///
+ public void UpdateConsolesUsing(EntityUid shuttle)
+ {
+ if (!HasComp(shuttle))
+ return;
+
+ var query = EntityQueryEnumerator();
+ while (query.MoveNext(out var uid, out var comp))
+ {
+ if (comp.Shuttle == shuttle)
+ UpdateUI((uid, comp));
+ }
+ }
+
+ private void UpdateUI(Entity ent)
+ {
+ if (ent.Comp.Shuttle is not {} shuttle)
+ return;
+
+ var ftlState = FTLState.Available;
+ StartEndTime ftlTime = default;
+ List destinations = new();
+
+ if (TryComp(shuttle, out var ftl))
+ {
+ ftlState = ftl.State;
+ ftlTime = _shuttle.GetStateTime(ftl);
+ }
+
+ if (TryComp(shuttle, out var docking))
+ {
+ destinations = docking.Destinations;
+ }
+
+ var state = new DockingConsoleState(ftlState, ftlTime, destinations);
+ _ui.SetUiState(ent.Owner, DockingConsoleUiKey.Key, state);
+ }
+
+ private void OnFTL(Entity ent, ref DockingConsoleFTLMessage args)
+ {
+ if (ent.Comp.Shuttle is not {} shuttle || !TryComp(shuttle, out var docking))
+ return;
+
+ if (args.Index < 0 || args.Index > docking.Destinations.Count)
+ return;
+
+ var dest = docking.Destinations[args.Index];
+ var map = dest.Map;
+ // can't FTL if its already there or somehow failed whitelist
+ if (map == Transform(shuttle).MapID || !_shuttle.CanFTLTo(shuttle, map, ent))
+ return;
+
+ if (FindLargestGrid(map) is not {} grid)
+ return;
+
+ Log.Debug($"{ToPrettyString(args.Actor):user} is FTL-docking {ToPrettyString(shuttle):shuttle} to {ToPrettyString(grid):grid}");
+
+ _shuttle.FTLToDock(shuttle, Comp(shuttle), grid, priorityTag: ent.Comp.DockTag);
+ }
+
+ private EntityUid? FindLargestGrid(MapId map)
+ {
+ EntityUid? largestGrid = null;
+ var largestSize = 0f;
+
+ if (_station.GetStationInMap(map) is {} station)
+ {
+ // prevent picking vgroid and stuff
+ return _station.GetLargestGrid(Comp(station));
+ }
+
+ var query = EntityQueryEnumerator();
+ while (query.MoveNext(out var gridUid, out var grid, out var xform))
+ {
+ if (xform.MapID != map)
+ continue;
+
+ var size = grid.LocalAABB.Size.LengthSquared();
+ if (size < largestSize)
+ continue;
+
+ largestSize = size;
+ largestGrid = gridUid;
+ }
+
+ return largestGrid;
+ }
+
+ private void UpdateShuttle(Entity ent)
+ {
+ var hadShuttle = ent.Comp.HasShuttle;
+ // no error if it cant find one since it would fail every test as shuttle.grid_fill is false in dev
+ ent.Comp.Shuttle = FindShuttle(ent.Comp.ShuttleWhitelist);
+ ent.Comp.HasShuttle = ent.Comp.Shuttle != null;
+
+ if (ent.Comp.HasShuttle != hadShuttle)
+ Dirty(ent);
+ }
+
+ private EntityUid? FindShuttle(EntityWhitelist whitelist)
+ {
+ var query = EntityQueryEnumerator();
+ while (query.MoveNext(out var uid, out _))
+ {
+ if (_whitelist.IsValid(whitelist, uid))
+ return uid;
+ }
+
+ return null;
+ }
+}
diff --git a/Content.Server/DeltaV/Shuttles/Systems/DockingShuttleSystem.cs b/Content.Server/DeltaV/Shuttles/Systems/DockingShuttleSystem.cs
new file mode 100644
index 00000000000..5f95761f651
--- /dev/null
+++ b/Content.Server/DeltaV/Shuttles/Systems/DockingShuttleSystem.cs
@@ -0,0 +1,79 @@
+using Content.Server.Shuttles.Events;
+using Content.Server.Station.Components;
+using Content.Server.Station.Systems;
+using Content.Shared.DeltaV.Shuttles.Components;
+using Content.Shared.DeltaV.Shuttles.Systems;
+using Content.Shared.Shuttles.Components;
+using Content.Shared.Whitelist;
+using Robust.Shared.Map.Components;
+using System.Linq;
+
+namespace Content.Server.DeltaV.Shuttles.Systems;
+
+public sealed class DockingShuttleSystem : SharedDockingShuttleSystem
+{
+ [Dependency] private readonly DockingConsoleSystem _console = default!;
+ [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+ [Dependency] private readonly StationSystem _station = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnMapInit);
+ SubscribeLocalEvent(OnFTLStarted);
+ SubscribeLocalEvent(OnFTLCompleted);
+
+ SubscribeLocalEvent(OnStationGridAdded);
+ }
+
+ private void OnMapInit(Entity ent, ref MapInitEvent args)
+ {
+ // add any whitelisted destinations that it can FTL to
+ // since it needs a whitelist, this excludes the station
+ var query = EntityQueryEnumerator();
+ while (query.MoveNext(out var mapUid, out var dest, out var map))
+ {
+ if (!dest.Enabled || _whitelist.IsWhitelistFailOrNull(dest.Whitelist, ent))
+ continue;
+
+ ent.Comp.Destinations.Add(new DockingDestination()
+ {
+ Name = Name(mapUid),
+ Map = map.MapId
+ });
+ }
+ }
+
+ private void OnFTLStarted(Entity ent, ref FTLStartedEvent args)
+ {
+ _console.UpdateConsolesUsing(ent);
+ }
+
+ private void OnFTLCompleted(Entity ent, ref FTLCompletedEvent args)
+ {
+ _console.UpdateConsolesUsing(ent);
+ }
+
+ private void OnStationGridAdded(StationGridAddedEvent args)
+ {
+ var uid = args.GridId;
+ if (!TryComp(uid, out var comp))
+ return;
+
+ // only add the destination once
+ if (comp.Station != null)
+ return;
+
+ if (_station.GetOwningStation(uid) is not {} station || !TryComp(station, out var data))
+ return;
+
+ // add the source station as a destination
+ comp.Station = station;
+ comp.Destinations.Add(new DockingDestination()
+ {
+ Name = Name(station),
+ Map = Transform(data.Grids.First()).MapID
+ });
+ }
+}
diff --git a/Content.Server/DeltaV/Station/Components/CaptainStateComponent.cs b/Content.Server/DeltaV/Station/Components/CaptainStateComponent.cs
new file mode 100644
index 00000000000..d432e9ea6d0
--- /dev/null
+++ b/Content.Server/DeltaV/Station/Components/CaptainStateComponent.cs
@@ -0,0 +1,64 @@
+using Content.Server.DeltaV.Station.Systems;
+using Content.Server.Station.Systems;
+using Content.Shared.Access;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.DeltaV.Station.Components;
+
+///
+/// Denotes a station has no captain and holds data for automatic ACO systems
+///
+[RegisterComponent, Access(typeof(CaptainStateSystem), typeof(StationSystem))]
+public sealed partial class CaptainStateComponent : Component
+{
+ ///
+ /// Denotes wether the entity has a captain or not
+ ///
+ ///
+ /// Assume no captain unless specified
+ ///
+ [DataField]
+ public bool HasCaptain = false;
+
+ ///
+ /// The localization ID used for announcing the cancellation of ACO requests
+ ///
+ [DataField]
+ public LocId RevokeACOMessage = "captain-arrived-revoke-aco-announcement";
+
+ ///
+ /// The localization ID for requesting an ACO vote when AA will be unlocked
+ ///
+ [DataField]
+ public LocId ACORequestWithAAMessage = "no-captain-request-aco-vote-with-aa-announcement";
+
+ ///
+ /// The localization ID for requesting an ACO vote when AA will not be unlocked
+ ///
+ [DataField]
+ public LocId ACORequestNoAAMessage = "no-captain-request-aco-vote-announcement";
+
+ ///
+ /// Set after ACO has been requested to avoid duplicate calls
+ ///
+ [DataField]
+ public bool IsACORequestActive = false;
+
+ ///
+ /// Used to denote that AA has been brought into the round either from captain or safe.
+ ///
+ [DataField]
+ public bool IsAAInPlay = false;
+
+ ///
+ /// The localization ID for announcing that AA has been unlocked for ACO
+ ///
+ [DataField]
+ public LocId AAUnlockedMessage = "no-captain-aa-unlocked-announcement";
+
+ ///
+ /// The access level to grant to spare ID cabinets
+ ///
+ [DataField]
+ public ProtoId ACOAccess = "Command";
+}
diff --git a/Content.Server/DeltaV/Station/Components/StationPlanetSpawnerComponent.cs b/Content.Server/DeltaV/Station/Components/StationPlanetSpawnerComponent.cs
new file mode 100644
index 00000000000..64a61e55a5c
--- /dev/null
+++ b/Content.Server/DeltaV/Station/Components/StationPlanetSpawnerComponent.cs
@@ -0,0 +1,32 @@
+using Content.Server.DeltaV.Station.Systems;
+using Content.Shared.DeltaV.Planet;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Server.DeltaV.Station.Components;
+
+///
+/// Loads a planet map on mapinit and spawns a grid on it (e.g. a mining base).
+/// The map can then be FTLd to by any shuttle matching its whitelist.
+///
+[RegisterComponent, Access(typeof(StationPlanetSpawnerSystem))]
+public sealed partial class StationPlanetSpawnerComponent : Component
+{
+ ///
+ /// The planet to create.
+ ///
+ [DataField(required: true)]
+ public ProtoId Planet;
+
+ ///
+ /// Path to the grid to load onto the map.
+ ///
+ [DataField(required: true)]
+ public ResPath? GridPath;
+
+ ///
+ /// The map that was loaded.
+ ///
+ [DataField]
+ public EntityUid? Map;
+}
diff --git a/Content.Server/DeltaV/Station/Components/StationSurfaceComponent.cs b/Content.Server/DeltaV/Station/Components/StationSurfaceComponent.cs
deleted file mode 100644
index 56b2be8f6af..00000000000
--- a/Content.Server/DeltaV/Station/Components/StationSurfaceComponent.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Content.Server.Station.Systems;
-using Robust.Shared.Utility;
-
-namespace Content.Server.Station.Components;
-
-///
-/// Loads a surface map on mapinit.
-///
-[RegisterComponent, Access(typeof(StationSurfaceSystem))]
-public sealed partial class StationSurfaceComponent : Component
-{
- ///
- /// Path to the map to load.
- ///
- [DataField(required: true)]
- public ResPath? MapPath;
-
- ///
- /// The map that was loaded.
- ///
- [DataField]
- public EntityUid? Map;
-}
diff --git a/Content.Server/DeltaV/Station/Events/PlayerJobEvents.cs b/Content.Server/DeltaV/Station/Events/PlayerJobEvents.cs
new file mode 100644
index 00000000000..d34e5994202
--- /dev/null
+++ b/Content.Server/DeltaV/Station/Events/PlayerJobEvents.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Roles;
+using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.DeltaV.Station.Events;
+
+///
+/// Raised on a station when a after a players jobs are removed from the PlayerJobs
+///
+/// Player whos jobs were removed
+/// Entry in PlayerJobs removed a list of JobPrototypes
+[ByRefEvent]
+public record struct PlayerJobsRemovedEvent(NetUserId NetUserId, List> PlayerJobs);
+
+///
+/// Raised on a staion when a job is added to a player
+///
+/// Player who recived a job
+/// Id of the jobPrototype added
+[ByRefEvent]
+public record struct PlayerJobAddedEvent(NetUserId NetUserId, string JobPrototypeId);
diff --git a/Content.Server/DeltaV/Station/Systems/CaptainStateSystem.cs b/Content.Server/DeltaV/Station/Systems/CaptainStateSystem.cs
new file mode 100644
index 00000000000..c790b22f782
--- /dev/null
+++ b/Content.Server/DeltaV/Station/Systems/CaptainStateSystem.cs
@@ -0,0 +1,175 @@
+using Content.Server.Chat.Systems;
+using Content.Server.DeltaV.Cabinet;
+using Content.Server.DeltaV.Station.Components;
+using Content.Server.DeltaV.Station.Events;
+using Content.Server.GameTicking;
+using Content.Server.Station.Components;
+using Content.Shared.Access.Components;
+using Content.Shared.Access;
+using Content.Shared.DeltaV.CCVars;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace Content.Server.DeltaV.Station.Systems;
+
+public sealed class CaptainStateSystem : EntitySystem
+{
+ [Dependency] private readonly ChatSystem _chat = default!;
+ [Dependency] private readonly GameTicker _ticker = default!;
+ [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+ private bool _aaEnabled;
+ private bool _acoOnDeparture;
+ private TimeSpan _aaDelay;
+ private TimeSpan _acoDelay;
+
+ public override void Initialize()
+ {
+ SubscribeLocalEvent(OnPlayerJobAdded);
+ SubscribeLocalEvent(OnPlayerJobsRemoved);
+ Subs.CVar(_cfg, DCCVars.AutoUnlockAllAccessEnabled, a => _aaEnabled = a, true);
+ Subs.CVar(_cfg, DCCVars.RequestAcoOnCaptainDeparture, a => _acoOnDeparture = a, true);
+ Subs.CVar(_cfg, DCCVars.AutoUnlockAllAccessDelay, a => _aaDelay = TimeSpan.FromMinutes(a), true);
+ Subs.CVar(_cfg, DCCVars.RequestAcoDelay, a => _acoDelay = TimeSpan.FromMinutes(a), true);
+ base.Initialize();
+ }
+
+ public override void Update(float frameTime)
+ {
+ base.Update(frameTime);
+
+ var currentTime = _ticker.RoundDuration(); // Caching to reduce redundant calls
+ if (currentTime < _acoDelay) // Avoid timing issues. No need to run before _acoDelay is reached anyways.
+ return;
+ var query = EntityQueryEnumerator();
+ while (query.MoveNext(out var station, out var captainState))
+ {
+ if (currentTime < _acoDelay && captainState.IsACORequestActive == true) // Avoid timing issues. No need to run before _acoDelay is reached anyways.
+ {
+ Log.Error($"{captainState} IsACORequestActive true before ACO request time.");
+ captainState.IsACORequestActive = false;
+ }
+
+ if (captainState.HasCaptain)
+ HandleHasCaptain(station, captainState);
+ else
+ HandleNoCaptain(station, captainState, currentTime);
+ }
+ }
+
+ private void OnPlayerJobAdded(Entity ent, ref PlayerJobAddedEvent args)
+ {
+ if (args.JobPrototypeId == "Captain")
+ {
+ ent.Comp.IsAAInPlay = true;
+ ent.Comp.HasCaptain = true;
+ }
+ }
+
+ private void OnPlayerJobsRemoved(Entity ent, ref PlayerJobsRemovedEvent args)
+ {
+ if (!TryComp(ent, out var stationJobs))
+ return;
+ if (!args.PlayerJobs.Contains("Captain")) // If the player that left was a captain we need to check if there are any captains left
+ return;
+ if (stationJobs.PlayerJobs.Any(playerJobs => playerJobs.Value.Contains("Captain"))) // We check the PlayerJobs if there are any cpatins left
+ return;
+ ent.Comp.HasCaptain = false;
+ if (_acoOnDeparture)
+ {
+ _chat.DispatchStationAnnouncement(
+ ent,
+ Loc.GetString(ent.Comp.ACORequestNoAAMessage),
+ colorOverride: Color.Gold);
+
+ ent.Comp.IsACORequestActive = true;
+ }
+ }
+
+ ///
+ /// Handles cases for when there is a captain
+ ///
+ ///
+ ///
+ private void HandleHasCaptain(Entity station, CaptainStateComponent captainState)
+ {
+ // If ACO vote has been called we need to cancel and alert to return to normal chain of command
+ if (!captainState.IsACORequestActive)
+ return;
+
+ _chat.DispatchStationAnnouncement(
+ station,
+ Loc.GetString(captainState.RevokeACOMessage),
+ colorOverride: Color.Gold);
+
+ captainState.IsACORequestActive = false;
+ }
+
+ ///
+ /// Handles cases for when there is no captain
+ ///
+ ///
+ ///
+ private void HandleNoCaptain(Entity station, CaptainStateComponent captainState, TimeSpan currentTime)
+ {
+ if (CheckACORequest(captainState, currentTime))
+ {
+ var message =
+ CheckUnlockAA(captainState, null)
+ ? captainState.ACORequestWithAAMessage
+ : captainState.ACORequestNoAAMessage;
+
+ _chat.DispatchStationAnnouncement(
+ station,
+ Loc.GetString(message, ("minutes", _aaDelay.TotalMinutes)),
+ colorOverride: Color.Gold);
+
+ captainState.IsACORequestActive = true;
+ }
+ if (CheckUnlockAA(captainState, currentTime))
+ {
+ captainState.IsAAInPlay = true;
+ _chat.DispatchStationAnnouncement(station, Loc.GetString(captainState.AAUnlockedMessage), colorOverride: Color.Red);
+
+ // Extend access of spare id lockers to command so they can access emergency AA
+ var query = EntityQueryEnumerator();
+ while (query.MoveNext(out var spareIDSafe, out _))
+ {
+ if (!TryComp(spareIDSafe, out var accessReader))
+ continue;
+ var accesses = accessReader.AccessLists;
+ if (accesses.Count <= 0) // Avoid restricting access for readers with no accesses
+ continue;
+ // Awful and disgusting but the accessReader has no proper api for adding acceses to readers without awful type casting. See AccessOverriderSystem
+ accesses.Add(new HashSet> { captainState.ACOAccess });
+ Dirty(spareIDSafe, accessReader);
+ RaiseLocalEvent(spareIDSafe, new AccessReaderConfigurationChangedEvent());
+ }
+ }
+ }
+
+ ///
+ /// Checks the conditions for if an ACO should be requested
+ ///
+ ///
+ /// True if conditions are met for an ACO to be requested, False otherwise
+ private bool CheckACORequest(CaptainStateComponent captainState, TimeSpan currentTime)
+ {
+ return !captainState.IsACORequestActive && currentTime > _acoDelay;
+ }
+
+ ///
+ /// Checks the conditions for if AA should be unlocked
+ /// If time is null its condition is ignored
+ ///
+ ///
+ /// True if conditions are met for AA to be unlocked, False otherwise
+ private bool CheckUnlockAA(CaptainStateComponent captainState, TimeSpan? currentTime)
+ {
+ if (captainState.IsAAInPlay || !_aaEnabled)
+ return false;
+ return currentTime == null || currentTime > _acoDelay + _aaDelay;
+ }
+}
diff --git a/Content.Server/DeltaV/Station/Systems/StationPlanetSpawnerSystem.cs b/Content.Server/DeltaV/Station/Systems/StationPlanetSpawnerSystem.cs
new file mode 100644
index 00000000000..47729cb8a01
--- /dev/null
+++ b/Content.Server/DeltaV/Station/Systems/StationPlanetSpawnerSystem.cs
@@ -0,0 +1,30 @@
+using Content.Server.DeltaV.Planet;
+using Content.Server.DeltaV.Station.Components;
+
+namespace Content.Server.DeltaV.Station.Systems;
+
+public sealed class StationPlanetSpawnerSystem : EntitySystem
+{
+ [Dependency] private readonly PlanetSystem _planet = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnMapInit);
+ SubscribeLocalEvent(OnShutdown);
+ }
+
+ private void OnMapInit(Entity ent, ref MapInitEvent args)
+ {
+ if (ent.Comp.GridPath is not {} path)
+ return;
+
+ ent.Comp.Map = _planet.LoadPlanet(ent.Comp.Planet, path.ToString());
+ }
+
+ private void OnShutdown(Entity ent, ref ComponentShutdown args)
+ {
+ QueueDel(ent.Comp.Map);
+ }
+}
diff --git a/Content.Server/DeltaV/Station/Systems/StationSurfaceSystem.cs b/Content.Server/DeltaV/Station/Systems/StationSurfaceSystem.cs
deleted file mode 100644
index 73a1924c9db..00000000000
--- a/Content.Server/DeltaV/Station/Systems/StationSurfaceSystem.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Content.Server.Parallax;
-using Content.Server.Station.Components;
-using Robust.Server.GameObjects;
-
-namespace Content.Server.Station.Systems;
-
-public sealed class StationSurfaceSystem : EntitySystem
-{
- [Dependency] private readonly BiomeSystem _biome = default!;
- [Dependency] private readonly MapSystem _map = default!;
- [Dependency] private readonly MapLoaderSystem _mapLoader = default!;
-
- public override void Initialize()
- {
- base.Initialize();
-
- SubscribeLocalEvent(OnMapInit);
- }
-
- private void OnMapInit(Entity ent, ref MapInitEvent args)
- {
- if (ent.Comp.MapPath is not {} path)
- return;
-
- var map = _map.CreateMap(out var mapId);
- if (!_mapLoader.TryLoad(mapId, path.ToString(), out _))
- {
- Log.Error($"Failed to load surface map {ent.Comp.MapPath}!");
- Del(map);
- return;
- }
-
- // loading replaced the map entity with a new one so get the latest id
- map = _map.GetMap(mapId);
- _map.SetPaused(map, false);
-
- _biome.SetEnabled(map); // generate the terrain after the grids loaded to prevent it getting hidden under it
- ent.Comp.Map = map;
- }
-}
diff --git a/Content.Server/DeltaV/StationEvents/Events/FugitiveRule.cs b/Content.Server/DeltaV/StationEvents/Events/FugitiveRule.cs
index 5aed54bc976..f39d3eb07d0 100644
--- a/Content.Server/DeltaV/StationEvents/Events/FugitiveRule.cs
+++ b/Content.Server/DeltaV/StationEvents/Events/FugitiveRule.cs
@@ -11,6 +11,7 @@
using Content.Shared.Paper;
using Content.Shared.Popups;
using Content.Shared.Random.Helpers;
+using Content.Shared.Silicons.StationAi;
using Content.Shared.Storage.EntitySystems;
using Robust.Shared.Physics.Components;
using Robust.Shared.Utility;
@@ -46,7 +47,7 @@ protected override void ActiveTick(EntityUid uid, FugitiveRuleComponent comp, Ga
var consoles = new List();
while (query.MoveNext(out var console, out var xform, out _))
{
- if (StationSystem.GetOwningStation(console, xform) != comp.Station || HasComp(console))
+ if (StationSystem.GetOwningStation(console, xform) != comp.Station || HasComp(console) || HasComp(console))
continue;
consoles.Add(xform);
diff --git a/Content.Server/DeltaV/StationEvents/NextEvent/NextEventComponent.cs b/Content.Server/DeltaV/StationEvents/NextEvent/NextEventComponent.cs
new file mode 100644
index 00000000000..78fa5a2f067
--- /dev/null
+++ b/Content.Server/DeltaV/StationEvents/NextEvent/NextEventComponent.cs
@@ -0,0 +1,19 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.DeltaV.StationEvents.NextEvent;
+
+[RegisterComponent, Access(typeof(NextEventSystem))]
+public sealed partial class NextEventComponent : Component
+{
+ ///
+ /// Id of the next event that will be run by EventManagerSystem.
+ ///
+ [DataField]
+ public EntProtoId? NextEventId;
+
+ ///
+ /// Round time of the scheduler's next station event.
+ ///
+ [DataField]
+ public TimeSpan NextEventTime;
+}
diff --git a/Content.Server/DeltaV/StationEvents/NextEvent/NextEventSystem.cs b/Content.Server/DeltaV/StationEvents/NextEvent/NextEventSystem.cs
new file mode 100644
index 00000000000..72c4a8a6f0d
--- /dev/null
+++ b/Content.Server/DeltaV/StationEvents/NextEvent/NextEventSystem.cs
@@ -0,0 +1,18 @@
+using Content.Server.DeltaV.StationEvents.NextEvent;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.DeltaV.StationEvents.NextEvent;
+
+public sealed class NextEventSystem : EntitySystem
+{
+ ///
+ /// Updates the NextEventComponent with the provided id and time and returns the previously stored id.
+ ///
+ public EntProtoId? UpdateNextEvent(NextEventComponent component, EntProtoId newEventId, TimeSpan newEventTime)
+ {
+ EntProtoId? oldEventId = component.NextEventId; // Store components current NextEventId for return
+ component.NextEventId = newEventId;
+ component.NextEventTime = newEventTime;
+ return oldEventId;
+ }
+}
diff --git a/Content.Server/DeltaV/Weather/WeatherEffectsSystem.cs b/Content.Server/DeltaV/Weather/WeatherEffectsSystem.cs
new file mode 100644
index 00000000000..11a29e05cc8
--- /dev/null
+++ b/Content.Server/DeltaV/Weather/WeatherEffectsSystem.cs
@@ -0,0 +1,82 @@
+using Content.Shared.Damage;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Weather;
+using Content.Shared.Whitelist;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.DeltaV.Weather;
+
+///
+/// Handles weather damage for exposed entities.
+///
+public sealed partial class WeatherEffectsSystem : EntitySystem
+{
+ [Dependency] private readonly DamageableSystem _damageable = default!;
+ [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+ [Dependency] private readonly IGameTiming _timing = default!;
+ [Dependency] private readonly IPrototypeManager _proto = default!;
+ [Dependency] private readonly SharedMapSystem _map = default!;
+ [Dependency] private readonly SharedWeatherSystem _weather = default!;
+
+ private EntityQuery _gridQuery;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ _gridQuery = GetEntityQuery();
+ }
+
+ public override void Update(float frameTime)
+ {
+ base.Update(frameTime);
+
+ var now = _timing.CurTime;
+ var query = EntityQueryEnumerator();
+ while (query.MoveNext(out var map, out var weather))
+ {
+ if (now < weather.NextUpdate)
+ continue;
+
+ weather.NextUpdate = now + weather.UpdateDelay;
+
+ foreach (var (id, data) in weather.Weather)
+ {
+ // start and end do no damage
+ if (data.State != WeatherState.Running)
+ continue;
+
+ UpdateDamage(map, id);
+ }
+ }
+ }
+
+ private void UpdateDamage(EntityUid map, ProtoId id)
+ {
+ var weather = _proto.Index(id);
+ if (weather.Damage is not {} damage)
+ return;
+
+ var query = EntityQueryEnumerator();
+ while (query.MoveNext(out var uid, out var mob, out var xform))
+ {
+ // don't give dead bodies 10000 burn, that's not fun for anyone
+ if (xform.MapUid != map || mob.CurrentState == MobState.Dead)
+ continue;
+
+ // if not in space, check for being indoors
+ if (xform.GridUid is {} gridUid && _gridQuery.TryComp(gridUid, out var grid))
+ {
+ var tile = _map.GetTileRef((gridUid, grid), xform.Coordinates);
+ if (!_weather.CanWeatherAffect(gridUid, grid, tile))
+ continue;
+ }
+
+ if (_whitelist.IsBlacklistFailOrNull(weather.DamageBlacklist, uid))
+ _damageable.TryChangeDamage(uid, damage, interruptsDoAfters: false);
+ }
+ }
+}
diff --git a/Content.Server/DeltaV/Weather/WeatherSchedulerComponent.cs b/Content.Server/DeltaV/Weather/WeatherSchedulerComponent.cs
new file mode 100644
index 00000000000..ac69c957057
--- /dev/null
+++ b/Content.Server/DeltaV/Weather/WeatherSchedulerComponent.cs
@@ -0,0 +1,58 @@
+using Content.Shared.Destructible.Thresholds;
+using Content.Shared.Weather;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Server.DeltaV.Weather;
+
+///
+/// Makes weather randomly happen every so often.
+///
+[RegisterComponent, Access(typeof(WeatherSchedulerSystem))]
+[AutoGenerateComponentPause]
+public sealed partial class WeatherSchedulerComponent : Component
+{
+ ///
+ /// Weather stages to schedule.
+ ///
+ [DataField(required: true)]
+ public List Stages = new();
+
+ ///
+ /// The index of to use next, wraps back to the start.
+ ///
+ [DataField]
+ public int Stage;
+
+ ///
+ /// When to go to the next step of the schedule.
+ ///
+ [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
+ public TimeSpan NextUpdate;
+}
+
+///
+/// A stage in a weather schedule.
+///
+[Serializable, DataDefinition]
+public partial struct WeatherStage
+{
+ ///
+ /// A range of how long the stage can last for, in seconds.
+ ///
+ [DataField(required: true)]
+ public MinMax Duration = new(0, 0);
+
+ ///
+ /// The weather prototype to add, or null for clear weather.
+ ///
+ [DataField]
+ public ProtoId? Weather;
+
+ ///
+ /// Alert message to send in chat for players on the map when it starts.
+ ///
+ [DataField]
+ public LocId? Message;
+}
diff --git a/Content.Server/DeltaV/Weather/WeatherSchedulerSystem.cs b/Content.Server/DeltaV/Weather/WeatherSchedulerSystem.cs
new file mode 100644
index 00000000000..a19a2f3787d
--- /dev/null
+++ b/Content.Server/DeltaV/Weather/WeatherSchedulerSystem.cs
@@ -0,0 +1,75 @@
+using Content.Server.Chat.Managers;
+using Content.Shared.Chat;
+using Content.Shared.Weather;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Server.DeltaV.Weather;
+
+public sealed class WeatherSchedulerSystem : EntitySystem
+{
+ [Dependency] private readonly IChatManager _chat = default!;
+ [Dependency] private readonly IGameTiming _timing = default!;
+ [Dependency] private readonly IPrototypeManager _proto = default!;
+ [Dependency] private readonly IRobustRandom _random = default!;
+ [Dependency] private readonly SharedWeatherSystem _weather = default!;
+
+ public override void Update(float frameTime)
+ {
+ base.Update(frameTime);
+
+ var now = _timing.CurTime;
+ var query = EntityQueryEnumerator();
+ while (query.MoveNext(out var map, out var comp))
+ {
+ if (now < comp.NextUpdate)
+ continue;
+
+ if (comp.Stage >= comp.Stages.Count)
+ comp.Stage = 0;
+
+ var stage = comp.Stages[comp.Stage++];
+ var duration = stage.Duration.Next(_random);
+ comp.NextUpdate = now + TimeSpan.FromSeconds(duration);
+
+ var mapId = Comp(map).MapId;
+ if (stage.Weather is {} weather)
+ {
+ var ending = comp.NextUpdate;
+ // crossfade weather so as one ends the next starts
+ if (HasWeather(comp, comp.Stage - 1))
+ ending += WeatherComponent.ShutdownTime;
+ if (HasWeather(comp, comp.Stage + 1))
+ ending += WeatherComponent.StartupTime;
+ _weather.SetWeather(mapId, _proto.Index(weather), ending);
+ }
+
+ if (stage.Message is {} message)
+ {
+ var msg = Loc.GetString(message);
+ _chat.ChatMessageToManyFiltered(
+ Filter.BroadcastMap(mapId),
+ ChatChannel.Radio,
+ msg,
+ msg,
+ map,
+ false,
+ true,
+ null);
+ }
+ }
+ }
+
+ private bool HasWeather(WeatherSchedulerComponent comp, int stage)
+ {
+ if (stage < 0)
+ stage = comp.Stages.Count + stage;
+ else if (stage >= comp.Stages.Count)
+ stage %= comp.Stages.Count;
+
+ return comp.Stages[stage].Weather != null;
+ }
+}
diff --git a/Content.Server/DeltaV/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMetapsionicTriggerSystem.cs b/Content.Server/DeltaV/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMetapsionicTriggerSystem.cs
index 8d9a216d658..37143aacd1e 100644
--- a/Content.Server/DeltaV/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMetapsionicTriggerSystem.cs
+++ b/Content.Server/DeltaV/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMetapsionicTriggerSystem.cs
@@ -1,5 +1,6 @@
using Content.Server.DeltaV.Xenoarchaeology.XenoArtifacts.Triggers.Components;
-using Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Systems;
+using Content.Server.Nyanotrasen.StationEvents.Events;
+using Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Systems;
using Content.Shared.Abilities.Psionics;
namespace Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Systems;
@@ -13,10 +14,21 @@ public override void Initialize()
base.Initialize();
SubscribeLocalEvent(OnPowerDetected);
+
+ SubscribeLocalEvent(OnGlimmerEventEnded);
}
private void OnPowerDetected(Entity ent, ref PsionicPowerDetectedEvent args)
{
_artifact.TryActivateArtifact(ent);
}
+
+ private void OnGlimmerEventEnded(GlimmerEventEndedEvent args)
+ {
+ var query = EntityQueryEnumerator();
+ while (query.MoveNext(out var uid, out _))
+ {
+ _artifact.TryActivateArtifact(uid);
+ }
+ }
}
diff --git a/Content.Server/DeviceLinking/Systems/LogicGateSystem.cs b/Content.Server/DeviceLinking/Systems/LogicGateSystem.cs
index 598d5a2725e..1280ecd5d11 100644
--- a/Content.Server/DeviceLinking/Systems/LogicGateSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/LogicGateSystem.cs
@@ -102,10 +102,12 @@ private void OnSignalReceived(EntityUid uid, LogicGateComponent comp, ref Signal
if (args.Port == comp.InputPortA)
{
comp.StateA = state;
+ _appearance.SetData(uid, LogicGateVisuals.InputA, state == SignalState.High); //If A == High => Sets input A sprite to True
}
else if (args.Port == comp.InputPortB)
{
comp.StateB = state;
+ _appearance.SetData(uid, LogicGateVisuals.InputB, state == SignalState.High); //If B == High => Sets input B sprite to True
}
UpdateOutput(uid, comp);
@@ -143,6 +145,8 @@ private void UpdateOutput(EntityUid uid, LogicGateComponent comp)
break;
}
+ _appearance.SetData(uid, LogicGateVisuals.Output, output);
+
// only send a payload if it actually changed
if (output != comp.LastOutput)
{
diff --git a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs
index 0dc4f45d9e0..efaf5680947 100644
--- a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs
@@ -18,7 +18,7 @@
using Robust.Server.Audio;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
-using Robust.Shared.Player;
+using Robust.Shared.Map.Events;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
@@ -66,6 +66,42 @@ public override void Initialize()
SubscribeLocalEvent(OnUiRangeCheck);
SubscribeLocalEvent(OnComponentRemoved);
+
+ SubscribeLocalEvent(OnMapSave);
+ }
+
+ private void OnMapSave(BeforeSaveEvent ev)
+ {
+ var enumerator = AllEntityQuery();
+ while (enumerator.MoveNext(out var uid, out var conf))
+ {
+ if (CompOrNull(conf.ActiveDeviceList)?.MapUid != ev.Map)
+ continue;
+
+ // The linked device list is (probably) being saved. Make sure that the configurator is also being saved
+ // (i.e., not in the hands of a mapper/ghost). In the future, map saving should raise a separate event
+ // containing a set of all entities that are about to be saved, which would make checking this much easier.
+ // This is a shitty bandaid, and will force close the UI during auto-saves.
+ // TODO Map serialization refactor
+
+ var xform = Transform(uid);
+ if (xform.MapUid == ev.Map && IsSaveable(uid))
+ continue;
+
+ _uiSystem.CloseUi(uid, NetworkConfiguratorUiKey.Configure);
+ DebugTools.AssertNull(conf.ActiveDeviceList);
+ }
+
+ bool IsSaveable(EntityUid uid)
+ {
+ while (uid.IsValid())
+ {
+ if (Prototype(uid)?.MapSavable == false)
+ return false;
+ uid = Transform(uid).ParentUid;
+ }
+ return true;
+ }
}
private void OnUiRangeCheck(Entity ent, ref BoundUserInterfaceCheckRangeEvent args)
@@ -485,6 +521,9 @@ private void OpenDeviceListUi(EntityUid configuratorUid, EntityUid? targetUid, E
if (!TryComp(targetUid, out DeviceListComponent? list))
return;
+ if (TryComp(configurator.ActiveDeviceList, out DeviceListComponent? oldList))
+ oldList.Configurators.Remove(configuratorUid);
+
list.Configurators.Add(configuratorUid);
configurator.ActiveDeviceList = targetUid;
Dirty(configuratorUid, configurator);
@@ -758,7 +797,7 @@ private void OnConfigButtonPressed(EntityUid uid, NetworkConfiguratorComponent c
{
if (query.TryGetComponent(device, out var comp))
{
- component.Devices[addr] = device;
+ component.Devices.Add(addr, device);
comp.Configurators.Add(uid);
}
}
diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs
index 42610a03237..efac049b354 100644
--- a/Content.Server/Dragon/DragonSystem.cs
+++ b/Content.Server/Dragon/DragonSystem.cs
@@ -28,6 +28,7 @@ public sealed partial class DragonSystem : EntitySystem
[Dependency] private readonly SharedActionsSystem _actions = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
+ [Dependency] private readonly SharedMapSystem _map = default!;
[Dependency] private readonly MobStateSystem _mobState = default!;
private EntityQuery _objQuery;
@@ -156,7 +157,7 @@ private void OnSpawnRift(EntityUid uid, DragonComponent component, DragonSpawnRi
}
// cant put a rift on solars
- foreach (var tile in grid.GetTilesIntersecting(new Circle(_transform.GetWorldPosition(xform), RiftTileRadius), false))
+ foreach (var tile in _map.GetTilesIntersecting(xform.GridUid.Value, grid, new Circle(_transform.GetWorldPosition(xform), RiftTileRadius), false))
{
if (!tile.IsSpace(_tileDef))
continue;
diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs
index 88404c4aa96..eb10f8d2809 100644
--- a/Content.Server/Electrocution/ElectrocutionSystem.cs
+++ b/Content.Server/Electrocution/ElectrocutionSystem.cs
@@ -121,7 +121,7 @@ private void UpdateState(float frameTime)
activated.TimeLeft -= frameTime;
if (activated.TimeLeft <= 0 || !IsPowered(uid, electrified, transform))
{
- _appearance.SetData(uid, ElectrifiedVisuals.IsPowered, false);
+ _appearance.SetData(uid, ElectrifiedVisuals.ShowSparks, false);
RemComp(uid);
}
}
@@ -217,7 +217,7 @@ public bool TryDoElectrifiedAct(EntityUid uid, EntityUid targetUid,
return false;
EnsureComp(uid);
- _appearance.SetData(uid, ElectrifiedVisuals.IsPowered, true);
+ _appearance.SetData(uid, ElectrifiedVisuals.ShowSparks, true);
siemens *= electrified.SiemensCoefficient;
if (!DoCommonElectrocutionAttempt(targetUid, uid, ref siemens) || siemens <= 0)
@@ -488,15 +488,4 @@ private void PlayElectrocutionSound(EntityUid targetUid, EntityUid sourceUid, El
}
_audio.PlayPvs(electrified.ShockNoises, targetUid, AudioParams.Default.WithVolume(electrified.ShockVolume));
}
-
- public void SetElectrifiedWireCut(Entity ent, bool value)
- {
- if (ent.Comp.IsWireCut == value)
- {
- return;
- }
-
- ent.Comp.IsWireCut = value;
- Dirty(ent);
- }
}
diff --git a/Content.Server/Fluids/EntitySystems/DrainSystem.cs b/Content.Server/Fluids/EntitySystems/DrainSystem.cs
index 69d15b8d008..215c58804e3 100644
--- a/Content.Server/Fluids/EntitySystems/DrainSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/DrainSystem.cs
@@ -134,13 +134,6 @@ public override void Update(float frameTime)
}
drain.Accumulator -= drain.DrainFrequency;
- // Disable ambient sound from emptying manually
- if (!drain.AutoDrain)
- {
- _ambientSoundSystem.SetAmbience(uid, false);
- continue;
- }
-
if (!managerQuery.TryGetComponent(uid, out var manager))
continue;
@@ -160,41 +153,44 @@ public override void Update(float frameTime)
// This will ensure that UnitsPerSecond is per second...
var amount = drain.UnitsPerSecond * drain.DrainFrequency;
- _puddles.Clear();
- _lookup.GetEntitiesInRange(Transform(uid).Coordinates, drain.Range, _puddles);
-
- if (_puddles.Count == 0)
+ if (drain.AutoDrain)
{
- _ambientSoundSystem.SetAmbience(uid, false);
- continue;
- }
+ _puddles.Clear();
+ _lookup.GetEntitiesInRange(Transform(uid).Coordinates, drain.Range, _puddles);
- _ambientSoundSystem.SetAmbience(uid, true);
-
- amount /= _puddles.Count;
-
- foreach (var puddle in _puddles)
- {
- // Queue the solution deletion if it's empty. EvaporationSystem might also do this
- // but queuedelete should be pretty safe.
- if (!_solutionContainerSystem.ResolveSolution(puddle.Owner, puddle.Comp.SolutionName, ref puddle.Comp.Solution, out var puddleSolution))
+ if (_puddles.Count == 0)
{
- EntityManager.QueueDeleteEntity(puddle);
+ _ambientSoundSystem.SetAmbience(uid, false);
continue;
}
- // Removes the lowest of:
- // the drain component's units per second adjusted for # of puddles
- // the puddle's remaining volume (making it cleanly zero)
- // the drain's remaining volume in its buffer.
- var transferSolution = _solutionContainerSystem.SplitSolution(puddle.Comp.Solution.Value,
- FixedPoint2.Min(FixedPoint2.New(amount), puddleSolution.Volume, drainSolution.AvailableVolume));
+ _ambientSoundSystem.SetAmbience(uid, true);
- drainSolution.AddSolution(transferSolution, _prototypeManager);
+ amount /= _puddles.Count;
- if (puddleSolution.Volume <= 0)
+ foreach (var puddle in _puddles)
{
- QueueDel(puddle);
+ // Queue the solution deletion if it's empty. EvaporationSystem might also do this
+ // but queuedelete should be pretty safe.
+ if (!_solutionContainerSystem.ResolveSolution(puddle.Owner, puddle.Comp.SolutionName, ref puddle.Comp.Solution, out var puddleSolution))
+ {
+ EntityManager.QueueDeleteEntity(puddle);
+ continue;
+ }
+
+ // Removes the lowest of:
+ // the drain component's units per second adjusted for # of puddles
+ // the puddle's remaining volume (making it cleanly zero)
+ // the drain's remaining volume in its buffer.
+ var transferSolution = _solutionContainerSystem.SplitSolution(puddle.Comp.Solution.Value,
+ FixedPoint2.Min(FixedPoint2.New(amount), puddleSolution.Volume, drainSolution.AvailableVolume));
+
+ drainSolution.AddSolution(transferSolution, _prototypeManager);
+
+ if (puddleSolution.Volume <= 0)
+ {
+ QueueDel(puddle);
+ }
}
}
diff --git a/Content.Server/GameTicking/GameTicker.Lobby.cs b/Content.Server/GameTicking/GameTicker.Lobby.cs
index 61d9fd99cae..9a9eb61b673 100644
--- a/Content.Server/GameTicking/GameTicker.Lobby.cs
+++ b/Content.Server/GameTicking/GameTicker.Lobby.cs
@@ -184,6 +184,6 @@ public bool UserHasJoinedGame(ICommonSession session)
=> UserHasJoinedGame(session.UserId);
public bool UserHasJoinedGame(NetUserId userId)
- => PlayerGameStatuses[userId] == PlayerGameStatus.JoinedGame;
+ => PlayerGameStatuses.TryGetValue(userId, out var status) && status == PlayerGameStatus.JoinedGame;
}
}
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index 8bec89747d9..bbcb4eeafe9 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -7,12 +7,12 @@
using Content.Server.Speech.Components;
using Content.Server.Station.Components;
using Content.Shared.Database;
+using Content.Shared.GameTicking;
using Content.Shared.Mind;
using Content.Shared.Players;
using Content.Shared.Preferences;
using Content.Shared.Roles;
using Content.Shared.Roles.Jobs;
-using JetBrains.Annotations;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
using Robust.Shared.Network;
@@ -463,71 +463,4 @@ public EntityCoordinates GetObserverSpawnPoint()
#endregion
}
-
- ///
- /// Event raised broadcast before a player is spawned by the GameTicker.
- /// You can use this event to spawn a player off-station on late-join but also at round start.
- /// When this event is handled, the GameTicker will not perform its own player-spawning logic.
- ///
- [PublicAPI]
- public sealed class PlayerBeforeSpawnEvent : HandledEntityEventArgs
- {
- public ICommonSession Player { get; }
- public HumanoidCharacterProfile Profile { get; }
- public string? JobId { get; }
- public bool LateJoin { get; }
- public EntityUid Station { get; }
-
- public PlayerBeforeSpawnEvent(ICommonSession player,
- HumanoidCharacterProfile profile,
- string? jobId,
- bool lateJoin,
- EntityUid station)
- {
- Player = player;
- Profile = profile;
- JobId = jobId;
- LateJoin = lateJoin;
- Station = station;
- }
- }
-
- ///
- /// Event raised both directed and broadcast when a player has been spawned by the GameTicker.
- /// You can use this to handle people late-joining, or to handle people being spawned at round start.
- /// Can be used to give random players a role, modify their equipment, etc.
- ///
- [PublicAPI]
- public sealed class PlayerSpawnCompleteEvent : EntityEventArgs
- {
- public EntityUid Mob { get; }
- public ICommonSession Player { get; }
- public string? JobId { get; }
- public bool LateJoin { get; }
- public bool Silent { get; }
- public EntityUid Station { get; }
- public HumanoidCharacterProfile Profile { get; }
-
- // Ex. If this is the 27th person to join, this will be 27.
- public int JoinOrder { get; }
-
- public PlayerSpawnCompleteEvent(EntityUid mob,
- ICommonSession player,
- string? jobId,
- bool lateJoin,
- bool silent,
- int joinOrder,
- EntityUid station,
- HumanoidCharacterProfile profile)
- {
- Mob = mob;
- Player = player;
- JobId = jobId;
- LateJoin = lateJoin;
- Silent = silent;
- Station = station;
- Profile = profile;
- JoinOrder = joinOrder;
- }
- }
}
diff --git a/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs b/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
index 557e44f0952..2e97a72f3b5 100644
--- a/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
@@ -6,6 +6,7 @@
using Content.Server.Points;
using Content.Server.RoundEnd;
using Content.Server.Station.Systems;
+using Content.Shared.GameTicking;
using Content.Shared.GameTicking.Components;
using Content.Shared.Points;
using Content.Shared.Storage;
diff --git a/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs b/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs
index d2686ecdcdd..f18115d3cf6 100644
--- a/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs
@@ -1,14 +1,14 @@
using Content.Server.GameTicking.Rules.Components;
using Content.Server.GridPreloader;
+using Content.Server.StationEvents.Events;
using Content.Shared.GameTicking.Components;
using Robust.Server.GameObjects;
using Robust.Server.Maps;
-using Robust.Shared.Map;
using Robust.Shared.Prototypes;
namespace Content.Server.GameTicking.Rules;
-public sealed class LoadMapRuleSystem : GameRuleSystem
+public sealed class LoadMapRuleSystem : StationEventSystem
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly MapSystem _map = default!;
@@ -75,5 +75,7 @@ protected override void Added(EntityUid uid, LoadMapRuleComponent comp, GameRule
var ev = new RuleLoadedGridsEvent(mapId, grids);
RaiseLocalEvent(uid, ref ev);
+
+ base.Added(uid, comp, rule, args);
}
}
diff --git a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
index 7dcd42e06fa..666d1045174 100644
--- a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
+++ b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
@@ -34,10 +34,11 @@ public sealed class GatewayGeneratorSystem : EntitySystem
[Dependency] private readonly GatewaySystem _gateway = default!;
[Dependency] private readonly MetaDataSystem _metadata = default!;
[Dependency] private readonly SharedMapSystem _maps = default!;
+ [Dependency] private readonly SharedSalvageSystem _salvage = default!;
[Dependency] private readonly TileSystem _tile = default!;
- [ValidatePrototypeId]
- private const string PlanetNames = "names_borer";
+ [ValidatePrototypeId]
+ private const string PlanetNames = "NamesBorer";
// TODO:
// Fix shader some more
@@ -102,7 +103,7 @@ private void GenerateDestination(EntityUid uid, GatewayGeneratorComponent? gener
var mapId = _mapManager.CreateMap();
var mapUid = _mapManager.GetMapEntityId(mapId);
- var gatewayName = SharedSalvageSystem.GetFTLName(_protoManager.Index(PlanetNames), seed);
+ var gatewayName = _salvage.GetFTLName(_protoManager.Index(PlanetNames), seed);
_metadata.SetEntityName(mapUid, gatewayName);
var origin = new Vector2i(random.Next(-MaxOffset, MaxOffset), random.Next(-MaxOffset, MaxOffset));
diff --git a/Content.Server/Ghost/GhostCommand.cs b/Content.Server/Ghost/GhostCommand.cs
index a2f361d29db..26163f6d4d9 100644
--- a/Content.Server/Ghost/GhostCommand.cs
+++ b/Content.Server/Ghost/GhostCommand.cs
@@ -1,7 +1,9 @@
using Content.Server.Popups;
using Content.Shared.Administration;
+using Content.Shared.GameTicking;
using Content.Shared.Mind;
using Robust.Shared.Console;
+using Content.Server.GameTicking;
namespace Content.Server.Ghost
{
@@ -23,6 +25,14 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
return;
}
+ var gameTicker = _entities.System();
+ if (!gameTicker.PlayerGameStatuses.TryGetValue(player.UserId, out var playerStatus) ||
+ playerStatus is not PlayerGameStatus.JoinedGame)
+ {
+ shell.WriteLine("ghost-command-error-lobby");
+ return;
+ }
+
if (player.AttachedEntity is { Valid: true } frozen &&
_entities.HasComponent(frozen))
{
diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs
index 2f4269a05d0..77cf813b56b 100644
--- a/Content.Server/Ghost/GhostSystem.cs
+++ b/Content.Server/Ghost/GhostSystem.cs
@@ -1,3 +1,5 @@
+using System.Linq;
+using System.Numerics;
using Content.Server.Administration.Logs;
using Content.Server.Chat.Managers;
using Content.Server.GameTicking;
@@ -32,14 +34,13 @@
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
-using System.Linq;
-using System.Numerics;
namespace Content.Server.Ghost
{
public sealed class GhostSystem : SharedGhostSystem
{
[Dependency] private readonly SharedActionsSystem _actions = default!;
+ [Dependency] private readonly IAdminLogManager _adminLog = default!;
[Dependency] private readonly SharedEyeSystem _eye = default!;
[Dependency] private readonly FollowerSystem _followerSystem = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
@@ -323,6 +324,8 @@ private void OnGhostnadoRequest(GhostnadoRequestEvent msg, EntitySessionEventArg
private void WarpTo(EntityUid uid, EntityUid target)
{
+ _adminLog.Add(LogType.GhostWarp, $"{ToPrettyString(uid)} ghost warped to {ToPrettyString(target)}");
+
if ((TryComp(target, out WarpPointComponent? warp) && warp.Follow) || HasComp(target))
{
_followerSystem.StartFollowingEntity(uid, target);
diff --git a/Content.Server/Ghost/Roles/MakeRaffledGhostRoleCommand.cs b/Content.Server/Ghost/Roles/MakeRaffledGhostRoleCommand.cs
index 5f5eabdad40..5827ab802f6 100644
--- a/Content.Server/Ghost/Roles/MakeRaffledGhostRoleCommand.cs
+++ b/Content.Server/Ghost/Roles/MakeRaffledGhostRoleCommand.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
using Content.Server.Administration;
using Content.Server.Ghost.Roles.Components;
using Content.Server.Ghost.Roles.Raffles;
@@ -77,13 +77,13 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
if (isProto)
{
- if (!_protoManager.TryIndex(args[4], out var proto))
+ if (!_protoManager.TryIndex(args[3], out var proto))
{
var validProtos = string.Join(", ",
_protoManager.EnumeratePrototypes().Select(p => p.ID)
);
- shell.WriteLine($"{args[4]} is not a valid raffle settings prototype. Valid options: {validProtos}");
+ shell.WriteLine($"{args[3]} is not a valid raffle settings prototype. Valid options: {validProtos}");
return;
}
diff --git a/Content.Server/Holiday/Christmas/RandomGiftSystem.cs b/Content.Server/Holiday/Christmas/RandomGiftSystem.cs
index 4603f45ed81..0816c2c36ce 100644
--- a/Content.Server/Holiday/Christmas/RandomGiftSystem.cs
+++ b/Content.Server/Holiday/Christmas/RandomGiftSystem.cs
@@ -60,7 +60,6 @@ private void OnUseInHand(EntityUid uid, RandomGiftComponent component, UseInHand
var coords = Transform(args.User).Coordinates;
var handsEnt = Spawn(component.SelectedEntity, coords);
_adminLogger.Add(LogType.EntitySpawn, LogImpact.Low, $"{ToPrettyString(args.User)} used {ToPrettyString(uid)} which spawned {ToPrettyString(handsEnt)}");
- EnsureComp(handsEnt); // For insane mode.
if (component.Wrapper is not null)
Spawn(component.Wrapper, coords);
diff --git a/Content.Server/Lathe/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs
index 18f246dcef4..58a8cd6351e 100644
--- a/Content.Server/Lathe/LatheSystem.cs
+++ b/Content.Server/Lathe/LatheSystem.cs
@@ -2,6 +2,7 @@
using System.Linq;
using Content.Server.Administration.Logs;
using Content.Server.Atmos.EntitySystems;
+using Content.Server.DeltaV.Cargo.Components; // DeltaV
using Content.Server.Fluids.EntitySystems;
using Content.Server.Lathe.Components;
using Content.Server.Materials;
@@ -229,6 +230,7 @@ public void FinishProducing(EntityUid uid, LatheComponent? comp = null, LathePro
if (comp.CurrentRecipe.Result is { } resultProto)
{
var result = Spawn(resultProto, Transform(uid).Coordinates);
+ EnsureComp(result).Modifier = comp.PriceModifier; // DeltaV
_stack.TryMergeToContacts(result);
}
diff --git a/Content.Server/Light/EntitySystems/HandheldLightSystem.cs b/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
index a5a41bcc105..a1977d5a463 100644
--- a/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
@@ -9,7 +9,6 @@
using Content.Shared.Light.Components;
using Content.Shared.Rounding;
using Content.Shared.Toggleable;
-using Content.Shared.Verbs;
using JetBrains.Annotations;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
@@ -46,7 +45,6 @@ public override void Initialize()
SubscribeLocalEvent(OnShutdown);
SubscribeLocalEvent(OnExamine);
- SubscribeLocalEvent>(AddToggleLightVerb);
SubscribeLocalEvent(OnActivate);
@@ -179,25 +177,7 @@ public override void Update(float frameTime)
}
}
- private void AddToggleLightVerb(Entity ent, ref GetVerbsEvent args)
- {
- if (!args.CanAccess || !args.CanInteract || !ent.Comp.ToggleOnInteract)
- return;
-
- var @event = args;
- ActivationVerb verb = new()
- {
- Text = Loc.GetString("verb-common-toggle-light"),
- Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/light.svg.192dpi.png")),
- Act = ent.Comp.Activated
- ? () => TurnOff(ent)
- : () => TurnOn(@event.User, ent)
- };
-
- args.Verbs.Add(verb);
- }
-
- public bool TurnOff(Entity