From 760596dd95690e7f9d7412e44500f1b6682586b1 Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Wed, 8 Jan 2025 03:02:44 +1000
Subject: [PATCH 01/16] Fix Humanoid Color (#1454)
# Description
Port from
[WWDP](https://github.com/WWhiteDreamProject/wwdpublic/pull/212)
---
Media
How it was before:
How is it now:
Markings { get; private set; } = new();
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 499da11babc..de009eb20cd 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -191,9 +191,19 @@ public HumanoidCharacterProfile()
/// Humanoid character profile with default settings.
public static HumanoidCharacterProfile DefaultWithSpecies(string species = SharedHumanoidAppearanceSystem.DefaultSpecies)
{
+ var prototypeManager = IoCManager.Resolve();
+ var skinColor = SkinColor.ValidHumanSkinTone;
+
+ if (prototypeManager.TryIndex(species, out var speciesPrototype))
+ skinColor = speciesPrototype.DefaultSkinTone;
+
return new()
{
Species = species,
+ Appearance = new()
+ {
+ SkinColor = skinColor,
+ },
};
}
diff --git a/Resources/Prototypes/DeltaV/Species/lamia.yml b/Resources/Prototypes/DeltaV/Species/lamia.yml
index 2e58a1681c2..0c2f48666a4 100644
--- a/Resources/Prototypes/DeltaV/Species/lamia.yml
+++ b/Resources/Prototypes/DeltaV/Species/lamia.yml
@@ -5,6 +5,7 @@
prototype: MobLamia
dollPrototype: MobLamiaDummy
sprites: MobLamiaSprites
+ defaultSkinTone: "#c0967f"
markingLimits: MobLamiaMarkingLimits
skinColoration: HumanToned
maleFirstNames: names_cyno_male
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
index 9cf6cff45e4..5247ed351b6 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
@@ -9,7 +9,6 @@
scale: 0.8, 0.8
- type: HumanoidAppearance
species: Felinid
- initial: Felinid
- type: Fixtures
fixtures: # TODO: This needs a second fixture just for mob collisions.
fix1:
diff --git a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
index 79d7e2b86f8..f4312009154 100644
--- a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
@@ -6,6 +6,7 @@
dollPrototype: MobOniDummy
markingLimits: MobOniMarkingLimits
sprites: MobHumanSprites
+ defaultSkinTone: "#ab5150"
skinColoration: Hues
maleFirstNames: names_oni_male
femaleFirstNames: names_oni_female
diff --git a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml
index ad92ea8046f..2bb8d02c471 100644
--- a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml
@@ -4,6 +4,7 @@
roundStart: true
prototype: MobFelinid
sprites: MobHumanSprites
+ defaultSkinTone: "#c0967f"
markingLimits: MobFelinidMarkingLimits
dollPrototype: MobFelinidDummy
skinColoration: HumanToned
diff --git a/Resources/Prototypes/Species/arachne.yml b/Resources/Prototypes/Species/arachne.yml
index fff75454fcb..1a80cb43590 100644
--- a/Resources/Prototypes/Species/arachne.yml
+++ b/Resources/Prototypes/Species/arachne.yml
@@ -4,6 +4,7 @@
roundStart: true # I'll kill these issues somehow.
prototype: MobArachne
sprites: MobArachneSprites
+ defaultSkinTone: "#c0967f"
markingLimits: MobArachneMarkingLimits
dollPrototype: MobArachneDummy
skinColoration: HumanToned
diff --git a/Resources/Prototypes/Species/dwarf.yml b/Resources/Prototypes/Species/dwarf.yml
index d32f1e6476a..f501884e99b 100644
--- a/Resources/Prototypes/Species/dwarf.yml
+++ b/Resources/Prototypes/Species/dwarf.yml
@@ -4,6 +4,7 @@
roundStart: false # DeltaV - Disable dwarf
prototype: MobDwarf
sprites: MobHumanSprites
+ defaultSkinTone: "#c0967f"
markingLimits: MobHumanMarkingLimits
dollPrototype: MobDwarfDummy
skinColoration: HumanToned
diff --git a/Resources/Prototypes/Species/harpy.yml b/Resources/Prototypes/Species/harpy.yml
index 1b61ebdd76f..da23fb2a01d 100644
--- a/Resources/Prototypes/Species/harpy.yml
+++ b/Resources/Prototypes/Species/harpy.yml
@@ -4,6 +4,7 @@
roundStart: true
prototype: MobHarpy
sprites: MobHarpySprites
+ defaultSkinTone: "#c0967f"
markingLimits: MobHarpyMarkingLimits
dollPrototype: MobHarpyDummy
skinColoration: HumanToned
diff --git a/Resources/Prototypes/Species/human.yml b/Resources/Prototypes/Species/human.yml
index cc304a6eeb1..9c5083de23b 100644
--- a/Resources/Prototypes/Species/human.yml
+++ b/Resources/Prototypes/Species/human.yml
@@ -4,6 +4,7 @@
roundStart: true
prototype: MobHuman
sprites: MobHumanSprites
+ defaultSkinTone: "#c0967f"
markingLimits: MobHumanMarkingLimits
dollPrototype: MobHumanDummy
skinColoration: HumanToned
diff --git a/Resources/Prototypes/Species/ipc.yml b/Resources/Prototypes/Species/ipc.yml
index 6c3a8266940..c4361d65f36 100644
--- a/Resources/Prototypes/Species/ipc.yml
+++ b/Resources/Prototypes/Species/ipc.yml
@@ -4,6 +4,7 @@
roundStart: true
prototype: MobIPC
sprites: MobIPCSprites
+ defaultSkinTone: "#aaa9ad"
markingLimits: MobIPCMarkingLimits
dollPrototype: MobIPCDummy
skinColoration: Hues
From f6dec101f47872557c7b96d9757e2e6b113c602b Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs
Date: Tue, 7 Jan 2025 17:03:11 +0000
Subject: [PATCH 02/16] Automatic Changelog Update (#1454)
---
Resources/Changelog/Changelog.yml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index da6e4e20581..b3b5615535c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -9367,3 +9367,12 @@ Entries:
id: 6644
time: '2025-01-07T04:08:32.0000000+00:00'
url: https://github.com/Simple-Station/Einstein-Engines/pull/1446
+- author: Spatison
+ changes:
+ - type: Fix
+ message: Humanoid color in the spawn panel is now correct.
+ - type: Fix
+ message: IPCs can no longer spawn invisible.
+ id: 6645
+ time: '2025-01-07T17:02:45.0000000+00:00'
+ url: https://github.com/Simple-Station/Einstein-Engines/pull/1454
From 990a57cc77fd535f39826b125b59054e75dfcfb9 Mon Sep 17 00:00:00 2001
From: RadsammyT <32146976+RadsammyT@users.noreply.github.com>
Date: Tue, 7 Jan 2025 12:15:10 -0500
Subject: [PATCH 03/16] Make Non-Verbal Langs Not Play Speech (#1448)
# Description
Makes non-verbal languages no longer emit speech sounds. Ported from
[Goob-Station-MRP#29](https://github.com/Goob-Station/Goob-Station-MRP/pull/29)
at @angelofallars's request.
---
Media
Co-authored-by: flyingkarii <123355664+flyingkarii@users.noreply.github.com>
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Co-authored-by: SimpleStation Changelogs
---
Content.Server/Speech/SpeechNoiseSystem.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Content.Server/Speech/SpeechNoiseSystem.cs b/Content.Server/Speech/SpeechNoiseSystem.cs
index 5530f3fe57a..071b1569071 100644
--- a/Content.Server/Speech/SpeechNoiseSystem.cs
+++ b/Content.Server/Speech/SpeechNoiseSystem.cs
@@ -60,7 +60,7 @@ public override void Initialize()
private void OnEntitySpoke(EntityUid uid, SpeechComponent component, EntitySpokeEvent args)
{
- if (component.SpeechSounds == null)
+ if (component.SpeechSounds == null || !args.Language.SpeechOverride.RequireSpeech)
return;
var currentTime = _gameTiming.CurTime;
From 53533639d70e024459b1b477750f17422bf30c07 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs
Date: Tue, 7 Jan 2025 17:15:37 +0000
Subject: [PATCH 04/16] Automatic Changelog Update (#1448)
---
Resources/Changelog/Changelog.yml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index b3b5615535c..f378be8ab8c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -9376,3 +9376,12 @@ Entries:
id: 6645
time: '2025-01-07T17:02:45.0000000+00:00'
url: https://github.com/Simple-Station/Einstein-Engines/pull/1454
+- author: RadsammyT
+ changes:
+ - type: Tweak
+ message: >-
+ Languages that don't require speech (I.E. Sign Language) will no longer
+ play speech sounds.
+ id: 6646
+ time: '2025-01-07T17:15:10.0000000+00:00'
+ url: https://github.com/Simple-Station/Einstein-Engines/pull/1448
From a05bbce7491677a27656fd67ee72fb8dbdb4c53c Mon Sep 17 00:00:00 2001
From: John Willis <143434770+CerberusWolfie@users.noreply.github.com>
Date: Tue, 7 Jan 2025 12:23:36 -0500
Subject: [PATCH 05/16] [Port] Add Time Transfer Panel From Goobstation (#1429)
# Description
This adds the Time Transfer Panel that Goobstation uses. This panel
enables Admins to do Time Transfers without commands and makes their
lives easier. This immediately has access to all playtime trackers and
allows an Admin to Add Time and/or Set Time (overwriting the previous
time) for any job role. It also enables extra strings since I ported
from Wizden upstream as well, which can be seen in the commit history.
A thing of note when testing this and using it in a server: the times
**DO NOT UPDATE** for Client until your **RELOG**. This is how it works
on Goobstation as well. The time adding process is faster and will be
easier tool.
This is tied to the AdminFlags.Admin so it can be customized on a
per-server basis if a custom flag is added.
---
# TODO
- [x] Port Upstream Role Define.
- [x] Port string extras for playtime commands.
- [x] Port Time Transfer Panel
- [x] Remove Overall (it just doesn't work on Goob either).
---
Media
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/_Goobstation/Administration/UI/TimeTransferPanel/TimeTransferEntry.xaml.cs b/Content.Client/_Goobstation/Administration/UI/TimeTransferPanel/TimeTransferEntry.xaml.cs
new file mode 100644
index 00000000000..0c3d1da604a
--- /dev/null
+++ b/Content.Client/_Goobstation/Administration/UI/TimeTransferPanel/TimeTransferEntry.xaml.cs
@@ -0,0 +1,46 @@
+using Content.Shared.Roles;
+using Content.Shared.StatusIcon;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._Goobstation.Administration.UI.TimeTransferPanel;
+
+[GenerateTypedNameReferences]
+public sealed partial class TimeTransferEntry : BoxContainer
+{
+ public string PlaytimeTracker;
+ public string JobName;
+
+ public TimeTransferEntry(JobPrototype jobProto, SpriteSystem spriteSystem, IPrototypeManager prototypeManager)
+ {
+ RobustXamlLoader.Load(this);
+ IoCManager.InjectDependencies(this);
+
+ PlaytimeTracker = jobProto.PlayTimeTracker;
+ JobLabel.Text = jobProto.LocalizedName;
+ JobName = jobProto.LocalizedName;
+
+ if (prototypeManager.TryIndex(jobProto.Icon, out var jobIcon))
+ JobIcon.Texture = spriteSystem.Frame0(jobIcon.Icon);
+ }
+
+ public void UpdateGroupVisibility(bool inGrouped)
+ {
+ TimeLabel.Visible = !inGrouped;
+ TimeEdit.Visible = !inGrouped;
+ GroupCheckbox.Visible = inGrouped;
+ }
+
+ public string GetJobTimeString()
+ {
+ return TimeEdit.Text != null ? TimeEdit.Text : "";
+ }
+
+ public bool InGroup()
+ {
+ return GroupCheckbox.Pressed;
+ }
+}
diff --git a/Content.Client/_Goobstation/Administration/UI/TimeTransferPanel/TimeTransferPanel.xaml b/Content.Client/_Goobstation/Administration/UI/TimeTransferPanel/TimeTransferPanel.xaml
new file mode 100644
index 00000000000..2c3d99e2f88
--- /dev/null
+++ b/Content.Client/_Goobstation/Administration/UI/TimeTransferPanel/TimeTransferPanel.xaml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/_Goobstation/Administration/UI/TimeTransferPanel/TimeTransferPanel.xaml.cs b/Content.Client/_Goobstation/Administration/UI/TimeTransferPanel/TimeTransferPanel.xaml.cs
new file mode 100644
index 00000000000..b967ba399ff
--- /dev/null
+++ b/Content.Client/_Goobstation/Administration/UI/TimeTransferPanel/TimeTransferPanel.xaml.cs
@@ -0,0 +1,210 @@
+using Content.Shared._Goobstation.Administration;
+using Content.Shared.Roles;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+using System.Linq;
+
+namespace Content.Client._Goobstation.Administration.UI.TimeTransferPanel;
+
+[GenerateTypedNameReferences]
+public sealed partial class TimeTransferPanel : DefaultWindow
+{
+ [Dependency] private readonly IGameTiming _gameTiming = default!;
+ [Dependency] private readonly IEntityManager _entityManager = default!;
+ [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+ private readonly SpriteSystem _spriteSystem;
+
+ public Action<(string playerId, List transferList, bool overwrite)>? OnTransferMessageSend;
+ private TimeSpan? SetButtonResetOn { get; set; }
+
+ public TimeTransferPanel()
+ {
+ RobustXamlLoader.Load(this);
+ IoCManager.InjectDependencies(this);
+ _spriteSystem = _entityManager.System();
+
+ AddTimeButton.OnButtonUp += OnAddTimeButtonPressed;
+ SetTimeButton.OnButtonUp += OnSetTimeButtonPressed;
+ GroupCheckbox.OnPressed += OnGroupCheckboxPressed;
+
+ JobSearch.OnTextChanged += OnJobSearchTextChanged;
+
+ PopulateJobs();
+ UpdateGroup();
+ UpdateWarning(" ", Color.LightGreen);
+ }
+
+ public void PopulateJobs()
+ {
+ var jobs = _prototypeManager.EnumeratePrototypes()
+ .OrderBy(job => job.LocalizedName)
+ .ToList();
+
+ foreach(var job in jobs)
+ {
+ var jobEntry = new TimeTransferEntry(job, _spriteSystem, _prototypeManager);
+ JobContainer.AddChild(jobEntry);
+ }
+ }
+
+ public void UpdateFlag(bool hasFlag)
+ {
+ AddTimeButton.Visible = hasFlag;
+ SetTimeButton.Visible = hasFlag;
+
+ if (!hasFlag)
+ UpdateWarning(Loc.GetString("time-transfer-panel-warning-no-perms"), Color.DarkRed);
+ else
+ UpdateWarning(" ", Color.LightGreen);
+ }
+
+ public void TimeTransfer(bool overwrite = false)
+ {
+ var player = PlayerLine.Text;
+
+ if (string.IsNullOrEmpty(player))
+ {
+ UpdateWarning(Loc.GetString("time-transfer-panel-warning-no-player"), Color.DarkRed);
+ return;
+ }
+
+ var dataList = new List();
+
+ if (GroupCheckbox.Pressed)
+ {
+ if (string.IsNullOrEmpty(GroupTimeLine.Text))
+ {
+ UpdateWarning(Loc.GetString("time-transfer-panel-warning-group-no-time"), Color.DarkRed);
+ return;
+ }
+
+ var entryList = GetGroupEntries();
+ foreach (var entry in entryList)
+ {
+ var data = new TimeTransferData(entry.PlaytimeTracker, GroupTimeLine.Text);
+ dataList.Add(data);
+ }
+ }
+ else
+ {
+ foreach (var entry in JobContainer.Children)
+ {
+ if (entry is not TimeTransferEntry jobEntry)
+ continue;
+
+ var tracker = jobEntry.PlaytimeTracker;
+ var timeString = jobEntry.GetJobTimeString();
+
+ if (string.IsNullOrEmpty(timeString))
+ continue;
+
+ var data = new TimeTransferData(tracker, timeString);
+ dataList.Add(data);
+ }
+ }
+
+ OnTransferMessageSend?.Invoke((player, dataList, overwrite));
+ UpdateWarning(Loc.GetString("time-transfer-panel-warning-transfer-process"), Color.Gold);
+ }
+
+ public List GetGroupEntries()
+ {
+ var list = new List();
+
+ foreach (var entry in JobContainer.Children)
+ {
+ if (entry is not TimeTransferEntry jobEntry)
+ continue;
+
+ if (jobEntry.InGroup())
+ list.Add(jobEntry);
+ }
+
+ return list;
+ }
+
+ public void UpdateGroup()
+ {
+ GroupTimeLine.Visible = GroupCheckbox.Pressed;
+
+ foreach (var entry in JobContainer.Children)
+ {
+ if (entry is not TimeTransferEntry jobEntry)
+ continue;
+
+ jobEntry.UpdateGroupVisibility(GroupCheckbox.Pressed);
+ }
+ }
+
+ public void OnJobSearchTextChanged(LineEdit.LineEditEventArgs args)
+ {
+ UpdateSearch();
+ }
+
+ public void UpdateSearch()
+ {
+ foreach (var entry in JobContainer.Children)
+ {
+ if (entry is not TimeTransferEntry jobEntry)
+ continue;
+
+ jobEntry.Visible = ShouldShowJob(jobEntry);
+ }
+ }
+
+ public void UpdateWarning(string text, Color color)
+ {
+ WarningLabel.FontColorOverride = color;
+ WarningLabel.Text = text;
+ }
+
+ public bool ShouldShowJob(TimeTransferEntry jobEntry)
+ {
+ return jobEntry.JobName != null && JobSearch.Text != null && jobEntry.JobName.Contains(JobSearch.Text, StringComparison.OrdinalIgnoreCase);
+ }
+
+ public void OnGroupCheckboxPressed(BaseButton.ButtonEventArgs obj)
+ {
+ UpdateGroup();
+ }
+
+ public void OnAddTimeButtonPressed(BaseButton.ButtonEventArgs obj)
+ {
+ TimeTransfer(false);
+ }
+
+ public void OnSetTimeButtonPressed(BaseButton.ButtonEventArgs obj)
+ {
+ if (SetButtonResetOn is null)
+ {
+ SetButtonResetOn = _gameTiming.CurTime.Add(TimeSpan.FromSeconds(3));
+ SetTimeButton.ModulateSelfOverride = Color.DarkRed;
+ SetTimeButton.Text = Loc.GetString("time-transfer-panel-set-time-confirm");
+ return;
+ }
+
+ TimeTransfer(true);
+ ResetSetButton();
+ }
+
+ protected override void FrameUpdate(FrameEventArgs args)
+ {
+ base.FrameUpdate(args);
+
+ if (SetButtonResetOn != null && _gameTiming.CurTime > SetButtonResetOn)
+ ResetSetButton();
+ }
+
+ private void ResetSetButton()
+ {
+ SetButtonResetOn = null;
+ SetTimeButton.ModulateSelfOverride = null;
+ SetTimeButton.Text = Loc.GetString("time-transfer-panel-set-time");
+ }
+}
diff --git a/Content.Client/_Goobstation/Administration/UI/TimeTransferPanel/TimeTransferPanelEui.cs b/Content.Client/_Goobstation/Administration/UI/TimeTransferPanel/TimeTransferPanelEui.cs
new file mode 100644
index 00000000000..9ba8c100cb6
--- /dev/null
+++ b/Content.Client/_Goobstation/Administration/UI/TimeTransferPanel/TimeTransferPanelEui.cs
@@ -0,0 +1,44 @@
+using Content.Client.Eui;
+using Content.Shared._Goobstation.Administration;
+using Content.Shared.Eui;
+
+namespace Content.Client._Goobstation.Administration.UI.TimeTransferPanel;
+
+public sealed class TimeTransferPanelEui : BaseEui
+{
+ public TimeTransferPanel TimeTransferPanel { get; }
+
+ public TimeTransferPanelEui()
+ {
+ TimeTransferPanel = new TimeTransferPanel();
+ TimeTransferPanel.OnTransferMessageSend += args => SendMessage(new TimeTransferEuiMessage(args.playerId, args.transferList, args.overwrite));
+ }
+
+ public override void Opened()
+ {
+ TimeTransferPanel.OpenCentered();
+ }
+
+ public override void Closed()
+ {
+ TimeTransferPanel.Close();
+ }
+
+ public override void HandleState(EuiStateBase state)
+ {
+ if (state is not TimeTransferPanelEuiState cast)
+ return;
+
+ TimeTransferPanel.UpdateFlag(cast.HasFlag);
+ }
+
+ public override void HandleMessage(EuiMessageBase msg)
+ {
+ base.HandleMessage(msg);
+
+ if (msg is not TimeTransferWarningEuiMessage warning)
+ return;
+
+ TimeTransferPanel.UpdateWarning(warning.Message, warning.WarningColor);
+ }
+}
diff --git a/Content.Server/Administration/Commands/PlayTimeCommands.cs b/Content.Server/Administration/Commands/PlayTimeCommands.cs
index 97d3f12e38d..9ad1f283eb0 100644
--- a/Content.Server/Administration/Commands/PlayTimeCommands.cs
+++ b/Content.Server/Administration/Commands/PlayTimeCommands.cs
@@ -1,11 +1,95 @@
-using Content.Server.Players.PlayTimeTracking;
+using Content.Server.Players.PlayTimeTracking;
using Content.Shared.Administration;
using Content.Shared.Players.PlayTimeTracking;
using Robust.Server.Player;
using Robust.Shared.Console;
+using System.Text.RegularExpressions;
namespace Content.Server.Administration.Commands;
+public sealed class PlayTimeCommandUtilities
+{
+ private readonly static Dictionary Units = new() {
+ { "y", 525960 },
+ { "mo", 43800 },
+ { "w", 10080 },
+ { "d", 1440 },
+ { "h", 60 },
+ { "m", 1 },
+ };
+
+ public struct TimeUnit
+ {
+ public int TimeValue { get; }
+ public string Unit { get; }
+
+ public TimeUnit(int timeValue)
+ {
+ TimeValue = timeValue;
+ Unit = "m";
+ }
+
+ public TimeUnit(int timeValue, string unit)
+ {
+ TimeValue = timeValue;
+ Unit = unit;
+ }
+ public int ToMinutes()
+ {
+ var unitExists = Units.TryGetValue(Unit, out int minutes);
+
+ if (!unitExists)
+ return TimeValue;
+
+ return TimeValue * minutes;
+ }
+ }
+
+ public static List ConvertToTimeUnits(string timeString)
+ {
+ // Searching for something similar to 365d24h, etc.
+ List result = new();
+
+ // We want to support plain numbers as a translation to just minutes, just in case people don't know things like 30d or 1d are an option.
+ if (int.TryParse(timeString, out int timeValue))
+ {
+ result.Add(new TimeUnit(timeValue, "m"));
+ return result;
+ }
+
+ MatchCollection timeRegex = Regex.Matches(timeString, "(\\d+)([A-Za-z]+)");
+
+ foreach (Match match in timeRegex)
+ {
+ bool isTimeAmountNumber = int.TryParse(match.Groups[1].Value, out int amountOfTime);
+ string timeUnit = match.Groups[2].Value;
+
+ if (!isTimeAmountNumber)
+ continue;
+
+ if (!Units.ContainsKey(timeUnit))
+ continue;
+
+ result.Add(new TimeUnit(amountOfTime, timeUnit));
+ }
+
+ return result;
+ }
+
+ public static int CountMinutes(string timeString)
+ {
+ List timeUnits = ConvertToTimeUnits(timeString);
+ int total = 0;
+
+ foreach (var timeUnit in timeUnits)
+ {
+ total += timeUnit.ToMinutes();
+ }
+
+ return total;
+ }
+}
+
[AdminCommand(AdminFlags.Admin)]
public sealed class PlayTimeAddOverallCommand : IConsoleCommand
{
@@ -24,11 +108,7 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
return;
}
- if (!int.TryParse(args[1], out var minutes))
- {
- shell.WriteError(Loc.GetString("parse-minutes-fail", ("minutes", args[1])));
- return;
- }
+ var minutes = PlayTimeCommandUtilities.CountMinutes(args[1]);
if (!_playerManager.TryGetSessionByUsername(args[0], out var player))
{
@@ -85,15 +165,10 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
var role = args[1];
- var m = args[2];
- if (!int.TryParse(m, out var minutes))
- {
- shell.WriteError(Loc.GetString("parse-minutes-fail", ("minutes", minutes)));
- return;
- }
+ var m = PlayTimeCommandUtilities.CountMinutes(args[2]);
- _playTimeTracking.AddTimeToTracker(player, role, TimeSpan.FromMinutes(minutes));
- var time = _playTimeTracking.GetOverallPlaytime(player);
+ _playTimeTracking.AddTimeToTracker(player, role, TimeSpan.FromMinutes(m));
+ var time = _playTimeTracking.GetPlayTimeForTracker(player, role);
shell.WriteLine(Loc.GetString("cmd-playtime_addrole-succeed",
("username", userName),
("role", role),
diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
index 295d11f8986..957fa77cdd6 100644
--- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
+++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
@@ -380,6 +380,19 @@ public bool TryGetTrackerTimes(ICommonSession id, [NotNullWhen(true)] out Dictio
return true;
}
+ public bool TryGetTrackerTime(ICommonSession id, string tracker, [NotNullWhen(true)] out TimeSpan? time)
+ {
+ time = null;
+ if (!TryGetTrackerTimes(id, out var times))
+ return false;
+
+ if (!times.TryGetValue(tracker, out var t))
+ return false;
+
+ time = t;
+ return true;
+ }
+
public Dictionary GetTrackerTimes(ICommonSession id)
{
if (!_playTimeData.TryGetValue(id, out var data) || !data.Initialized)
diff --git a/Content.Server/_Goobstation/Administration/Commands/TimeTransferPanelCommand.cs b/Content.Server/_Goobstation/Administration/Commands/TimeTransferPanelCommand.cs
new file mode 100644
index 00000000000..422e7c711c8
--- /dev/null
+++ b/Content.Server/_Goobstation/Administration/Commands/TimeTransferPanelCommand.cs
@@ -0,0 +1,25 @@
+using Content.Server.Administration;
+using Content.Server.EUI;
+using Content.Shared.Administration;
+using Robust.Shared.Console;
+
+namespace Content.Server._Goobstation.Administration.Commands;
+
+[AdminCommand(AdminFlags.Admin)]
+public sealed class TimeTransferPanelCommand : LocalizedCommands
+{
+ [Dependency] private readonly EuiManager _euis = default!;
+
+ public override string Command => "timetransferpanel";
+
+ public override async void Execute(IConsoleShell shell, string argStr, string[] args)
+ {
+ if (shell.Player is not { } player)
+ {
+ shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server"));
+ return;
+ }
+
+ _euis.OpenEui(new TimeTransferPanelEui(), player);
+ }
+}
diff --git a/Content.Server/_Goobstation/Administration/TimeTransferPanelEui.cs b/Content.Server/_Goobstation/Administration/TimeTransferPanelEui.cs
new file mode 100644
index 00000000000..3c11a31bd06
--- /dev/null
+++ b/Content.Server/_Goobstation/Administration/TimeTransferPanelEui.cs
@@ -0,0 +1,141 @@
+using Content.Server.Administration;
+using Content.Server.Administration.Commands;
+using Content.Server.Administration.Managers;
+using Content.Server.Database;
+using Content.Server.EUI;
+using Content.Server.Players.PlayTimeTracking;
+using Content.Shared._Goobstation.Administration;
+using Content.Shared.Administration;
+using Content.Shared.Eui;
+using Robust.Server.Player;
+using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server._Goobstation.Administration;
+
+public sealed class TimeTransferPanelEui : BaseEui
+{
+ [Dependency] private readonly IAdminManager _adminMan = default!;
+ [Dependency] private readonly ILogManager _log = default!;
+ [Dependency] private readonly IPlayerLocator _playerLocator = default!;
+ [Dependency] private readonly IPlayerManager _playerMan = default!;
+ [Dependency] private readonly IPrototypeManager _protoMan = default!;
+ [Dependency] private readonly IServerDbManager _databaseMan = default!;
+ [Dependency] private readonly PlayTimeTrackingManager _playTimeMan = default!;
+
+ private readonly ISawmill _sawmill;
+
+ public TimeTransferPanelEui()
+ {
+ IoCManager.InjectDependencies(this);
+
+ _sawmill = _log.GetSawmill("admin.time_eui");
+ }
+
+ public override TimeTransferPanelEuiState GetNewState()
+ {
+ var hasFlag = _adminMan.HasAdminFlag(Player, AdminFlags.Admin);
+
+ return new TimeTransferPanelEuiState(hasFlag);
+ }
+
+ public override void HandleMessage(EuiMessageBase msg)
+ {
+ base.HandleMessage(msg);
+
+ if (msg is not TimeTransferEuiMessage message)
+ return;
+
+ TransferTime(message.PlayerId, message.TimeData, message.Overwrite);
+ }
+
+ public async void TransferTime(string playerId, List timeData, bool overwrite)
+ {
+ if (!_adminMan.HasAdminFlag(Player, AdminFlags.Admin))
+ {
+ _sawmill.Warning($"{Player.Name} ({Player.UserId} tried to add roles time without moderator flag)");
+ return;
+ }
+
+ var playerData = await _playerLocator.LookupIdByNameAsync(playerId);
+ if (playerData == null)
+ {
+ _sawmill.Warning($"{Player.Name} ({Player.UserId} tried to add roles time to not existing player {playerId})");
+ SendMessage(new TimeTransferWarningEuiMessage(Loc.GetString("time-transfer-panel-no-player-database-message"), Color.Red));
+ return;
+ }
+
+ if (overwrite)
+ SetTime(playerData.UserId, timeData);
+ else
+ AddTime(playerData.UserId, timeData);
+ }
+
+ public async void SetTime(NetUserId userId, List timeData)
+ {
+ var updateList = new List();
+
+ foreach (var data in timeData)
+ {
+ var time = TimeSpan.FromMinutes(PlayTimeCommandUtilities.CountMinutes(data.TimeString));
+ updateList.Add(new PlayTimeUpdate(userId, data.PlaytimeTracker, time));
+ }
+
+ await _databaseMan.UpdatePlayTimes(updateList);
+
+ _sawmill.Info($"{Player.Name} ({Player.UserId} saved {updateList.Count} trackers for {userId})");
+
+ SendMessage(new TimeTransferWarningEuiMessage(Loc.GetString("time-transfer-panel-warning-set-success"), Color.LightGreen));
+ }
+
+ public async void AddTime(NetUserId userId, List timeData)
+ {
+ var playTimeList = await _databaseMan.GetPlayTimes(userId);
+
+ Dictionary playTimeDict = new();
+
+ foreach (var playTime in playTimeList)
+ {
+ playTimeDict.Add(playTime.Tracker, playTime.TimeSpent);
+ }
+
+ var updateList = new List();
+
+ foreach (var data in timeData)
+ {
+ var time = TimeSpan.FromMinutes(PlayTimeCommandUtilities.CountMinutes(data.TimeString));
+ if (playTimeDict.TryGetValue(data.PlaytimeTracker, out var addTime))
+ time += addTime;
+
+ updateList.Add(new PlayTimeUpdate(userId, data.PlaytimeTracker, time));
+ }
+
+ await _databaseMan.UpdatePlayTimes(updateList);
+
+ _sawmill.Info($"{Player.Name} ({Player.UserId} saved {updateList.Count} trackers for {userId})");
+
+ SendMessage(new TimeTransferWarningEuiMessage(Loc.GetString("time-transfer-panel-warning-add-success"), Color.LightGreen));
+ }
+
+ public override async void Opened()
+ {
+ base.Opened();
+ _adminMan.OnPermsChanged += OnPermsChanged;
+ }
+
+ public override void Closed()
+ {
+ base.Closed();
+ _adminMan.OnPermsChanged -= OnPermsChanged;
+ }
+
+ private void OnPermsChanged(AdminPermsChangedEventArgs args)
+ {
+ if (args.Player != Player)
+ {
+ return;
+ }
+
+ StateDirty();
+ }
+}
diff --git a/Content.Shared/_Goobstation/Administration/TimeTransferPanelEui.cs b/Content.Shared/_Goobstation/Administration/TimeTransferPanelEui.cs
new file mode 100644
index 00000000000..057c31a4950
--- /dev/null
+++ b/Content.Shared/_Goobstation/Administration/TimeTransferPanelEui.cs
@@ -0,0 +1,61 @@
+using Content.Shared.Eui;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._Goobstation.Administration;
+
+[Serializable, NetSerializable]
+public sealed class TimeTransferPanelEuiState : EuiStateBase
+{
+ public bool HasFlag { get; }
+
+ public TimeTransferPanelEuiState(bool hasFlag)
+ {
+ HasFlag = hasFlag;
+ }
+}
+
+[Serializable, NetSerializable]
+public sealed class TimeTransferEuiMessage : EuiMessageBase
+{
+ public string PlayerId { get; }
+ public List TimeData { get; }
+
+ public bool Overwrite { get; }
+
+ public TimeTransferEuiMessage(string playerId, List timeData, bool overwrite)
+ {
+ PlayerId = playerId;
+ TimeData = timeData;
+ Overwrite = overwrite;
+ }
+}
+
+[Serializable, NetSerializable]
+public sealed class TimeTransferWarningEuiMessage : EuiMessageBase
+{
+ public string Message { get; }
+ public Color WarningColor { get; }
+
+ public TimeTransferWarningEuiMessage(string message, Color color)
+ {
+ Message = message;
+ WarningColor = color;
+ }
+}
+
+[DataDefinition]
+[Serializable, NetSerializable]
+public partial record struct TimeTransferData
+{
+ [DataField]
+ public string TimeString { get; init; }
+
+ [DataField]
+ public string PlaytimeTracker { get; init; }
+
+ public TimeTransferData(string tracker, string timeString)
+ {
+ PlaytimeTracker = tracker;
+ TimeString = timeString;
+ }
+}
diff --git a/Resources/Locale/en-US/_Goobstation/administration/time_transfer.ftl b/Resources/Locale/en-US/_Goobstation/administration/time_transfer.ftl
new file mode 100644
index 00000000000..eebe76e95a4
--- /dev/null
+++ b/Resources/Locale/en-US/_Goobstation/administration/time_transfer.ftl
@@ -0,0 +1,23 @@
+time-transfer-panel-title = Time Transfer
+time-transfer-panel-player-label = Player
+time-transfer-panel-time = Time
+time-transfer-panel-add-time = Add time
+time-transfer-panel-set-time = Set time
+time-transfer-panel-set-time-confirm = Confirm
+time-transfer-panel-warning-no-player = Player not selected
+time-transfer-panel-warning-no-job = Role not selected
+time-transfer-panel-warning-group-no-time = Group time is empty
+time-transfer-panel-warning-add-success = Time successfully added
+time-transfer-panel-warning-set-success = Time successfully overwritten
+time-transfer-panel-warning-transfer-process = Time transfer in progress...
+time-transfer-panel-checkbox-group = Group
+time-transfer-overall-checkbox = Overall
+time-transfer-panel-search-placeholder = Search jobs
+
+
+cmd-timetransferpanel-desc = Opens time transfer menu
+admin-player-actions-window-time-transfer = Time Transfer
+time-transfer-panel-no-player-database-message = Player not found in database
+
+# Please change it if you really-really need to do it
+time-transfer-panel-author = Made by BombasterDS for Goobstation
From bac302cb2843954f8fd6741b56ce0ddb32032510 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs
Date: Tue, 7 Jan 2025 17:24:05 +0000
Subject: [PATCH 06/16] Automatic Changelog Update (#1429)
---
Resources/Changelog/Changelog.yml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index f378be8ab8c..3f882d185b4 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -9385,3 +9385,10 @@ Entries:
id: 6646
time: '2025-01-07T17:15:10.0000000+00:00'
url: https://github.com/Simple-Station/Einstein-Engines/pull/1448
+- author: CerberusWolfie
+ changes:
+ - type: Add
+ message: Add Time Transfer Panel
+ id: 6647
+ time: '2025-01-07T17:23:36.0000000+00:00'
+ url: https://github.com/Simple-Station/Einstein-Engines/pull/1429
From f026528f6e31b816758e600d66482bf991a0e88d Mon Sep 17 00:00:00 2001
From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Date: Tue, 7 Jan 2025 17:32:35 -0400
Subject: [PATCH 07/16] Fix Toolshed Crash (#1415)
I'm not fully confident in this fix, I can't test it right now.
closes #1409 1409
---------
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
---
.../Language/Commands/AdminLanguageCommand.cs | 7 ++---
.../Commands/AdminTranslatorCommand.cs | 12 +++-----
.../Station/Commands/JobsCommand.cs | 28 ++++++++-----------
.../BasicStationEventSchedulerSystem.cs | 2 +-
4 files changed, 18 insertions(+), 31 deletions(-)
diff --git a/Content.Server/Language/Commands/AdminLanguageCommand.cs b/Content.Server/Language/Commands/AdminLanguageCommand.cs
index 2e7a0b193a1..12899747f70 100644
--- a/Content.Server/Language/Commands/AdminLanguageCommand.cs
+++ b/Content.Server/Language/Commands/AdminLanguageCommand.cs
@@ -20,13 +20,11 @@ public sealed class AdminLanguageCommand : ToolshedCommand
public EntityUid AddLanguage(
[CommandInvocationContext] IInvocationContext ctx,
[PipedArgument] EntityUid input,
- [CommandArgument] ValueRef> @ref,
+ [CommandArgument] ProtoId language,
[CommandArgument] bool canSpeak = true,
[CommandArgument] bool canUnderstand = true
)
{
- var language = @ref.Evaluate(ctx)!;
-
if (language == SharedLanguageSystem.UniversalPrototype)
{
EnsureComp(input);
@@ -45,12 +43,11 @@ public EntityUid AddLanguage(
public EntityUid RemoveLanguage(
[CommandInvocationContext] IInvocationContext ctx,
[PipedArgument] EntityUid input,
- [CommandArgument] ValueRef> @ref,
+ [CommandArgument] ProtoId language,
[CommandArgument] bool removeSpeak = true,
[CommandArgument] bool removeUnderstand = true
)
{
- var language = @ref.Evaluate(ctx)!;
if (language == SharedLanguageSystem.UniversalPrototype && HasComp(input))
{
RemComp(input);
diff --git a/Content.Server/Language/Commands/AdminTranslatorCommand.cs b/Content.Server/Language/Commands/AdminTranslatorCommand.cs
index fc8ee02e386..d7cdef0a0c2 100644
--- a/Content.Server/Language/Commands/AdminTranslatorCommand.cs
+++ b/Content.Server/Language/Commands/AdminTranslatorCommand.cs
@@ -26,12 +26,11 @@ public sealed class AdminTranslatorCommand : ToolshedCommand
public EntityUid AddLanguage(
[CommandInvocationContext] IInvocationContext ctx,
[PipedArgument] EntityUid input,
- [CommandArgument] ValueRef> @ref,
+ [CommandArgument] ProtoId language,
[CommandArgument] bool addSpeak = true,
[CommandArgument] bool addUnderstand = true
)
{
- var language = @ref.Evaluate(ctx)!;
// noob trap - needs a universallanguagespeakercomponent
if (language == SharedLanguageSystem.UniversalPrototype)
throw new ArgumentException(Loc.GetString("command-language-error-this-will-not-work"));
@@ -53,12 +52,11 @@ public EntityUid AddLanguage(
public EntityUid RemoveLanguage(
[CommandInvocationContext] IInvocationContext ctx,
[PipedArgument] EntityUid input,
- [CommandArgument] ValueRef> @ref,
+ [CommandArgument] ProtoId language,
[CommandArgument] bool removeSpeak = true,
[CommandArgument] bool removeUnderstand = true
)
{
- var language = @ref.Evaluate(ctx)!;
if (!TryGetTranslatorComp(input, out var translator))
throw new ArgumentException(Loc.GetString("command-language-error-not-a-translator", ("entity", input)));
@@ -76,9 +74,8 @@ public EntityUid RemoveLanguage(
public EntityUid AddRequiredLanguage(
[CommandInvocationContext] IInvocationContext ctx,
[PipedArgument] EntityUid input,
- [CommandArgument] ValueRef> @ref)
+ [CommandArgument] ProtoId language)
{
- var language = @ref.Evaluate(ctx)!;
if (!TryGetTranslatorComp(input, out var translator))
throw new ArgumentException(Loc.GetString("command-language-error-not-a-translator", ("entity", input)));
@@ -95,9 +92,8 @@ public EntityUid AddRequiredLanguage(
public EntityUid RemoveRequiredLanguage(
[CommandInvocationContext] IInvocationContext ctx,
[PipedArgument] EntityUid input,
- [CommandArgument] ValueRef> @ref)
+ [CommandArgument] ProtoId language)
{
- var language = @ref.Evaluate(ctx)!;
if (!TryGetTranslatorComp(input, out var translator))
throw new ArgumentException(Loc.GetString("command-language-error-not-a-translator", ("entity", input)));
diff --git a/Content.Server/Station/Commands/JobsCommand.cs b/Content.Server/Station/Commands/JobsCommand.cs
index 1e39140e840..3f26090828b 100644
--- a/Content.Server/Station/Commands/JobsCommand.cs
+++ b/Content.Server/Station/Commands/JobsCommand.cs
@@ -3,6 +3,7 @@
using Content.Server.Station.Systems;
using Content.Shared.Administration;
using Content.Shared.Roles;
+using Robust.Shared.Prototypes;
using Robust.Shared.Toolshed;
using Robust.Shared.Toolshed.Syntax;
using Robust.Shared.Toolshed.TypeParsers;
@@ -26,28 +27,24 @@ public IEnumerable Jobs([PipedArgument] EntityUid station)
}
[CommandImplementation("jobs")]
- public IEnumerable Jobs([PipedArgument] IEnumerable stations)
- => stations.SelectMany(Jobs);
+ public IEnumerable Jobs([PipedArgument] IEnumerable stations) => stations.SelectMany(Jobs);
[CommandImplementation("job")]
- public JobSlotRef Job([PipedArgument] EntityUid station, Prototype job)
+ public JobSlotRef Job([PipedArgument] EntityUid station, ProtoId job)
{
_jobs ??= GetSys();
- return new JobSlotRef(job.Value.ID, station, _jobs, EntityManager);
+ return new JobSlotRef(job, station, _jobs, EntityManager);
}
[CommandImplementation("job")]
- public IEnumerable Job([PipedArgument] IEnumerable stations, Prototype job)
- => stations.Select(x => Job(x, job));
+ public IEnumerable Job([PipedArgument] IEnumerable stations, ProtoId job) => stations.Select(x => Job(x, job));
[CommandImplementation("isinfinite")]
- public bool IsInfinite([PipedArgument] JobSlotRef job, [CommandInverted] bool inverted)
- => job.Infinite() ^ inverted;
+ public bool IsInfinite([PipedArgument] JobSlotRef job, [CommandInverted] bool inverted) => job.Infinite() ^ inverted;
[CommandImplementation("isinfinite")]
- public IEnumerable IsInfinite([PipedArgument] IEnumerable jobs, [CommandInverted] bool inverted)
- => jobs.Select(x => IsInfinite(x, inverted));
+ public IEnumerable IsInfinite([PipedArgument] IEnumerable jobs, [CommandInverted] bool inverted) => jobs.Select(x => IsInfinite(x, inverted));
[CommandImplementation("adjust")]
public JobSlotRef Adjust([PipedArgument] JobSlotRef @ref, int by)
@@ -58,8 +55,7 @@ public JobSlotRef Adjust([PipedArgument] JobSlotRef @ref, int by)
}
[CommandImplementation("adjust")]
- public IEnumerable Adjust([PipedArgument] IEnumerable @ref, int by)
- => @ref.Select(x => Adjust(x, by));
+ public IEnumerable Adjust([PipedArgument] IEnumerable @ref, int by) => @ref.Select(x => Adjust(x, by));
[CommandImplementation("set")]
@@ -71,20 +67,18 @@ public JobSlotRef Set([PipedArgument] JobSlotRef @ref, int by)
}
[CommandImplementation("set")]
- public IEnumerable Set([PipedArgument] IEnumerable @ref, int by)
- => @ref.Select(x => Set(x, by));
+ public IEnumerable Set([PipedArgument] IEnumerable @ref, int by) => @ref.Select(x => Set(x, by));
[CommandImplementation("amount")]
public uint Amount([PipedArgument] JobSlotRef @ref)
{
_jobs ??= GetSys();
_jobs.TryGetJobSlot(@ref.Station, @ref.Job, out var slots);
- return slots.HasValue ? slots.Value : 0;
+ return slots ?? 0;
}
[CommandImplementation("amount")]
- public IEnumerable Amount([PipedArgument] IEnumerable @ref)
- => @ref.Select(Amount);
+ public IEnumerable Amount([PipedArgument] IEnumerable @ref) => @ref.Select(Amount);
}
// Used for Toolshed queries.
diff --git a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
index 95c2b0085bd..7dcb5ac30df 100644
--- a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
+++ b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
@@ -92,7 +92,7 @@ public sealed class StationEventCommand : ToolshedCommand
/// to even exist) so I think it's fine.
///
[CommandImplementation("simulate")]
- public IEnumerable<(string, float)> Simulate([CommandArgument] int rounds, [CommandArgument] int playerCount, [CommandArgument] float roundEndMean, [CommandArgument] float roundEndStdDev)
+ public IEnumerable<(string, float)> Simulate(EntityPrototype eventScheduler, int rounds, int playerCount, float roundEndMean, float roundEndStdDev)
{
_stationEvent ??= GetSys();
_basicScheduler ??= GetSys();
From f11d2e7976491a5c95aeb36eaa7a313624197a88 Mon Sep 17 00:00:00 2001
From: Skubman
Date: Wed, 8 Jan 2025 14:56:46 +0800
Subject: [PATCH 08/16] NanoChat QoL And Bug Fixes (#1460)
# Description
Fixes notifications so that they always trigger when the chat is not
open, fixes a possible exploit where a user can send a message that is
longer than the max message length, and improves the UX of NanoChat in a
few areas.
Original message from
https://github.com/Goob-Station/Goob-Station/pull/1313:
> Fixed NanoChat message notifications not showing up in situations
where you'd definitely expect them to occur.
>
> Now, for a chat to not send a notification upon a new message, three
conditions need to be fulfilled:
> - You don't have the chat muted
> - Your PDA UI is open
> - You have NanoChat as your open program
> - Your currently-selected chat is the aforementioned chat
More changes:
- Validate NanoChat message length & chat name/job title length on the
server
https://github.com/Goob-Station/Goob-Station/commit/c063001ca97df3cd4ea69639b8f9c0cb9e51fc90.
-If they are too long, they will be truncated to the maximum length.
- Improve the UI for editing a chat:
- Added a proper icon (used to be the letter E) for the Edit Chat
button.
- The Edit Chat popup now has correct text: the title is now "Edit a
contact", not "Add a new chat" and the Create button has been renamed to
the Confirm button.
- Editing a chat no longer deselects the current chat.
- This is done by adding a new NanoChatUiMessageType entry, `EditChat`
and a new server-side handler function just for chat edits. The previous
edit chat method simply *deleted* the chat from the client and created a
new one.
- Form validation is now more robust: you can now only submit the edit
if you've made changes to the name or job title.
- Fixed NanoChat not appearing in PDAs with more than 5 pre-installed
programs by increasing the PDA disk space (max program count) from 5 to
8, the current disk space in Wizden.
- The job title now appears on the notification title.
- The title will be truncated if it's too long.
- Improved form validation on the New Chat popup by only allowing users
to submit if the Number field is 4 numbers long. Previously, inputs like
"0" "12" "289" were valid which is ultimately incorrect as phone numbers
function more like strings that just happen to be digit-only and less
like actual numbers.
- The left chat list will now truncate names and job titles if they're
too long.
## Changelog
:cl: Skubman
- add: NanoChat message notifications will now show you the job title of
the sender alongside their name.
- add: The NanoChat edit button now has a proper icon.
- tweak: The disk space (max amount of installable programs) on PDAs has
been increased from 5 to 8. This also fixes a bug where NanoChat was not
being installed on PDAs with more than 5 pre-installed cartridges.
- tweak: The character limit for names and job titles in NanoChat has
been increased to their actual limit on ID cards (30 characters).
- tweak: NanoChat chat list names/titles and notification titles that
are too long will be shortened, indicated with "..." at the end.
- tweak: The NanoChat edit popup now displays the correct text, instead
of appearing identical to the new chat popup.
- fix: NanoChat will now send a new message notification no matter what
if you don't have the chat open.
- fix: Editing a chat in NanoChat no longer deselects that chat.
- fix: Fixed a issue where users could potentially send NanoChat
messages longer than the maximum allowed message length.
- fix: Fixed being able to create a new chat when you haven't typed in 4
digits in the number field.
---
.../Cartridges/EditChatPopup.xaml | 6 +-
.../Cartridges/EditChatPopup.xaml.cs | 53 ++++--
.../Cartridges/NanoChatEntry.xaml.cs | 15 +-
.../Cartridges/NanoChatUiFragment.xaml | 5 +-
.../Cartridges/NanoChatUiFragment.xaml.cs | 19 +-
.../Cartridges/NewChatPopup.xaml.cs | 11 +-
.../Cartridges/NanoChatCartridgeSystem.cs | 167 +++++++++++-------
.../DeltaV/NanoChat/NanoChatSystem.cs | 24 +++
.../CartridgeLoaderComponent.cs | 2 +-
.../Cartridges/NanoChatUiMessageEvent.cs | 3 +
.../DeltaV/NanoChat/NanoChatCardComponent.cs | 6 +
.../deltav/cartridge-loader/cartridges.ftl | 8 +-
.../Interface/VerbIcons/ATTRIBUTION.txt | 5 +-
.../Textures/Interface/VerbIcons/edit.svg.png | Bin 0 -> 4909 bytes
14 files changed, 228 insertions(+), 96 deletions(-)
create mode 100644 Resources/Textures/Interface/VerbIcons/edit.svg.png
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml
index 76a8513796b..3b229e824a8 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml
@@ -1,5 +1,5 @@
@@ -42,8 +42,8 @@
Text="{Loc nano-chat-cancel}"
StyleClasses="OpenRight"
MinSize="80 0" />
- ? OnContactEdited;
public EditChatPopup()
@@ -23,22 +28,23 @@ public EditChatPopup()
// Button handlers
CancelButton.OnPressed += _ => Close();
- CreateButton.OnPressed += _ => EditChat();
+ ConfirmButton.OnPressed += _ => EditChat();
// Input validation
NameInput.OnTextChanged += _ => ValidateInputs();
NameInput.OnTextChanged += args =>
{
- if (args.Text.Length > MaxInputLength)
- NameInput.Text = args.Text[..MaxInputLength];
+ if (args.Text.Length > IdCardConsoleComponent.MaxFullNameLength)
+ NameInput.Text = args.Text[..IdCardConsoleComponent.MaxFullNameLength];
ValidateInputs();
};
JobInput.OnTextChanged += args =>
{
- if (args.Text.Length > MaxInputLength)
- JobInput.Text = args.Text[..MaxInputLength];
+ if (args.Text.Length > IdCardConsoleComponent.MaxJobTitleLength)
+ JobInput.Text = args.Text[..IdCardConsoleComponent.MaxJobTitleLength];
+ ValidateInputs();
};
NumberInput.OnTextChanged += args =>
@@ -58,10 +64,15 @@ public EditChatPopup()
private void ValidateInputs()
{
var isValid = !string.IsNullOrWhiteSpace(NumberInput.Text) &&
- !string.IsNullOrWhiteSpace(NameInput.Text) &&
- uint.TryParse(NumberInput.Text, out _);
-
- CreateButton.Disabled = !isValid;
+ !string.IsNullOrWhiteSpace(NameInput.Text) &&
+ NumberInput.Text.Length == MaxNumberLength &&
+ uint.TryParse(NumberInput.Text, out _) &&
+ // Only valid if there are any changes
+ (NumberInput.Text != _originalNumber ||
+ NameInput.Text != _originalName ||
+ JobInput.Text != _originalJob);
+
+ ConfirmButton.Disabled = !isValid;
}
private void EditChat()
@@ -83,7 +94,21 @@ public void ClearInputs()
ValidateInputs();
}
- public void SetNumberInput(string newNumber) => NumberInput.Text = newNumber;
- public void SetNameInput(string newName) => NameInput.Text = newName;
- public void SetJobInput(string newJob) => JobInput.Text = newJob;
+ public void SetNumberInput(string newNumber)
+ {
+ NumberInput.Text = newNumber.PadLeft(MaxNumberLength, '0');
+ _originalNumber = newNumber;
+ }
+
+ public void SetNameInput(string newName)
+ {
+ NameInput.Text = newName;
+ _originalName = newName;
+ }
+
+ public void SetJobInput(string newJob)
+ {
+ JobInput.Text = newJob;
+ _originalJob = newJob;
+ }
}
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs
index ff4ea9ba9c1..49a23b708f4 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs
@@ -8,6 +8,9 @@ namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
[GenerateTypedNameReferences]
public sealed partial class NanoChatEntry : BoxContainer
{
+ private const int MaxNameLength = 14;
+ private const int MaxJobLength = 20;
+
public event Action? OnPressed;
private uint _number;
private Action? _pressHandler;
@@ -29,11 +32,19 @@ public void SetRecipient(NanoChatRecipient recipient, uint number, bool isSelect
_pressHandler = _ => OnPressed?.Invoke(_number);
ChatButton.OnPressed += _pressHandler;
- NameLabel.Text = recipient.Name;
- JobLabel.Text = recipient.JobTitle ?? "";
+ NameLabel.Text = Truncate(recipient.Name, MaxNameLength);
+ JobLabel.Text = Truncate(recipient.JobTitle ?? "", MaxJobLength);
JobLabel.Visible = !string.IsNullOrEmpty(recipient.JobTitle);
UnreadIndicator.Visible = recipient.HasUnread;
ChatButton.ModulateSelfOverride = isSelected ? NanoChatMessageBubble.OwnMessageColor : null;
}
+
+ ///
+ /// Truncates a string to a maximum length.
+ ///
+ private static string Truncate(string text, int maxLength) =>
+ text.Length <= maxLength
+ ? text
+ : text[..(maxLength - 3)] + "...";
}
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
index 8fe07cee94c..3567d533eeb 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
@@ -35,12 +35,15 @@
VerticalAlignment="Center"
Margin="0 0 8 0" />
+
{
- DeleteCurrentChat();
- ActionSendUiMessage?.Invoke(NanoChatUiMessageType.NewChat, number, name, job);
+ ActionSendUiMessage?.Invoke(NanoChatUiMessageType.EditChat, number, name, job);
};
NewChatButton.OnPressed += _ =>
@@ -71,18 +68,18 @@ private void SetupEventHandlers()
{
var length = args.Text.Length;
var isValid = !string.IsNullOrWhiteSpace(args.Text) &&
- length <= MaxMessageLength &&
+ length <= NanoChatMessage.MaxContentLength &&
(_currentChat != null || _pendingChat != null);
SendButton.Disabled = !isValid;
// Show character count when over limit
- CharacterCount.Visible = length > MaxMessageLength;
- if (length > MaxMessageLength)
+ CharacterCount.Visible = length > NanoChatMessage.MaxContentLength;
+ if (length > NanoChatMessage.MaxContentLength)
{
CharacterCount.Text = Loc.GetString("nano-chat-message-too-long",
("current", length),
- ("max", MaxMessageLength));
+ ("max", NanoChatMessage.MaxContentLength));
CharacterCount.StyleClasses.Add("LabelDanger");
}
};
@@ -100,6 +97,12 @@ private void SendMessage()
return;
var messageContent = MessageInput.Text;
+ if (!string.IsNullOrWhiteSpace(messageContent))
+ {
+ messageContent = messageContent.Trim();
+ if (messageContent.Length > NanoChatMessage.MaxContentLength)
+ messageContent = messageContent[..NanoChatMessage.MaxContentLength];
+ }
// Add predicted message
var predictedMessage = new NanoChatMessage(
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs
index 8e47e1ee5d4..16e9e1cdef8 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs
@@ -1,4 +1,5 @@
using System.Linq;
+using Content.Shared.Access.Components;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
@@ -8,7 +9,6 @@ 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;
@@ -44,15 +44,15 @@ public NewChatPopup()
NameInput.OnTextChanged += args =>
{
- if (args.Text.Length > MaxInputLength)
- NameInput.Text = args.Text[..MaxInputLength];
+ if (args.Text.Length > IdCardConsoleComponent.MaxFullNameLength)
+ NameInput.Text = args.Text[..IdCardConsoleComponent.MaxFullNameLength];
ValidateInputs();
};
JobInput.OnTextChanged += args =>
{
- if (args.Text.Length > MaxInputLength)
- JobInput.Text = args.Text[..MaxInputLength];
+ if (args.Text.Length > IdCardConsoleComponent.MaxJobTitleLength)
+ JobInput.Text = args.Text[..IdCardConsoleComponent.MaxJobTitleLength];
};
}
@@ -60,6 +60,7 @@ private void ValidateInputs()
{
var isValid = !string.IsNullOrWhiteSpace(NumberInput.Text) &&
!string.IsNullOrWhiteSpace(NameInput.Text) &&
+ NumberInput.Text.Length == MaxNumberLength &&
uint.TryParse(NumberInput.Text, out _);
CreateButton.Disabled = !isValid;
diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
index e9e01041f15..9d1723d62bd 100644
--- a/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
+++ b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
@@ -32,31 +32,15 @@ public sealed class NanoChatCartridgeSystem : EntitySystem
// no point in storing it on the comp
private const int NotificationMaxLength = 64;
+ // The max length of the name and job title on the notification before being truncated.
+ private const int NotificationTitleMaxLength = 32;
+
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent(OnUiReady);
SubscribeLocalEvent(OnMessage);
-
- Subs.BuiEvents(PdaUiKey.Key, subs =>
- {
- subs.Event(OnPdaClosed);
- });
- }
-
- // Reset current chat when PDA closes.
- private void OnPdaClosed(EntityUid uid, PdaComponent component, BoundUIClosedEvent args)
- {
- var exists = GetCardEntity(uid, out var cardEntity);
-
- if (!exists)
- return;
-
- _nanoChat.SetCurrentChat(
- (cardEntity.Owner, (NanoChatCardComponent?) cardEntity.Comp),
- null
- );
}
public override void Update(float frameTime)
@@ -108,6 +92,9 @@ private void OnMessage(Entity ent, ref CartridgeMess
case NanoChatUiMessageType.SelectChat:
HandleSelectChat(card, msg);
break;
+ case NanoChatUiMessageType.EditChat:
+ HandleEditChat(card, msg);
+ break;
case NanoChatUiMessageType.CloseChat:
HandleCloseChat(card);
break;
@@ -155,17 +142,33 @@ private void HandleNewChat(Entity card, NanoChatUiMessage
if (msg.RecipientNumber == null || msg.Content == null || msg.RecipientNumber == card.Comp.Number)
return;
+ var name = msg.Content;
+ if (!string.IsNullOrWhiteSpace(name))
+ {
+ name = name.Trim();
+ if (name.Length > IdCardConsoleComponent.MaxFullNameLength)
+ name = name[..IdCardConsoleComponent.MaxFullNameLength];
+ }
+
+ var jobTitle = msg.RecipientJob;
+ if (!string.IsNullOrWhiteSpace(jobTitle))
+ {
+ jobTitle = jobTitle.Trim();
+ if (jobTitle.Length > IdCardConsoleComponent.MaxJobTitleLength)
+ jobTitle = jobTitle[..IdCardConsoleComponent.MaxJobTitleLength];
+ }
+
// Add new recipient
var recipient = new NanoChatRecipient(msg.RecipientNumber.Value,
- msg.Content,
- msg.RecipientJob);
+ name,
+ jobTitle);
// 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})");
+ $"{ToPrettyString(msg.Actor):user} created new NanoChat conversation with #{msg.RecipientNumber:D4} ({name})");
var recipientEv = new NanoChatRecipientUpdatedEvent(card);
RaiseLocalEvent(ref recipientEv);
@@ -191,6 +194,42 @@ private void HandleSelectChat(Entity card, NanoChatUiMess
}
}
+ ///
+ /// Handles editing the current chat conversation.
+ ///
+ private void HandleEditChat(Entity card, NanoChatUiMessageEvent msg)
+ {
+ if (msg.RecipientNumber == null || msg.Content == null || msg.RecipientNumber == card.Comp.Number ||
+ _nanoChat.GetRecipient((card, card.Comp), msg.RecipientNumber.Value) is not {} recipient)
+ return;
+
+ var name = msg.Content;
+ if (!string.IsNullOrWhiteSpace(name))
+ {
+ name = name.Trim();
+ if (name.Length > IdCardConsoleComponent.MaxFullNameLength)
+ name = name[..IdCardConsoleComponent.MaxFullNameLength];
+ }
+
+ var jobTitle = msg.RecipientJob;
+ if (!string.IsNullOrWhiteSpace(jobTitle))
+ {
+ jobTitle = jobTitle.Trim();
+ if (jobTitle.Length > IdCardConsoleComponent.MaxJobTitleLength)
+ jobTitle = jobTitle[..IdCardConsoleComponent.MaxJobTitleLength];
+ }
+
+ // Update recipient
+ recipient.Name = name;
+ recipient.JobTitle = jobTitle;
+
+ _nanoChat.SetRecipient((card, card.Comp), msg.RecipientNumber.Value, recipient);
+
+ var recipientEv = new NanoChatRecipientUpdatedEvent(card);
+ RaiseLocalEvent(ref recipientEv);
+ UpdateUIForCard(card);
+ }
+
///
/// Handles closing the current chat conversation.
///
@@ -242,10 +281,18 @@ private void HandleSendMessage(Entity cartridge,
if (!EnsureRecipientExists(card, msg.RecipientNumber.Value))
return;
+ var content = msg.Content;
+ if (!string.IsNullOrWhiteSpace(content))
+ {
+ content = content.Trim();
+ if (content.Length > NanoChatMessage.MaxContentLength)
+ content = content[..NanoChatMessage.MaxContentLength];
+ }
+
// Create and store message for sender
var message = new NanoChatMessage(
_timing.CurTime,
- msg.Content,
+ content,
(uint)card.Comp.Number
);
@@ -265,7 +312,7 @@ private void HandleSendMessage(Entity cartridge,
_adminLogger.Add(LogType.Chat,
LogImpact.Low,
- $"{ToPrettyString(card):user} sent NanoChat message to {recipientsText}: {msg.Content}{(deliveryFailed ? " [DELIVERY FAILED]" : "")}");
+ $"{ToPrettyString(card):user} sent NanoChat message to {recipientsText}: {content}{(deliveryFailed ? " [DELIVERY FAILED]" : "")}");
var msgEv = new NanoChatMessageReceivedEvent(card);
RaiseLocalEvent(ref msgEv);
@@ -401,7 +448,7 @@ private void DeliverMessageToRecipient(Entity sender,
return;
_nanoChat.AddMessage((recipient, recipient.Comp), senderNumber.Value, message with { DeliveryFailed = false });
- HandleUnreadNotification(recipient, message);
+ HandleUnreadNotification(recipient, message, (uint) senderNumber);
var msgEv = new NanoChatMessageReceivedEvent(recipient);
RaiseLocalEvent(ref msgEv);
@@ -411,42 +458,46 @@ private void DeliverMessageToRecipient(Entity sender,
///
/// Handles unread message notifications and updates unread status.
///
- private void HandleUnreadNotification(Entity recipient, NanoChatMessage message)
+ private void HandleUnreadNotification(Entity recipient,
+ NanoChatMessage message,
+ uint senderNumber)
{
// 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
+ var senderName = recipients.TryGetValue(message.SenderId, out var senderRecipient)
+ ? senderRecipient.Name
: $"#{message.SenderId:D4}";
+ var hasSelectedCurrentChat = _nanoChat.GetCurrentChat((recipient, recipient.Comp)) == senderNumber;
- var shouldUnread = true;
+ // Update unread status
+ if (!hasSelectedCurrentChat)
+ _nanoChat.SetRecipient((recipient, recipient.Comp),
+ message.SenderId,
+ senderRecipient with { HasUnread = true });
+
+ if (recipient.Comp.NotificationsMuted ||
+ recipient.Comp.PdaUid is not {} pdaUid ||
+ !TryComp(pdaUid, out var loader) ||
+ // Don't notify if the recipient has the NanoChat program open with this chat selected.
+ (hasSelectedCurrentChat &&
+ _ui.IsUiOpen(pdaUid, PdaUiKey.Key) &&
+ HasComp(loader.ActiveProgram)))
+ return;
- if (!recipient.Comp.Recipients[message.SenderId].HasUnread && !recipient.Comp.NotificationsMuted)
+ var title = "";
+ if (!String.IsNullOrEmpty(senderRecipient.JobTitle))
{
- var pdaQuery = EntityQueryEnumerator();
- while (pdaQuery.MoveNext(out var pdaUid, out var pdaComp))
- {
- if (pdaComp.ContainedId != recipient)
- continue;
-
- if (_ui.IsUiOpen((pdaUid, null), PdaUiKey.Key) && recipient.Comp.CurrentChat == message.SenderId)
- {
- shouldUnread = false;
- break;
- }
-
- _cartridge.SendNotification(pdaUid,
- Loc.GetString("nano-chat-new-message-title", ("sender", senderName)),
- Loc.GetString("nano-chat-new-message-body", ("message", TruncateMessage(message.Content))));
- break;
- }
+ var titleRecipient = Truncate(Loc.GetString("nano-chat-new-message-title-recipient",
+ ("sender", senderName), ("jobTitle", senderRecipient.JobTitle)), NotificationTitleMaxLength, " \\[...\\]");
+ title = Loc.GetString("nano-chat-new-message-title", ("sender", titleRecipient));
}
+ else
+ title = Loc.GetString("nano-chat-new-message-title", ("sender", senderName));
- // Update unread status
- _nanoChat.SetRecipient(
- (recipient, recipient.Comp),
- message.SenderId,
- existingRecipient with { HasUnread = shouldUnread });
+ _cartridge.SendNotification(pdaUid,
+ title,
+ Loc.GetString("nano-chat-new-message-body", ("message", Truncate(message.Content, NotificationMaxLength, " [...]"))),
+ loader);
}
///
@@ -493,14 +544,12 @@ private void UpdateUIForCard(EntityUid cardUid)
}
///
- /// Truncates a message to the notification maximum length.
+ /// Truncates a string to a maximum length.
///
- private static string TruncateMessage(string message)
- {
- return message.Length <= NotificationMaxLength
- ? message
- : message[..(NotificationMaxLength - 4)] + " [...]";
- }
+ private static string Truncate(string text, int maxLength, string overflowText = "...") =>
+ text.Length <= maxLength
+ ? text
+ : text[..(maxLength - overflowText.Length)] + overflowText;
private void OnUiReady(Entity ent, ref CartridgeUiReadyEvent args)
{
diff --git a/Content.Server/DeltaV/NanoChat/NanoChatSystem.cs b/Content.Server/DeltaV/NanoChat/NanoChatSystem.cs
index fb0ca32aa66..87a174a4fce 100644
--- a/Content.Server/DeltaV/NanoChat/NanoChatSystem.cs
+++ b/Content.Server/DeltaV/NanoChat/NanoChatSystem.cs
@@ -7,6 +7,8 @@
using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
using Content.Shared.DeltaV.NanoChat;
using Content.Shared.NameIdentifier;
+using Content.Shared.PDA;
+using Robust.Shared.Containers;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
@@ -26,10 +28,32 @@ public sealed class NanoChatSystem : SharedNanoChatSystem
public override void Initialize()
{
base.Initialize();
+
+ SubscribeLocalEvent(OnInserted);
+ SubscribeLocalEvent(OnRemoved);
+
SubscribeLocalEvent(OnCardInit);
SubscribeLocalEvent(OnMicrowaved, after: [typeof(IdCardSystem)]);
}
+ private void OnInserted(Entity ent, ref EntGotInsertedIntoContainerMessage args)
+ {
+ if (args.Container.ID != PdaComponent.PdaIdSlotId)
+ return;
+
+ ent.Comp.PdaUid = args.Container.Owner;
+ Dirty(ent);
+ }
+
+ private void OnRemoved(Entity ent, ref EntGotRemovedFromContainerMessage args)
+ {
+ if (args.Container.ID != PdaComponent.PdaIdSlotId)
+ return;
+
+ ent.Comp.PdaUid = null;
+ Dirty(ent);
+ }
+
private void OnMicrowaved(Entity ent, ref BeingMicrowavedEvent args)
{
// Skip if the entity was deleted (e.g., by ID card system burning it)
diff --git a/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs b/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs
index c9cd710c522..f47112c7943 100644
--- a/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs
+++ b/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs
@@ -33,7 +33,7 @@ public sealed partial class CartridgeLoaderComponent : Component
/// The maximum amount of programs that can be installed on the cartridge loader entity
///
[DataField]
- public int DiskSpace = 5;
+ public int DiskSpace = 8;
///
/// Controls whether the cartridge loader will play notifications if it supports it at all
diff --git a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs
index 8cb2efa900f..d6c64e074a4 100644
--- a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs
+++ b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs
@@ -50,6 +50,7 @@ public enum NanoChatUiMessageType : byte
{
NewChat,
SelectChat,
+ EditChat,
CloseChat,
SendMessage,
DeleteChat,
@@ -99,6 +100,8 @@ public NanoChatRecipient(uint number, string name, string? jobTitle = null, bool
[Serializable, NetSerializable, DataRecord]
public struct NanoChatMessage
{
+ public const int MaxContentLength = 256;
+
///
/// When the message was sent.
///
diff --git a/Content.Shared/DeltaV/NanoChat/NanoChatCardComponent.cs b/Content.Shared/DeltaV/NanoChat/NanoChatCardComponent.cs
index 7e40be79832..03caf4a618c 100644
--- a/Content.Shared/DeltaV/NanoChat/NanoChatCardComponent.cs
+++ b/Content.Shared/DeltaV/NanoChat/NanoChatCardComponent.cs
@@ -49,4 +49,10 @@ public sealed partial class NanoChatCardComponent : Component
///
[DataField]
public bool NotificationsMuted;
+
+ ///
+ /// The PDA that this card is currently inserted to.
+ ///
+ [DataField]
+ public EntityUid? PdaUid = null;
}
diff --git a/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
index 5c5a5c0a418..08ecf33aaf0 100644
--- a/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
+++ b/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
@@ -176,14 +176,14 @@ nano-chat-delete = Delete
nano-chat-loading = Loading...
nano-chat-message-too-long = Message too long ({$current}/{$max} characters)
nano-chat-max-recipients = Maximum number of chats reached
-nano-chat-new-message-title = Message from {$sender}
+nano-chat-new-message-title = message from {$sender}
+nano-chat-new-message-title-recipient = {$sender} ({$jobTitle})
nano-chat-new-message-body = {$message}
nano-chat-toggle-mute = Mute notifications
nano-chat-delivery-failed = Failed to deliver
# Create chat popup
nano-chat-new-title = Add a new chat
-nano-chat-edit-title = Edit a contact
nano-chat-number-label = Number
nano-chat-name-label = Name
nano-chat-job-label = Job title
@@ -193,6 +193,10 @@ nano-chat-job-placeholder = Enter a job title (optional)
nano-chat-cancel = Cancel
nano-chat-create = Create
+# Edit chat popup
+nano-chat-edit-title = Edit a contact
+nano-chat-confirm = Confirm
+
# LogProbe additions
log-probe-scan-nanochat = Scanned {$card}'s NanoChat logs
log-probe-header-access = Access Log Scanner
diff --git a/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt b/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
index 69aa4650b32..ac76f535c48 100644
--- a/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
+++ b/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
@@ -9,4 +9,7 @@ unlock.svg by Delapouite under CC BY 3.0
https://game-icons.net/1x1/delapouite/padlock-open.html
healing_word.png by LeonardoDaBepis under CC BY 3.0
-revivify.png by LeonardoDaBepis under CC BY 3.0
\ No newline at end of file
+revivify.png by LeonardoDaBepis under CC BY 3.0
+
+edit.svg.png by H2D2 Design under MIT License
+https://www.svgrepo.com/svg/453928/edit
diff --git a/Resources/Textures/Interface/VerbIcons/edit.svg.png b/Resources/Textures/Interface/VerbIcons/edit.svg.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a59aba6afa29b604618ab2832bbf9a76b43be75
GIT binary patch
literal 4909
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
literal 0
HcmV?d00001
From 747cb50900a96d74ca384939c05330504d20435e Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs
Date: Wed, 8 Jan 2025 06:57:12 +0000
Subject: [PATCH 09/16] Automatic Changelog Update (#1460)
---
Resources/Changelog/Changelog.yml | 42 +++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 3f882d185b4..d39e25c4c62 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -9392,3 +9392,45 @@ Entries:
id: 6647
time: '2025-01-07T17:23:36.0000000+00:00'
url: https://github.com/Simple-Station/Einstein-Engines/pull/1429
+- author: Skubman
+ changes:
+ - type: Add
+ message: >-
+ NanoChat message notifications will now show you the job title of the
+ sender alongside their name.
+ - type: Add
+ message: The NanoChat edit button now has a proper icon.
+ - type: Tweak
+ message: >-
+ The disk space (max amount of installable programs) on PDAs has been
+ increased from 5 to 8. This also fixes a bug where NanoChat was not
+ being installed on PDAs with more than 5 pre-installed cartridges.
+ - type: Tweak
+ message: >-
+ The character limit for names and job titles in NanoChat has been
+ increased to their actual limit on ID cards (30 characters).
+ - type: Tweak
+ message: >-
+ NanoChat chat list names/titles and notification titles that are too
+ long will be shortened, indicated with "..." at the end.
+ - type: Tweak
+ message: >-
+ The NanoChat edit popup now displays the correct text, instead of
+ appearing identical to the new chat popup.
+ - type: Fix
+ message: >-
+ NanoChat will now send a new message notification no matter what if you
+ don't have the chat open.
+ - type: Fix
+ message: Editing a chat in NanoChat no longer deselects that chat.
+ - type: Fix
+ message: >-
+ Fixed a issue where users could potentially send NanoChat messages
+ longer than the maximum allowed message length.
+ - type: Fix
+ message: >-
+ Fixed being able to create a new chat when you haven't typed in 4 digits
+ in the number field.
+ id: 6648
+ time: '2025-01-08T06:56:46.0000000+00:00'
+ url: https://github.com/Simple-Station/Einstein-Engines/pull/1460
From f80f954f817871ada084518e79b1832c0c5db2d9 Mon Sep 17 00:00:00 2001
From: Skubman
Date: Wed, 8 Jan 2025 14:58:04 +0800
Subject: [PATCH 10/16] Increase Title/Content Text Limits For News Articles
(#1447)
# Description
Increases the text limit for news reports:
- Title character limit: 25 -> 50
- Content character limit: 2048 -> 2560
Mostly a personal change for me because I often run into the title
character limits when I was playing Reporter.
## Media
## Changelog
:cl: Skubman
- tweak: The news article title character limit has been increased from
25 to 50 characters, and news content from 2048 to 2560 characters.
---
Content.Client/MassMedia/Ui/NewsArticleCard.xaml.cs | 2 +-
Content.Client/MassMedia/Ui/NewsWriterMenu.xaml | 4 ++--
Content.Shared/MassMedia/Systems/SharedNewsSystem.cs | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Content.Client/MassMedia/Ui/NewsArticleCard.xaml.cs b/Content.Client/MassMedia/Ui/NewsArticleCard.xaml.cs
index f6fa3e00be0..bdd8b49d0ba 100644
--- a/Content.Client/MassMedia/Ui/NewsArticleCard.xaml.cs
+++ b/Content.Client/MassMedia/Ui/NewsArticleCard.xaml.cs
@@ -16,7 +16,7 @@ public sealed partial class NewsArticleCard : Control
public string? Title
{
get => TitleLabel.Text;
- set => TitleLabel.Text = value?.Length <= 30 ? value : $"{value?[..30]}...";
+ set => TitleLabel.Text = value?.Length <= 40 ? value : $"{value?[..40]}...";
}
public string? Author
diff --git a/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml b/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml
index 64932bc6cfe..f1cf56fce31 100644
--- a/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml
+++ b/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml
@@ -4,8 +4,8 @@
xmlns:ui="clr-namespace:Content.Client.MassMedia.Ui"
xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
Title="{Loc 'news-write-ui-default-title'}"
- MinSize="348 443"
- SetSize="348 443">
+ MinSize="404 443"
+ SetSize="404 443">
Date: Wed, 8 Jan 2025 06:58:58 +0000
Subject: [PATCH 11/16] Automatic Changelog Update (#1447)
---
Resources/Changelog/Changelog.yml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index d39e25c4c62..bee1b983c58 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -9434,3 +9434,12 @@ Entries:
id: 6648
time: '2025-01-08T06:56:46.0000000+00:00'
url: https://github.com/Simple-Station/Einstein-Engines/pull/1460
+- author: Skubman
+ changes:
+ - type: Tweak
+ message: >-
+ The news article title character limit has been increased from 25 to 50
+ characters, and news content from 2048 to 2560 characters.
+ id: 6649
+ time: '2025-01-08T06:58:05.0000000+00:00'
+ url: https://github.com/Simple-Station/Einstein-Engines/pull/1447
From e733fa01ab4a3ae4bf0845b5cfa03aadefe9a653 Mon Sep 17 00:00:00 2001
From: Brandon Li <48413902+aspiringLich@users.noreply.github.com>
Date: Wed, 8 Jan 2025 02:06:22 -0500
Subject: [PATCH 12/16] Chem Colors (#1461)
# Description
This is [cherrypicked from
wizden](https://github.com/space-wizards/space-station-14/pull/28367).
It literally just changes colors. See that PR for all information.
# Why
It bothered me that my 20 minutes of hard labor and 30 minutes arguing
in github issues was not present on EE. I am since rectifying this
blatant injustice.
# Changelog
:cl:
- tweak: Some chemicals have been made more colorful and child-friendly.
---------
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
---
Resources/Prototypes/Reagents/elements.yml | 10 +++++-----
Resources/Prototypes/Reagents/gases.yml | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml
index 4f05568ad2b..8d317102c1b 100644
--- a/Resources/Prototypes/Reagents/elements.yml
+++ b/Resources/Prototypes/Reagents/elements.yml
@@ -85,7 +85,7 @@
desc: reagent-desc-fluorine
physicalDesc: reagent-physical-desc-gaseous
flavor: bitter
- color: "#808080"
+ color: "#ba85cc"
boilingPoint: -188.11
meltingPoint: -219.67
plantMetabolism:
@@ -123,7 +123,7 @@
desc: reagent-desc-hydrogen
physicalDesc: reagent-physical-desc-gaseous
flavor: bitter
- color: "#808080"
+ color: "#cccccc"
boilingPoint: -253.0
meltingPoint: -259.2
@@ -176,7 +176,7 @@
desc: reagent-desc-lithium
physicalDesc: reagent-physical-desc-shiny
flavor: metallic
- color: "#c6c8cc"
+ color: "#d6c0a7"
meltingPoint: 180.5
boilingPoint: 1330.0
metabolisms:
@@ -235,7 +235,7 @@
desc: reagent-desc-phosphorus
physicalDesc: reagent-physical-desc-powdery
flavor: metallic
- color: "#ede4e4"
+ color: "#f5da9a"
meltingPoint: 44.2
boilingPoint: 280.5
plantMetabolism:
@@ -312,7 +312,7 @@
desc: reagent-desc-sodium
physicalDesc: reagent-physical-desc-metallic
flavor: bitter
- color: "#c6c8cc"
+ color: "#a7b3d6"
meltingPoint: 97.8
boilingPoint: 883.0
diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml
index 298bcb923eb..caa2e5acdc6 100644
--- a/Resources/Prototypes/Reagents/gases.yml
+++ b/Resources/Prototypes/Reagents/gases.yml
@@ -4,7 +4,7 @@
desc: reagent-desc-oxygen
physicalDesc: reagent-physical-desc-gaseous
flavor: bitter
- color: "#808080"
+ color: "#c4f5ff"
boilingPoint: -183.0
meltingPoint: -218.4
metabolisms:
@@ -190,7 +190,7 @@
desc: reagent-desc-nitrogen
physicalDesc: reagent-physical-desc-gaseous
flavor: bitter
- color: "#808080"
+ color: "#a1e1ff"
boilingPoint: -195.8
meltingPoint: -210.0
metabolisms:
@@ -232,7 +232,7 @@
desc: reagent-desc-nitrous-oxide
physicalDesc: reagent-physical-desc-gaseous
flavor: bitter
- color: "#808080"
+ color: "#5d88c9"
boilingPoint: -88
meltingPoint: -90
metabolisms:
From 64d432317b5cc3ebb28b2c888b234e22abd4265f Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs
Date: Wed, 8 Jan 2025 07:06:47 +0000
Subject: [PATCH 13/16] Automatic Changelog Update (#1461)
---
Resources/Changelog/Changelog.yml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index bee1b983c58..fc176205c60 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -9443,3 +9443,10 @@ Entries:
id: 6649
time: '2025-01-08T06:58:05.0000000+00:00'
url: https://github.com/Simple-Station/Einstein-Engines/pull/1447
+- author: aspiringLich
+ changes:
+ - type: Tweak
+ message: Some chemicals have been made more colorful and child-friendly.
+ id: 6650
+ time: '2025-01-08T07:06:22.0000000+00:00'
+ url: https://github.com/Simple-Station/Einstein-Engines/pull/1461
From 089a45e5914effdf544c550a880f2dc60c342147 Mon Sep 17 00:00:00 2001
From: Skubman
Date: Wed, 8 Jan 2025 15:07:16 +0800
Subject: [PATCH 14/16] Fix Cybersun Pen Damage (#1459)
# Description
Sets the Cybersun pen's throwing damage to be the same as its melee
damage and also inflict embedded passive damage.
Because the Cybersun pen inherits from `PenEmbeddable` that manually
sets its own `DamageOtherOnHit` damage because it's not a melee weapon,
the Cybersun pen's throwing damage didn't inherit the melee weapon
damage and it was low compared to its melee damage.
## Media
**New Damage Values**
**Old Damage Values**
## Changelog
:cl: Skubman
- fix: The Cybersun pen now properly deals 15 Piercing damage on throw
and deals passive damage when embedded.
---
Resources/Prototypes/Entities/Objects/Misc/paper.yml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index fd1e76d6385..a811994c9ef 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -395,6 +395,13 @@
Piercing: 15
soundHit:
path: /Audio/Weapons/bladeslice.ogg
+ - type: DamageOtherOnHit
+ damage:
+ types:
+ Piercing: 15
+ - type: EmbeddableProjectile
+ removalTime: 2
+ - type: EmbedPassiveDamage
- type: Tool
qualities:
- Screwing
From bea6ca7d9b4d219d4b9c4342fbd3d75f2e89d9c4 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs
Date: Wed, 8 Jan 2025 07:08:16 +0000
Subject: [PATCH 15/16] Automatic Changelog Update (#1459)
---
Resources/Changelog/Changelog.yml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index fc176205c60..c6eef88168a 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -9450,3 +9450,12 @@ Entries:
id: 6650
time: '2025-01-08T07:06:22.0000000+00:00'
url: https://github.com/Simple-Station/Einstein-Engines/pull/1461
+- author: Skubman
+ changes:
+ - type: Fix
+ message: >-
+ The Cybersun pen now properly deals 15 Piercing damage on throw and
+ deals passive damage when embedded.
+ id: 6651
+ time: '2025-01-08T07:07:16.0000000+00:00'
+ url: https://github.com/Simple-Station/Einstein-Engines/pull/1459
From 70f72983e5c835c98acf3c5380ecc2d06ae67b10 Mon Sep 17 00:00:00 2001
From: Lumminal <81829924+Lumminal@users.noreply.github.com>
Date: Wed, 8 Jan 2025 09:09:10 +0200
Subject: [PATCH 16/16] Fixed Shadow Shackles Not Activating for Blood Cultists
(#1456)
# Description
Fixed Shadow Shackles not activating when you melee hit the target.
The Problem: The code checked if the target wasn't stunned when you hit
someone, therefore not activating unless the target was already stunned.
I fixed it by removing the ! operator on
`HasComp(target)` check.
---
Media
https://github.com/user-attachments/assets/5ac1a5dd-5d62-4400-be64-56500c87ed5e
(target)
+ || HasComp(target)
|| HasComp(target))
return;