diff --git a/.editorconfig b/.editorconfig
index 1583c600aa56..8b9214445391 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -344,6 +344,9 @@ resharper_keep_existing_attribute_arrangement = true
resharper_wrap_chained_binary_patterns = chop_if_long
resharper_wrap_chained_method_calls = chop_if_long
resharper_csharp_trailing_comma_in_multiline_lists = true
+resharper_csharp_qualified_using_at_nested_scope = false
+resharper_csharp_prefer_qualified_reference = false
+resharper_csharp_allow_alias = false
[*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props}]
indent_size = 2
diff --git a/.envrc b/.envrc
index 7fd05db3e5ee..b1ad7237edf5 100644
--- a/.envrc
+++ b/.envrc
@@ -1,4 +1,5 @@
-if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
- source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
+set -e
+if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then
+ source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
fi
use flake
diff --git a/Content.Benchmarks/MapLoadBenchmark.cs b/Content.Benchmarks/MapLoadBenchmark.cs
index 844d5b82d104..bc050b59f160 100644
--- a/Content.Benchmarks/MapLoadBenchmark.cs
+++ b/Content.Benchmarks/MapLoadBenchmark.cs
@@ -46,7 +46,7 @@ public async Task Cleanup()
PoolManager.Shutdown();
}
- public static readonly string[] MapsSource = { "Empty", "Satlern", "Box", "Bagel", "Dev", "CentComm", "Core", "TestTeg", "Packed", "Omega", "Reach", "Origin", "Meta", "Marathon", "MeteorArena", "Fland", "Oasis", "Cog" };
+ public static readonly string[] MapsSource = { "Empty", "Satlern", "Box", "Bagel", "Dev", "CentComm", "Core", "TestTeg", "Packed", "Omega", "Reach", "Meta", "Marathon", "MeteorArena", "Fland", "Oasis", "Cog", "Convex"};
[ParamsSource(nameof(MapsSource))]
public string Map;
diff --git a/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs
index 44c40143d830..04075000f5b9 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 000000000000..905cf020ed1c
--- /dev/null
+++ b/Content.Client/Cargo/UI/BountyHistoryEntry.xaml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/Cargo/UI/BountyHistoryEntry.xaml.cs b/Content.Client/Cargo/UI/BountyHistoryEntry.xaml.cs
new file mode 100644
index 000000000000..54804be641c3
--- /dev/null
+++ b/Content.Client/Cargo/UI/BountyHistoryEntry.xaml.cs
@@ -0,0 +1,49 @@
+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)));
+
+ TimestampLabel.SetMarkup(bounty.Timestamp.ToString(@"hh\:mm\:ss"));
+
+ if (bounty.Result == CargoBountyHistoryData.BountyResult.Completed)
+ {
+ NoticeLabel.SetMarkup(Loc.GetString("bounty-console-history-notice-completed-label"));
+ }
+ else
+ {
+ NoticeLabel.SetMarkup(Loc.GetString("bounty-console-history-notice-skipped-label",
+ ("id", bounty.ActorName ?? "")));
+ }
+ }
+}
diff --git a/Content.Client/Cargo/UI/CargoBountyMenu.xaml b/Content.Client/Cargo/UI/CargoBountyMenu.xaml
index bb263ff6c4ab..526ba69129bb 100644
--- a/Content.Client/Cargo/UI/CargoBountyMenu.xaml
+++ b/Content.Client/Cargo/UI/CargoBountyMenu.xaml
@@ -11,15 +11,28 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs b/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs
index 3767b45e4bed..c289fb6ed83c 100644
--- a/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs
@@ -15,9 +15,12 @@ public sealed partial class CargoBountyMenu : FancyWindow
public CargoBountyMenu()
{
RobustXamlLoader.Load(this);
+
+ MasterTabContainer.SetTabTitle(0, Loc.GetString("bounty-console-tab-available-label"));
+ MasterTabContainer.SetTabTitle(1, Loc.GetString("bounty-console-tab-history-label"));
}
- public void UpdateEntries(List bounties, TimeSpan untilNextSkip)
+ public void UpdateEntries(List bounties, List history, TimeSpan untilNextSkip)
{
BountyEntriesContainer.Children.Clear();
foreach (var b in bounties)
@@ -32,5 +35,21 @@ public void UpdateEntries(List bounties, TimeSpan untilNextSkip
{
MinHeight = 10
});
+
+ BountyHistoryContainer.Children.Clear();
+ if (history.Count == 0)
+ {
+ NoHistoryLabel.Visible = true;
+ }
+ else
+ {
+ NoHistoryLabel.Visible = false;
+
+ // Show the history in reverse, so last entry is first in the list
+ for (var i = history.Count - 1; i >= 0; i--)
+ {
+ BountyHistoryContainer.AddChild(new BountyHistoryEntry(history[i]));
+ }
+ }
}
}
diff --git a/Content.Client/Changelog/ChangelogWindow.xaml.cs b/Content.Client/Changelog/ChangelogWindow.xaml.cs
index 9b7fd7543692..cb07e16a9c28 100644
--- a/Content.Client/Changelog/ChangelogWindow.xaml.cs
+++ b/Content.Client/Changelog/ChangelogWindow.xaml.cs
@@ -8,6 +8,8 @@
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.XAML;
+using Robust.Shared;
+using Robust.Shared.Configuration;
using Robust.Shared.Console;
namespace Content.Client.Changelog
@@ -15,8 +17,9 @@ namespace Content.Client.Changelog
[GenerateTypedNameReferences]
public sealed partial class ChangelogWindow : FancyWindow
{
- [Dependency] private readonly IClientAdminManager _adminManager = default!;
[Dependency] private readonly ChangelogManager _changelog = default!;
+ [Dependency] private readonly IClientAdminManager _adminManager = default!;
+ [Dependency] private readonly IConfigurationManager _cfg = default!;
public ChangelogWindow()
{
@@ -67,8 +70,22 @@ private async void PopulateChangelog()
Tabs.SetTabTitle(i++, Loc.GetString($"changelog-tab-title-{changelog.Name}"));
}
- var version = typeof(ChangelogWindow).Assembly.GetName().Version ?? new Version(1, 0);
- VersionLabel.Text = Loc.GetString("changelog-version-tag", ("version", version.ToString()));
+ // Try to get the current version from the build.json file
+ var version = _cfg.GetCVar(CVars.BuildVersion);
+ var forkId = _cfg.GetCVar(CVars.BuildForkId);
+
+ var versionText = Loc.GetString("changelog-version-unknown");
+
+ // Make sure these aren't empty, like in a dev env
+ if (!string.IsNullOrEmpty(version) && !string.IsNullOrEmpty(forkId))
+ {
+ versionText = Loc.GetString("changelog-version-tag",
+ ("fork", forkId),
+ ("version", version[..7])); // Only show the first 7 characters
+ }
+
+ // if else statements are ugly, shut up
+ VersionLabel.Text = versionText;
TabsUpdated();
}
diff --git a/Content.Client/Chat/UI/EmotesMenu.xaml b/Content.Client/Chat/UI/EmotesMenu.xaml
index eb2b280963fa..b8a7fcfeb5d2 100644
--- a/Content.Client/Chat/UI/EmotesMenu.xaml
+++ b/Content.Client/Chat/UI/EmotesMenu.xaml
@@ -1,4 +1,4 @@
-
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
diff --git a/Content.Client/Chat/UI/EmotesMenu.xaml.cs b/Content.Client/Chat/UI/EmotesMenu.xaml.cs
index f3b7837f21a5..80daa405a68e 100644
--- a/Content.Client/Chat/UI/EmotesMenu.xaml.cs
+++ b/Content.Client/Chat/UI/EmotesMenu.xaml.cs
@@ -50,7 +50,6 @@ public EmotesMenu()
var button = new EmoteMenuButton
{
- StyleClasses = { "RadialMenuButton" },
SetSize = new Vector2(64f, 64f),
ToolTip = Loc.GetString(emote.Name),
ProtoId = emote.ID,
@@ -106,7 +105,7 @@ private void AddEmoteClickAction(RadialContainer container)
}
-public sealed class EmoteMenuButton : RadialMenuTextureButton
+public sealed class EmoteMenuButton : RadialMenuTextureButtonWithSector
{
public ProtoId ProtoId { get; set; }
}
diff --git a/Content.Client/Clickable/ClickMapManager.cs b/Content.Client/Clickable/ClickMapManager.cs
index 6a77c7e05436..557ef57ef106 100644
--- a/Content.Client/Clickable/ClickMapManager.cs
+++ b/Content.Client/Clickable/ClickMapManager.cs
@@ -20,7 +20,7 @@ internal sealed class ClickMapManager : IClickMapManager, IPostInjectInit
"/Textures/Logo",
};
- private const float Threshold = 0.25f;
+ private const float Threshold = 0.1f;
private const int ClickRadius = 2;
[Dependency] private readonly IResourceCache _resourceCache = default!;
diff --git a/Content.Client/CrewManifest/UI/CrewManifestSection.cs b/Content.Client/CrewManifest/UI/CrewManifestSection.cs
index afd854d08268..188c85f01fe8 100644
--- a/Content.Client/CrewManifest/UI/CrewManifestSection.cs
+++ b/Content.Client/CrewManifest/UI/CrewManifestSection.cs
@@ -22,7 +22,7 @@ public CrewManifestSection(
AddChild(new Label()
{
StyleClasses = { "LabelBig" },
- Text = Loc.GetString($"department-{section.ID}")
+ Text = Loc.GetString(section.Name)
});
var departmentContainer = new BoxContainer()
diff --git a/Content.Client/CriminalRecords/CriminalRecordsConsoleBoundUserInterface.cs b/Content.Client/CriminalRecords/CriminalRecordsConsoleBoundUserInterface.cs
index 9047624f49be..d5cc4ecfa9a0 100644
--- a/Content.Client/CriminalRecords/CriminalRecordsConsoleBoundUserInterface.cs
+++ b/Content.Client/CriminalRecords/CriminalRecordsConsoleBoundUserInterface.cs
@@ -39,6 +39,8 @@ protected override void Open()
SendMessage(new CriminalRecordChangeStatus(status, null));
_window.OnDialogConfirmed += (status, reason) =>
SendMessage(new CriminalRecordChangeStatus(status, reason));
+ _window.OnStatusFilterPressed += (statusFilter) =>
+ SendMessage(new CriminalRecordSetStatusFilter(statusFilter));
_window.OnHistoryUpdated += UpdateHistory;
_window.OnHistoryClosed += () => _historyWindow?.Close();
_window.OnClose += Close;
diff --git a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml
index 9e03f6df1427..264c2b0adae1 100644
--- a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml
+++ b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml
@@ -1,37 +1,148 @@
+ xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+ Title="{Loc 'criminal-records-console-window-title'}"
+ MinSize="695 440">
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs
index a9dbb9a9002f..321ba4cfd9e8 100644
--- a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs
+++ b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs
@@ -13,6 +13,9 @@
using Robust.Shared.Random;
using Robust.Shared.Utility;
using System.Linq;
+using System.Numerics;
+using Content.Shared.StatusIcon;
+using Robust.Client.GameObjects;
namespace Content.Client.CriminalRecords;
@@ -24,6 +27,8 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
private readonly IPrototypeManager _proto;
private readonly IRobustRandom _random;
private readonly AccessReaderSystem _accessReader;
+ [Dependency] private readonly IEntityManager _entManager = default!;
+ private readonly SpriteSystem _spriteSystem;
public readonly EntityUid Console;
@@ -33,10 +38,12 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
public Action? OnKeySelected;
public Action? OnFiltersChanged;
public Action? OnStatusSelected;
+ public Action? OnCheckStatus;
public Action? OnHistoryUpdated;
public Action? OnHistoryClosed;
public Action? OnDialogConfirmed;
+ public Action? OnStatusFilterPressed;
private uint _maxLength;
private bool _access;
private uint? _selectedKey;
@@ -46,6 +53,8 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow
private StationRecordFilterType _currentFilterType;
+ private SecurityStatus _currentCrewListFilter;
+
public CriminalRecordsConsoleWindow(EntityUid console, uint maxLength, IPlayerManager playerManager, IPrototypeManager prototypeManager, IRobustRandom robustRandom, AccessReaderSystem accessReader)
{
RobustXamlLoader.Load(this);
@@ -55,10 +64,14 @@ public CriminalRecordsConsoleWindow(EntityUid console, uint maxLength, IPlayerMa
_proto = prototypeManager;
_random = robustRandom;
_accessReader = accessReader;
+ IoCManager.InjectDependencies(this);
+ _spriteSystem = _entManager.System();
_maxLength = maxLength;
_currentFilterType = StationRecordFilterType.Name;
+ _currentCrewListFilter = SecurityStatus.None;
+
OpenCentered();
foreach (var item in Enum.GetValues())
@@ -71,6 +84,12 @@ public CriminalRecordsConsoleWindow(EntityUid console, uint maxLength, IPlayerMa
AddStatusSelect(status);
}
+ //Populate status to filter crew list
+ foreach (var item in Enum.GetValues())
+ {
+ CrewListFilter.AddItem(GetCrewListFilterLocals(item), (int)item);
+ }
+
OnClose += () => _reasonDialog?.Close();
RecordListing.OnItemSelected += args =>
@@ -97,6 +116,20 @@ public CriminalRecordsConsoleWindow(EntityUid console, uint maxLength, IPlayerMa
}
};
+ //Select Status to filter crew
+ CrewListFilter.OnItemSelected += eventArgs =>
+ {
+ var type = (SecurityStatus)eventArgs.Id;
+
+ if (_currentCrewListFilter != type)
+ {
+ _currentCrewListFilter = type;
+
+ StatusFilterPressed(type);
+
+ }
+ };
+
FilterText.OnTextEntered += args =>
{
FilterListingOfRecords(args.Text);
@@ -104,16 +137,21 @@ public CriminalRecordsConsoleWindow(EntityUid console, uint maxLength, IPlayerMa
StatusOptionButton.OnItemSelected += args =>
{
- SetStatus((SecurityStatus) args.Id);
+ SetStatus((SecurityStatus)args.Id);
};
HistoryButton.OnPressed += _ =>
{
- if (_selectedRecord is {} record)
+ if (_selectedRecord is { } record)
OnHistoryUpdated?.Invoke(record, _access, true);
};
}
+ public void StatusFilterPressed(SecurityStatus statusSelected)
+ {
+ OnStatusFilterPressed?.Invoke(statusSelected);
+ }
+
public void UpdateState(CriminalRecordsConsoleState state)
{
if (state.Filter != null)
@@ -129,10 +167,14 @@ public void UpdateState(CriminalRecordsConsoleState state)
}
}
- _selectedKey = state.SelectedKey;
+ if (state.FilterStatus != _currentCrewListFilter)
+ {
+ _currentCrewListFilter = state.FilterStatus;
+ }
+ _selectedKey = state.SelectedKey;
FilterType.SelectId((int)_currentFilterType);
-
+ CrewListFilter.SelectId((int)_currentCrewListFilter);
NoRecords.Visible = state.RecordListing == null || state.RecordListing.Count == 0;
PopulateRecordListing(state.RecordListing);
@@ -179,7 +221,7 @@ private void PopulateRecordListing(Dictionary? listing)
// in parallel to synchronize the items in RecordListing with `entries`.
int i = RecordListing.Count - 1;
int j = entries.Count - 1;
- while(i >= 0 && j >= 0)
+ while (i >= 0 && j >= 0)
{
var strcmp = string.Compare(RecordListing[i].Text, entries[j].Value, StringComparison.Ordinal);
if (strcmp == 0)
@@ -212,24 +254,48 @@ private void PopulateRecordListing(Dictionary? listing)
// And finally, any remaining items in `entries`, don't exist in RecordListing. Create them.
while (j >= 0)
{
- RecordListing.Insert(0, new ItemList.Item(RecordListing){Text = entries[j].Value, Metadata = entries[j].Key});
+ RecordListing.Insert(0, new ItemList.Item(RecordListing){ Text = entries[j].Value, Metadata = entries[j].Key });
j--;
}
}
-
private void PopulateRecordContainer(GeneralStationRecord stationRecord, CriminalRecord criminalRecord)
{
+ var specifier = new SpriteSpecifier.Rsi(new ResPath("Interface/Misc/job_icons.rsi"), "Unknown");
var na = Loc.GetString("generic-not-available-shorthand");
PersonName.Text = stationRecord.Name;
PersonGender.Text = Loc.GetString("general-station-record-console-record-gender", ("gender", stationRecord.Gender));
+ PersonJob.Text = stationRecord.JobTitle ?? na;
PersonPrints.Text = Loc.GetString("general-station-record-console-record-fingerprint", ("fingerprint", stationRecord.Fingerprint ?? na));
PersonDna.Text = Loc.GetString("general-station-record-console-record-dna", ("dna", stationRecord.DNA ?? na));
- StatusOptionButton.SelectId((int) criminalRecord.Status);
- if (criminalRecord.Reason is {} reason)
+
+ // Job icon
+ if (_proto.TryIndex(stationRecord.JobIcon, out var proto))
+ {
+ PersonJobIcon.Texture = _spriteSystem.Frame0(proto.Icon);
+ }
+
+ PersonPrints.Text = stationRecord.Fingerprint ?? Loc.GetString("generic-not-available-shorthand");
+ PersonDna.Text = stationRecord.DNA ?? Loc.GetString("generic-not-available-shorthand");
+
+ if (criminalRecord.Status != SecurityStatus.None)
+ {
+ specifier = new SpriteSpecifier.Rsi(new ResPath("Interface/Misc/security_icons.rsi"), GetStatusIcon(criminalRecord.Status));
+ }
+ PersonStatusTX.SetFromSpriteSpecifier(specifier);
+ PersonStatusTX.DisplayRect.TextureScale = new Vector2(3f, 3f);
+
+ StatusOptionButton.SelectId((int)criminalRecord.Status);
+ if (criminalRecord.Reason is { } reason)
{
var message = FormattedMessage.FromMarkupOrThrow(Loc.GetString("criminal-records-console-wanted-reason"));
+
+ if (criminalRecord.Status == SecurityStatus.Suspected)
+ {
+ message = FormattedMessage.FromMarkupOrThrow(Loc.GetString("criminal-records-console-suspected-reason"));
+ }
message.AddText($": {reason}");
+
WantedReason.SetMessage(message);
WantedReason.Visible = true;
}
@@ -289,9 +355,37 @@ private void GetReason(SecurityStatus status)
_reasonDialog.OnClose += () => { _reasonDialog = null; };
}
-
+ private string GetStatusIcon(SecurityStatus status)
+ {
+ return status switch
+ {
+ SecurityStatus.Paroled => "hud_paroled",
+ SecurityStatus.Wanted => "hud_wanted",
+ SecurityStatus.Detained => "hud_incarcerated",
+ SecurityStatus.Discharged => "hud_discharged",
+ SecurityStatus.Suspected => "hud_suspected",
+ _ => "SecurityIconNone"
+ };
+ }
private string GetTypeFilterLocals(StationRecordFilterType type)
{
return Loc.GetString($"criminal-records-{type.ToString().ToLower()}-filter");
}
+
+ private string GetCrewListFilterLocals(SecurityStatus type)
+ {
+ string result;
+
+ // If "NONE" override to "show all"
+ if (type == SecurityStatus.None)
+ {
+ result = Loc.GetString("criminal-records-console-show-all");
+ }
+ else
+ {
+ result = Loc.GetString($"criminal-records-status-{type.ToString().ToLower()}");
+ }
+
+ return result;
+ }
}
diff --git a/Content.Client/DisplacementMap/DisplacementMapSystem.cs b/Content.Client/DisplacementMap/DisplacementMapSystem.cs
index 6db164a09f09..05d10a9c6409 100644
--- a/Content.Client/DisplacementMap/DisplacementMapSystem.cs
+++ b/Content.Client/DisplacementMap/DisplacementMapSystem.cs
@@ -12,7 +12,14 @@ public sealed class DisplacementMapSystem : EntitySystem
public bool TryAddDisplacement(DisplacementData data, SpriteComponent sprite, int index, string key, HashSet revealedLayers)
{
if (data.ShaderOverride != null)
- sprite.LayerSetShader(index, data.ShaderOverride);
+ {
+ //imp edit start - replaced the simple shader replacement w/ a ternary that checks if the layer is unshaded before setting the shader
+ sprite.LayerSetShader(index,
+ sprite[index] is SpriteComponent.Layer { ShaderPrototype: "unshaded" }
+ ? data.ShaderOverrideUnshaded
+ : data.ShaderOverride);
+ //imp edit end
+ }
var displacementKey = $"{key}-displacement";
if (!revealedLayers.Add(displacementKey))
diff --git a/Content.Client/Doors/DoorSystem.cs b/Content.Client/Doors/DoorSystem.cs
index bc52730b0e7b..5e3de813d653 100644
--- a/Content.Client/Doors/DoorSystem.cs
+++ b/Content.Client/Doors/DoorSystem.cs
@@ -21,112 +21,131 @@ public override void Initialize()
protected override void OnComponentInit(Entity ent, ref ComponentInit args)
{
var comp = ent.Comp;
- comp.OpenSpriteStates = new(2);
- comp.ClosedSpriteStates = new(2);
+ comp.OpenSpriteStates = new List<(DoorVisualLayers, string)>(2);
+ comp.ClosedSpriteStates = new List<(DoorVisualLayers, string)>(2);
comp.OpenSpriteStates.Add((DoorVisualLayers.Base, comp.OpenSpriteState));
comp.ClosedSpriteStates.Add((DoorVisualLayers.Base, comp.ClosedSpriteState));
- comp.OpeningAnimation = new Animation()
+ comp.OpeningAnimation = new Animation
{
Length = TimeSpan.FromSeconds(comp.OpeningAnimationTime),
AnimationTracks =
{
- new AnimationTrackSpriteFlick()
+ new AnimationTrackSpriteFlick
{
LayerKey = DoorVisualLayers.Base,
- KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(comp.OpeningSpriteState, 0f) }
- }
+ KeyFrames =
+ {
+ new AnimationTrackSpriteFlick.KeyFrame(comp.OpeningSpriteState, 0f),
+ },
+ },
},
};
- comp.ClosingAnimation = new Animation()
+ comp.ClosingAnimation = new Animation
{
Length = TimeSpan.FromSeconds(comp.ClosingAnimationTime),
AnimationTracks =
{
- new AnimationTrackSpriteFlick()
+ new AnimationTrackSpriteFlick
{
LayerKey = DoorVisualLayers.Base,
- KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(comp.ClosingSpriteState, 0f) }
- }
+ KeyFrames =
+ {
+ new AnimationTrackSpriteFlick.KeyFrame(comp.ClosingSpriteState, 0f),
+ },
+ },
},
};
- comp.EmaggingAnimation = new Animation ()
+ comp.EmaggingAnimation = new Animation
{
Length = TimeSpan.FromSeconds(comp.EmaggingAnimationTime),
AnimationTracks =
{
- new AnimationTrackSpriteFlick()
+ new AnimationTrackSpriteFlick
{
LayerKey = DoorVisualLayers.BaseUnlit,
- KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(comp.EmaggingSpriteState, 0f) }
- }
+ KeyFrames =
+ {
+ new AnimationTrackSpriteFlick.KeyFrame(comp.EmaggingSpriteState, 0f),
+ },
+ },
},
};
}
- private void OnAppearanceChange(EntityUid uid, DoorComponent comp, ref AppearanceChangeEvent args)
+ private void OnAppearanceChange(Entity entity, ref AppearanceChangeEvent args)
{
if (args.Sprite == null)
return;
- if(!AppearanceSystem.TryGetData(uid, DoorVisuals.State, out var state, args.Component))
+ if (!AppearanceSystem.TryGetData(entity, DoorVisuals.State, out var state, args.Component))
state = DoorState.Closed;
- if (AppearanceSystem.TryGetData(uid, DoorVisuals.BaseRSI, out var baseRsi, args.Component))
- {
- if (!_resourceCache.TryGetResource(SpriteSpecifierSerializer.TextureRoot / baseRsi, out var res))
- {
- Log.Error("Unable to load RSI '{0}'. Trace:\n{1}", baseRsi, Environment.StackTrace);
- }
- foreach (var layer in args.Sprite.AllLayers)
- {
- layer.Rsi = res?.RSI;
- }
- }
+ if (AppearanceSystem.TryGetData(entity, DoorVisuals.BaseRSI, out var baseRsi, args.Component))
+ UpdateSpriteLayers(args.Sprite, baseRsi);
- TryComp(uid, out var animPlayer);
- if (_animationSystem.HasRunningAnimation(uid, animPlayer, DoorComponent.AnimationKey))
- _animationSystem.Stop(uid, animPlayer, DoorComponent.AnimationKey); // Halt all running anomations.
+ if (_animationSystem.HasRunningAnimation(entity, DoorComponent.AnimationKey))
+ _animationSystem.Stop(entity.Owner, DoorComponent.AnimationKey);
- args.Sprite.DrawDepth = comp.ClosedDrawDepth;
- switch(state)
+ UpdateAppearanceForDoorState(entity, args.Sprite, state);
+ }
+
+ private void UpdateAppearanceForDoorState(Entity entity, SpriteComponent sprite, DoorState state)
+ {
+ sprite.DrawDepth = state is DoorState.Open ? entity.Comp.OpenDrawDepth : entity.Comp.ClosedDrawDepth;
+
+ switch (state)
{
case DoorState.Open:
- args.Sprite.DrawDepth = comp.OpenDrawDepth;
- foreach(var (layer, layerState) in comp.OpenSpriteStates)
+ foreach (var (layer, layerState) in entity.Comp.OpenSpriteStates)
{
- args.Sprite.LayerSetState(layer, layerState);
+ sprite.LayerSetState(layer, layerState);
}
- break;
+
+ return;
case DoorState.Closed:
- foreach(var (layer, layerState) in comp.ClosedSpriteStates)
+ foreach (var (layer, layerState) in entity.Comp.ClosedSpriteStates)
{
- args.Sprite.LayerSetState(layer, layerState);
+ sprite.LayerSetState(layer, layerState);
}
- break;
+
+ return;
case DoorState.Opening:
- if (animPlayer != null && comp.OpeningAnimationTime != 0.0)
- _animationSystem.Play((uid, animPlayer), (Animation)comp.OpeningAnimation, DoorComponent.AnimationKey);
- break;
+ if (entity.Comp.OpeningAnimationTime == 0.0)
+ return;
+
+ _animationSystem.Play(entity, (Animation)entity.Comp.OpeningAnimation, DoorComponent.AnimationKey);
+
+ return;
case DoorState.Closing:
- if (animPlayer != null && comp.ClosingAnimationTime != 0.0 && comp.CurrentlyCrushing.Count == 0)
- _animationSystem.Play((uid, animPlayer), (Animation)comp.ClosingAnimation, DoorComponent.AnimationKey);
- break;
+ if (entity.Comp.ClosingAnimationTime == 0.0 || entity.Comp.CurrentlyCrushing.Count != 0)
+ return;
+
+ _animationSystem.Play(entity, (Animation)entity.Comp.ClosingAnimation, DoorComponent.AnimationKey);
+
+ return;
case DoorState.Denying:
- if (animPlayer != null)
- _animationSystem.Play((uid, animPlayer), (Animation)comp.DenyingAnimation, DoorComponent.AnimationKey);
- break;
- case DoorState.Welded:
- break;
+ _animationSystem.Play(entity, (Animation)entity.Comp.DenyingAnimation, DoorComponent.AnimationKey);
+
+ return;
case DoorState.Emagging:
- if (animPlayer != null)
- _animationSystem.Play((uid, animPlayer), (Animation)comp.EmaggingAnimation, DoorComponent.AnimationKey);
- break;
- default:
- throw new ArgumentOutOfRangeException($"Invalid door visual state {state}");
+ _animationSystem.Play(entity, (Animation)entity.Comp.EmaggingAnimation, DoorComponent.AnimationKey);
+
+ return;
}
}
+
+ private void UpdateSpriteLayers(SpriteComponent sprite, string baseRsi)
+ {
+ if (!_resourceCache.TryGetResource(SpriteSpecifierSerializer.TextureRoot / baseRsi, out var res))
+ {
+ Log.Error("Unable to load RSI '{0}'. Trace:\n{1}", baseRsi, Environment.StackTrace);
+ return;
+ }
+
+ sprite.BaseRSI = res.RSI;
+ }
}
diff --git a/Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs b/Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs
index 3897b1b949ca..1b65eac6ed95 100644
--- a/Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs
+++ b/Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs
@@ -51,7 +51,6 @@ private void RefreshUI()
var button = new GhostRoleRadioMenuButton()
{
- StyleClasses = { "RadialMenuButton" },
SetSize = new Vector2(64, 64),
ToolTip = Loc.GetString(ghostRoleProto.Name),
ProtoId = ghostRoleProto.ID,
@@ -100,7 +99,7 @@ private void AddGhostRoleRadioMenuButtonOnClickActions(Control control)
}
}
-public sealed class GhostRoleRadioMenuButton : RadialMenuTextureButton
+public sealed class GhostRoleRadioMenuButton : RadialMenuTextureButtonWithSector
{
public ProtoId ProtoId { get; set; }
}
diff --git a/Content.Client/Holopad/HolopadSystem.cs b/Content.Client/Holopad/HolopadSystem.cs
index 3bd556f1fc23..6aad39fe2473 100644
--- a/Content.Client/Holopad/HolopadSystem.cs
+++ b/Content.Client/Holopad/HolopadSystem.cs
@@ -2,45 +2,38 @@
using Content.Shared.Holopad;
using Robust.Client.GameObjects;
using Robust.Client.Graphics;
-using Robust.Client.Player;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
using System.Linq;
+using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
namespace Content.Client.Holopad;
public sealed class HolopadSystem : SharedHolopadSystem
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
- [Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IGameTiming _timing = default!;
public override void Initialize()
{
base.Initialize();
- SubscribeLocalEvent(OnComponentInit);
+ SubscribeLocalEvent(OnComponentStartup);
SubscribeLocalEvent(OnShaderRender);
SubscribeAllEvent(OnTypingChanged);
-
- SubscribeNetworkEvent(OnPlayerSpriteStateRequest);
- SubscribeNetworkEvent(OnPlayerSpriteStateMessage);
}
- private void OnComponentInit(EntityUid uid, HolopadHologramComponent component, ComponentInit ev)
+ private void OnComponentStartup(Entity entity, ref ComponentStartup ev)
{
- if (!TryComp(uid, out var sprite))
- return;
-
- UpdateHologramSprite(uid);
+ UpdateHologramSprite(entity, entity.Comp.LinkedEntity);
}
- private void OnShaderRender(EntityUid uid, HolopadHologramComponent component, BeforePostShaderRenderEvent ev)
+ private void OnShaderRender(Entity entity, ref BeforePostShaderRenderEvent ev)
{
if (ev.Sprite.PostShader == null)
return;
- ev.Sprite.PostShader.SetParameter("t", (float)_timing.CurTime.TotalSeconds * component.ScrollRate);
+ UpdateHologramSprite(entity, entity.Comp.LinkedEntity);
}
private void OnTypingChanged(TypingChangedEvent ev, EntitySessionEventArgs args)
@@ -57,100 +50,66 @@ private void OnTypingChanged(TypingChangedEvent ev, EntitySessionEventArgs args)
RaiseNetworkEvent(netEv);
}
- private void OnPlayerSpriteStateRequest(PlayerSpriteStateRequest ev)
+ private void UpdateHologramSprite(EntityUid hologram, EntityUid? target)
{
- var targetPlayer = GetEntity(ev.TargetPlayer);
- var player = _playerManager.LocalSession?.AttachedEntity;
-
- // Ignore the request if received by a player who isn't the target
- if (targetPlayer != player)
+ // Get required components
+ if (!TryComp(hologram, out var hologramSprite) ||
+ !TryComp(hologram, out var holopadhologram))
return;
- if (!TryComp(player, out var playerSprite))
- return;
-
- var spriteLayerData = new List();
+ // Remove all sprite layers
+ for (int i = hologramSprite.AllLayers.Count() - 1; i >= 0; i--)
+ hologramSprite.RemoveLayer(i);
- if (playerSprite.Visible)
+ if (TryComp(target, out var targetSprite))
{
- // Record the RSI paths, state names and shader paramaters of all visible layers
- for (int i = 0; i < playerSprite.AllLayers.Count(); i++)
+ // Use the target's holographic avatar (if available)
+ if (TryComp(target, out var targetAvatar) &&
+ targetAvatar.LayerData != null)
{
- if (!playerSprite.TryGetLayer(i, out var layer))
- continue;
-
- if (!layer.Visible ||
- string.IsNullOrEmpty(layer.ActualRsi?.Path.ToString()) ||
- string.IsNullOrEmpty(layer.State.Name))
- continue;
-
- var layerDatum = new PrototypeLayerData();
- layerDatum.RsiPath = layer.ActualRsi.Path.ToString();
- layerDatum.State = layer.State.Name;
-
- if (layer.CopyToShaderParameters != null)
+ for (int i = 0; i < targetAvatar.LayerData.Length; i++)
{
- var key = (string)layer.CopyToShaderParameters.LayerKey;
-
- if (playerSprite.LayerMapTryGet(key, out var otherLayerIdx) &&
- playerSprite.TryGetLayer(otherLayerIdx, out var otherLayer) &&
- otherLayer.Visible)
- {
- layerDatum.MapKeys = new() { key };
-
- layerDatum.CopyToShaderParameters = new PrototypeCopyToShaderParameters()
- {
- LayerKey = key,
- ParameterTexture = layer.CopyToShaderParameters.ParameterTexture,
- ParameterUV = layer.CopyToShaderParameters.ParameterUV
- };
- }
+ var layer = targetAvatar.LayerData[i];
+ hologramSprite.AddLayer(targetAvatar.LayerData[i], i);
}
+ }
- spriteLayerData.Add(layerDatum);
+ // Otherwise copy the target's current physical appearance
+ else
+ {
+ hologramSprite.CopyFrom(targetSprite);
}
}
- // Return the recorded data to the server
- var evResponse = new PlayerSpriteStateMessage(ev.TargetPlayer, spriteLayerData.ToArray());
- RaiseNetworkEvent(evResponse);
- }
-
- private void OnPlayerSpriteStateMessage(PlayerSpriteStateMessage ev)
- {
- UpdateHologramSprite(GetEntity(ev.SpriteEntity), ev.SpriteLayerData);
- }
-
- private void UpdateHologramSprite(EntityUid uid, PrototypeLayerData[]? layerData = null)
- {
- if (!TryComp(uid, out var hologramSprite))
- return;
-
- if (!TryComp(uid, out var holopadhologram))
- return;
+ // There is no target, display a default sprite instead (if available)
+ else
+ {
+ if (string.IsNullOrEmpty(holopadhologram.RsiPath) || string.IsNullOrEmpty(holopadhologram.RsiState))
+ return;
- for (int i = hologramSprite.AllLayers.Count() - 1; i >= 0; i--)
- hologramSprite.RemoveLayer(i);
+ var layer = new PrototypeLayerData();
+ layer.RsiPath = holopadhologram.RsiPath;
+ layer.State = holopadhologram.RsiState;
- if (layerData == null || layerData.Length == 0)
- {
- layerData = new PrototypeLayerData[1];
- layerData[0] = new PrototypeLayerData()
- {
- RsiPath = holopadhologram.RsiPath,
- State = holopadhologram.RsiState
- };
+ hologramSprite.AddLayer(layer);
}
- for (int i = 0; i < layerData.Length; i++)
- {
- var layer = layerData[i];
- layer.Shader = "unshaded";
+ // Override specific values
+ hologramSprite.Color = Color.White;
+ hologramSprite.Offset = holopadhologram.Offset;
+ hologramSprite.DrawDepth = (int)DrawDepth.Mobs;
+ hologramSprite.NoRotation = true;
+ hologramSprite.DirectionOverride = Direction.South;
+ hologramSprite.EnableDirectionOverride = true;
- hologramSprite.AddLayer(layerData[i], i);
+ // Remove shading from all layers (except displacement maps)
+ for (int i = 0; i < hologramSprite.AllLayers.Count(); i++)
+ {
+ if (hologramSprite.TryGetLayer(i, out var layer) && layer.ShaderPrototype != "DisplacedStencilDraw")
+ hologramSprite.LayerSetShader(i, "unshaded");
}
- UpdateHologramShader(uid, hologramSprite, holopadhologram);
+ UpdateHologramShader(hologram, hologramSprite, holopadhologram);
}
private void UpdateHologramShader(EntityUid uid, SpriteComponent sprite, HolopadHologramComponent holopadHologram)
diff --git a/Content.Client/Labels/UI/HandLabelerWindow.xaml.cs b/Content.Client/Labels/UI/HandLabelerWindow.xaml.cs
index 7a0627b3e236..528e227f552a 100644
--- a/Content.Client/Labels/UI/HandLabelerWindow.xaml.cs
+++ b/Content.Client/Labels/UI/HandLabelerWindow.xaml.cs
@@ -33,8 +33,13 @@ public HandLabelerWindow()
_focused = false;
LabelLineEdit.Text = _label;
};
+ }
- // Give the editor keybard focus, since that's the only
+ protected override void Opened()
+ {
+ base.Opened();
+
+ // Give the editor keyboard focus, since that's the only
// thing the user will want to be doing with this UI
LabelLineEdit.GrabKeyboardFocus();
}
diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs
index 13cf281513d2..7d1921816ffa 100644
--- a/Content.Client/LateJoin/LateJoinGui.cs
+++ b/Content.Client/LateJoin/LateJoinGui.cs
@@ -170,7 +170,7 @@ private void RebuildUI()
foreach (var department in departments)
{
- var departmentName = Loc.GetString($"department-{department.ID}");
+ var departmentName = Loc.GetString(department.Name);
_jobCategories[id] = new Dictionary();
var stationAvailable = _gameTicker.JobsAvailable[id];
var jobsAvailable = new List();
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index 0212ce371e64..a131b879987d 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -839,7 +839,7 @@ public void RefreshJobs()
foreach (var department in departments)
{
- var departmentName = Loc.GetString($"department-{department.ID}");
+ var departmentName = Loc.GetString(department.Name);
if (!_jobCategories.TryGetValue(department.ID, out var category))
{
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
index 179a2c25c029..ac23e8216b23 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
@@ -25,6 +25,7 @@ public sealed partial class CrewMonitoringWindow : FancyWindow
{
[Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+ private readonly SharedTransformSystem _transformSystem;
private readonly SpriteSystem _spriteSystem;
private NetEntity? _trackedEntity;
@@ -36,10 +37,10 @@ public CrewMonitoringWindow()
RobustXamlLoader.Load(this);
IoCManager.InjectDependencies(this);
+ _transformSystem = _entManager.System();
_spriteSystem = _entManager.System();
NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap;
-
}
public void Set(string stationName, EntityUid? mapUid)
@@ -290,7 +291,7 @@ private void PopulateDepartmentList(IEnumerable departmentSens
{
NavMap.TrackedEntities.TryAdd(sensor.SuitSensorUid,
new NavMapBlip
- (coordinates.Value,
+ (CoordinatesToLocal(coordinates.Value),
_blipTexture,
(_trackedEntity == null || sensor.SuitSensorUid == _trackedEntity) ? Color.LimeGreen : Color.LimeGreen * Color.DimGray,
sensor.SuitSensorUid == _trackedEntity));
@@ -356,7 +357,7 @@ private void UpdateSensorsTable(NetEntity? currTrackedEntity, NetEntity? prevTra
if (NavMap.TrackedEntities.TryGetValue(castSensor.SuitSensorUid, out var data))
{
data = new NavMapBlip
- (data.Coordinates,
+ (CoordinatesToLocal(data.Coordinates),
data.Texture,
(currTrackedEntity == null || castSensor.SuitSensorUid == currTrackedEntity) ? Color.LimeGreen : Color.LimeGreen * Color.DimGray,
castSensor.SuitSensorUid == currTrackedEntity);
@@ -421,6 +422,26 @@ private bool TryGetNextScrollPosition([NotNullWhen(true)] out float? nextScrollP
return false;
}
+ ///
+ /// Converts the input coordinates to an EntityCoordinates which are in
+ /// reference to the grid that the map is displaying. This is a stylistic
+ /// choice; this window deliberately limits the rate that blips update,
+ /// but if the blip is attached to another grid which is moving, that
+ /// blip will move smoothly, unlike the others. By converting the
+ /// coordinates, we are back in control of the blip movement.
+ ///
+ private EntityCoordinates CoordinatesToLocal(EntityCoordinates refCoords)
+ {
+ if (NavMap.MapUid != null)
+ {
+ return _transformSystem.WithEntityId(refCoords, (EntityUid)NavMap.MapUid);
+ }
+ else
+ {
+ return refCoords;
+ }
+ }
+
private void ClearOutDatedData()
{
SensorsTable.RemoveAllChildren();
diff --git a/Content.Client/Movement/Components/EyeCursorOffsetComponent.cs b/Content.Client/Movement/Components/EyeCursorOffsetComponent.cs
new file mode 100644
index 000000000000..5ed1bf4a6cd4
--- /dev/null
+++ b/Content.Client/Movement/Components/EyeCursorOffsetComponent.cs
@@ -0,0 +1,19 @@
+using System.Numerics;
+using Content.Client.Movement.Systems;
+using Content.Shared.Movement.Components;
+
+namespace Content.Client.Movement.Components;
+
+[RegisterComponent]
+public sealed partial class EyeCursorOffsetComponent : SharedEyeCursorOffsetComponent
+{
+ ///
+ /// The location the offset will attempt to pan towards; based on the cursor's position in the game window.
+ ///
+ public Vector2 TargetPosition = Vector2.Zero;
+
+ ///
+ /// The current positional offset being applied. Used to enable gradual panning.
+ ///
+ public Vector2 CurrentPosition = Vector2.Zero;
+}
diff --git a/Content.Client/Movement/Systems/ContentEyeSystem.cs b/Content.Client/Movement/Systems/ContentEyeSystem.cs
index 9fbd4b5c37d0..518a4a1bd40a 100644
--- a/Content.Client/Movement/Systems/ContentEyeSystem.cs
+++ b/Content.Client/Movement/Systems/ContentEyeSystem.cs
@@ -1,6 +1,7 @@
using System.Numerics;
using Content.Shared.Movement.Components;
using Content.Shared.Movement.Systems;
+using Robust.Client.GameObjects;
using Robust.Client.Player;
namespace Content.Client.Movement.Systems;
@@ -52,4 +53,14 @@ public void RequestEye(bool drawFov, bool drawLight)
{
RaisePredictiveEvent(new RequestEyeEvent(drawFov, drawLight));
}
+
+ public override void FrameUpdate(float frameTime)
+ {
+ base.FrameUpdate(frameTime);
+ var eyeEntities = AllEntityQuery();
+ while (eyeEntities.MoveNext(out var entity, out ContentEyeComponent? contentComponent, out EyeComponent? eyeComponent))
+ {
+ UpdateEyeOffset((entity, eyeComponent));
+ }
+ }
}
diff --git a/Content.Client/Movement/Systems/EyeCursorOffsetSystem.cs b/Content.Client/Movement/Systems/EyeCursorOffsetSystem.cs
new file mode 100644
index 000000000000..f3bff9ef0c95
--- /dev/null
+++ b/Content.Client/Movement/Systems/EyeCursorOffsetSystem.cs
@@ -0,0 +1,91 @@
+using System.Numerics;
+using Content.Client.Movement.Components;
+using Content.Shared.Camera;
+using Content.Shared.Inventory;
+using Content.Shared.Movement.Systems;
+using Robust.Client.Graphics;
+using Robust.Client.Input;
+using Robust.Shared.Map;
+using Robust.Client.Player;
+
+namespace Content.Client.Movement.Systems;
+
+public partial class EyeCursorOffsetSystem : EntitySystem
+{
+ [Dependency] private readonly IEyeManager _eyeManager = default!;
+ [Dependency] private readonly IInputManager _inputManager = default!;
+ [Dependency] private readonly IPlayerManager _player = default!;
+ [Dependency] private readonly SharedTransformSystem _transform = default!;
+ [Dependency] private readonly SharedContentEyeSystem _contentEye = default!;
+ [Dependency] private readonly IMapManager _mapManager = default!;
+ [Dependency] private readonly IClyde _clyde = default!;
+
+ // This value is here to make sure the user doesn't have to move their mouse
+ // all the way out to the edge of the screen to get the full offset.
+ static private float _edgeOffset = 0.9f;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnGetEyeOffsetEvent);
+ }
+
+ private void OnGetEyeOffsetEvent(EntityUid uid, EyeCursorOffsetComponent component, ref GetEyeOffsetEvent args)
+ {
+ var offset = OffsetAfterMouse(uid, component);
+ if (offset == null)
+ return;
+
+ args.Offset += offset.Value;
+ }
+
+ public Vector2? OffsetAfterMouse(EntityUid uid, EyeCursorOffsetComponent? component)
+ {
+ var localPlayer = _player.LocalPlayer?.ControlledEntity;
+ var mousePos = _inputManager.MouseScreenPosition;
+ var screenSize = _clyde.MainWindow.Size;
+ var minValue = MathF.Min(screenSize.X / 2, screenSize.Y / 2) * _edgeOffset;
+
+ var mouseNormalizedPos = new Vector2(-(mousePos.X - screenSize.X / 2) / minValue, (mousePos.Y - screenSize.Y / 2) / minValue); // X needs to be inverted here for some reason, otherwise it ends up flipped.
+
+ if (localPlayer == null)
+ return null;
+
+ var playerPos = _transform.GetWorldPosition(localPlayer.Value);
+
+ if (component == null)
+ {
+ component = EnsureComp(uid);
+ }
+
+ // Doesn't move the offset if the mouse has left the game window!
+ if (mousePos.Window != WindowId.Invalid)
+ {
+ // The offset must account for the in-world rotation.
+ var eyeRotation = _eyeManager.CurrentEye.Rotation;
+ var mouseActualRelativePos = Vector2.Transform(mouseNormalizedPos, System.Numerics.Quaternion.CreateFromAxisAngle(-System.Numerics.Vector3.UnitZ, (float)(eyeRotation.Opposite().Theta))); // I don't know, it just works.
+
+ // Caps the offset into a circle around the player.
+ mouseActualRelativePos *= component.MaxOffset;
+ if (mouseActualRelativePos.Length() > component.MaxOffset)
+ {
+ mouseActualRelativePos = mouseActualRelativePos.Normalized() * component.MaxOffset;
+ }
+
+ component.TargetPosition = mouseActualRelativePos;
+
+ //Makes the view not jump immediately when moving the cursor fast.
+ if (component.CurrentPosition != component.TargetPosition)
+ {
+ Vector2 vectorOffset = component.TargetPosition - component.CurrentPosition;
+ if (vectorOffset.Length() > component.OffsetSpeed)
+ {
+ vectorOffset = vectorOffset.Normalized() * component.OffsetSpeed;
+ }
+ component.CurrentPosition += vectorOffset;
+ }
+ }
+ return component.CurrentPosition;
+ }
+}
diff --git a/Content.Client/Options/UI/Tabs/AudioTab.xaml b/Content.Client/Options/UI/Tabs/AudioTab.xaml
index aafcfee74647..07d281b95f37 100644
--- a/Content.Client/Options/UI/Tabs/AudioTab.xaml
+++ b/Content.Client/Options/UI/Tabs/AudioTab.xaml
@@ -23,6 +23,7 @@
Text="{Loc 'ui-options-announcer-disable-multiple-sounds'}"
ToolTip="{Loc 'ui-options-announcer-disable-multiple-sounds-tooltip'}" />
+
diff --git a/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs b/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
index 27cc9399576a..24677c06362b 100644
--- a/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
@@ -1,3 +1,4 @@
+using Content.Client.Administration.Managers;
using Content.Client.Audio;
using Content.Shared._EinsteinEngines.CCVar;
using Content.Shared._Impstation.CCVar;
@@ -14,8 +15,9 @@ namespace Content.Client.Options.UI.Tabs;
[GenerateTypedNameReferences]
public sealed partial class AudioTab : Control
{
- [Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly IAudioManager _audio = default!;
+ [Dependency] private readonly IClientAdminManager _admin = default!;
+ [Dependency] private readonly IConfigurationManager _cfg = default!;
public AudioTab()
{
@@ -69,10 +71,30 @@ public AudioTab()
Control.AddOptionCheckBox(CCVars.EventMusicEnabled, EventMusicCheckBox);
Control.AddOptionCheckBox(EinsteinCCVars.AnnouncerDisableMultipleSounds, AnnouncerDisableMultipleSoundsCheckBox);
Control.AddOptionCheckBox(CCVars.AdminSoundsEnabled, AdminSoundsCheckBox);
+ Control.AddOptionCheckBox(CCVars.BwoinkSoundEnabled, BwoinkSoundCheckBox);
Control.Initialize();
}
+ protected override void EnteredTree()
+ {
+ base.EnteredTree();
+ _admin.AdminStatusUpdated += UpdateAdminButtonsVisibility;
+ UpdateAdminButtonsVisibility();
+ }
+
+ protected override void ExitedTree()
+ {
+ base.ExitedTree();
+ _admin.AdminStatusUpdated -= UpdateAdminButtonsVisibility;
+ }
+
+
+ private void UpdateAdminButtonsVisibility()
+ {
+ BwoinkSoundCheckBox.Visible = _admin.IsActive();
+ }
+
private void OnMasterVolumeSliderChanged(float value)
{
// TODO: I was thinking of giving OptionsTabControlRow a flag to "set CVar immediately", but I'm deferring that
diff --git a/Content.Client/Overlays/EquipmentHudSystem.cs b/Content.Client/Overlays/EquipmentHudSystem.cs
index 502a1f36274b..f3c556961a55 100644
--- a/Content.Client/Overlays/EquipmentHudSystem.cs
+++ b/Content.Client/Overlays/EquipmentHudSystem.cs
@@ -56,35 +56,35 @@ protected virtual void UpdateInternal(RefreshEquipmentHudEvent args) { }
protected virtual void DeactivateInternal() { }
- private void OnStartup(EntityUid uid, T component, ComponentStartup args)
+ private void OnStartup(Entity ent, ref ComponentStartup args)
{
- RefreshOverlay(uid);
+ RefreshOverlay();
}
- private void OnRemove(EntityUid uid, T component, ComponentRemove args)
+ private void OnRemove(Entity ent, ref ComponentRemove args)
{
- RefreshOverlay(uid);
+ RefreshOverlay();
}
private void OnPlayerAttached(LocalPlayerAttachedEvent args)
{
- RefreshOverlay(args.Entity);
+ RefreshOverlay();
}
private void OnPlayerDetached(LocalPlayerDetachedEvent args)
{
- if (_player.LocalSession?.AttachedEntity == null)
+ if (_player.LocalSession?.AttachedEntity is null)
Deactivate();
}
- private void OnCompEquip(EntityUid uid, T component, GotEquippedEvent args)
+ private void OnCompEquip(Entity ent, ref GotEquippedEvent args)
{
- RefreshOverlay(args.Equipee);
+ RefreshOverlay();
}
- private void OnCompUnequip(EntityUid uid, T component, GotUnequippedEvent args)
+ private void OnCompUnequip(Entity ent, ref GotUnequippedEvent args)
{
- RefreshOverlay(args.Equipee);
+ RefreshOverlay();
}
private void OnRoundRestart(RoundRestartCleanupEvent args)
@@ -92,24 +92,24 @@ private void OnRoundRestart(RoundRestartCleanupEvent args)
Deactivate();
}
- protected virtual void OnRefreshEquipmentHud(EntityUid uid, T component, InventoryRelayedEvent> args)
+ protected virtual void OnRefreshEquipmentHud(Entity ent, ref InventoryRelayedEvent> args)
{
- OnRefreshComponentHud(uid, component, args.Args);
+ OnRefreshComponentHud(ent, ref args.Args);
}
- protected virtual void OnRefreshComponentHud(EntityUid uid, T component, RefreshEquipmentHudEvent args)
+ protected virtual void OnRefreshComponentHud(Entity ent, ref RefreshEquipmentHudEvent args)
{
args.Active = true;
- args.Components.Add(component);
+ args.Components.Add(ent.Comp);
}
- protected void RefreshOverlay(EntityUid uid)
+ protected void RefreshOverlay()
{
- if (uid != _player.LocalSession?.AttachedEntity)
+ if (_player.LocalSession?.AttachedEntity is not { } entity)
return;
var ev = new RefreshEquipmentHudEvent(TargetSlots);
- RaiseLocalEvent(uid, ev);
+ RaiseLocalEvent(entity, ref ev);
if (ev.Active)
Update(ev);
diff --git a/Content.Client/Overlays/ShowHealthBarsSystem.cs b/Content.Client/Overlays/ShowHealthBarsSystem.cs
index b23209ff202b..9fefe93094ef 100644
--- a/Content.Client/Overlays/ShowHealthBarsSystem.cs
+++ b/Content.Client/Overlays/ShowHealthBarsSystem.cs
@@ -28,7 +28,7 @@ public override void Initialize()
private void OnHandleState(Entity ent, ref AfterAutoHandleStateEvent args)
{
- RefreshOverlay(ent);
+ RefreshOverlay();
}
protected override void UpdateInternal(RefreshEquipmentHudEvent component)
diff --git a/Content.Client/Overlays/ShowHealthIconsSystem.cs b/Content.Client/Overlays/ShowHealthIconsSystem.cs
index b4d845e4217a..3301261bd09e 100644
--- a/Content.Client/Overlays/ShowHealthIconsSystem.cs
+++ b/Content.Client/Overlays/ShowHealthIconsSystem.cs
@@ -47,7 +47,7 @@ protected override void DeactivateInternal()
private void OnHandleState(Entity ent, ref AfterAutoHandleStateEvent args)
{
- RefreshOverlay(ent);
+ RefreshOverlay();
}
private void OnGetStatusIconsEvent(Entity entity, ref GetStatusIconsEvent args)
diff --git a/Content.Client/Overlays/ShowMindShieldIconsSystem.cs b/Content.Client/Overlays/ShowMindShieldIconsSystem.cs
index cdb9c54fdfa4..8f8b8e640775 100644
--- a/Content.Client/Overlays/ShowMindShieldIconsSystem.cs
+++ b/Content.Client/Overlays/ShowMindShieldIconsSystem.cs
@@ -15,6 +15,16 @@ public override void Initialize()
base.Initialize();
SubscribeLocalEvent(OnGetStatusIconsEvent);
+ SubscribeLocalEvent(OnGetStatusIconsEventFake);
+ }
+ // TODO: Probably need to get this OFF of client since this can be read by bad actors rather easily
+ // ...imagine cheating in a game about silly paper dolls
+ private void OnGetStatusIconsEventFake(EntityUid uid, FakeMindShieldComponent component, ref GetStatusIconsEvent ev)
+ {
+ if(!IsActive)
+ return;
+ if (component.IsEnabled && _prototype.TryIndex(component.MindShieldStatusIcon, out var fakeStatusIconPrototype))
+ ev.StatusIcons.Add(fakeStatusIconPrototype);
}
private void OnGetStatusIconsEvent(EntityUid uid, MindShieldComponent component, ref GetStatusIconsEvent ev)
diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml
index 63f15837068a..7cef7d58b63d 100644
--- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml
+++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml
@@ -1,50 +1,129 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+ xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+ xmlns:ui="clr-namespace:Content.Client.ParticleAccelerator.UI"
+ Title="{Loc 'particle-accelerator-control-menu-device-version-label'}"
+ MinSize="320 120">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+
+
+
+
@@ -58,17 +137,47 @@
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/RCD/RCDMenu.xaml b/Content.Client/RCD/RCDMenu.xaml
index b3d5367a5fdd..d8ab0ac8f4c8 100644
--- a/Content.Client/RCD/RCDMenu.xaml
+++ b/Content.Client/RCD/RCDMenu.xaml
@@ -11,37 +11,37 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/Content.Client/RCD/RCDMenu.xaml.cs b/Content.Client/RCD/RCDMenu.xaml.cs
index f0d27d6b1fb8..7ea9894e41e2 100644
--- a/Content.Client/RCD/RCDMenu.xaml.cs
+++ b/Content.Client/RCD/RCDMenu.xaml.cs
@@ -74,7 +74,6 @@ public void Refresh()
var button = new RCDMenuButton()
{
- StyleClasses = { "RadialMenuButton" },
SetSize = new Vector2(64f, 64f),
ToolTip = tooltip,
ProtoId = protoId,
@@ -99,9 +98,7 @@ public void Refresh()
// is visible in the main radial container (as these all start with Visible = false)
foreach (var child in main.Children)
{
- var castChild = child as RadialMenuTextureButton;
-
- if (castChild is not RadialMenuTextureButton)
+ if (child is not RadialMenuTextureButton castChild)
continue;
if (castChild.TargetLayer == proto.Category)
@@ -169,12 +166,7 @@ private void AddRCDMenuButtonOnClickActions(Control control)
}
}
-public sealed class RCDMenuButton : RadialMenuTextureButton
+public sealed class RCDMenuButton : RadialMenuTextureButtonWithSector
{
public ProtoId ProtoId { get; set; }
-
- public RCDMenuButton()
- {
-
- }
}
diff --git a/Content.Client/Radiation/Systems/RadiationSystem.cs b/Content.Client/Radiation/Systems/RadiationSystem.cs
index 929ad6aa4ac5..f4f109adc7c3 100644
--- a/Content.Client/Radiation/Systems/RadiationSystem.cs
+++ b/Content.Client/Radiation/Systems/RadiationSystem.cs
@@ -9,7 +9,7 @@ public sealed class RadiationSystem : EntitySystem
{
[Dependency] private readonly IOverlayManager _overlayMan = default!;
- public List? Rays;
+ public List? Rays;
public Dictionary>? ResistanceGrids;
public override void Initialize()
diff --git a/Content.Client/Shuttles/UI/NavScreen.xaml.cs b/Content.Client/Shuttles/UI/NavScreen.xaml.cs
index 7236714ef29f..e4727e93660f 100644
--- a/Content.Client/Shuttles/UI/NavScreen.xaml.cs
+++ b/Content.Client/Shuttles/UI/NavScreen.xaml.cs
@@ -81,13 +81,19 @@ protected override void Draw(DrawingHandleScreen handle)
// Get the positive reduced angle.
var displayRot = -worldRot.Reduced();
- GridPosition.Text = $"{worldPos.X:0.0}, {worldPos.Y:0.0}";
- GridOrientation.Text = $"{displayRot.Degrees:0.0}";
+ GridPosition.Text = Loc.GetString("shuttle-console-position-value",
+ ("X", $"{worldPos.X:0.0}"),
+ ("Y", $"{worldPos.Y:0.0}"));
+ GridOrientation.Text = Loc.GetString("shuttle-console-orientation-value",
+ ("angle", $"{displayRot.Degrees:0.0}"));
var gridVelocity = gridBody.LinearVelocity;
gridVelocity = displayRot.RotateVec(gridVelocity);
// Get linear velocity relative to the console entity
- GridLinearVelocity.Text = $"{gridVelocity.X + 10f * float.Epsilon:0.0}, {gridVelocity.Y + 10f * float.Epsilon:0.0}";
- GridAngularVelocity.Text = $"{-gridBody.AngularVelocity + 10f * float.Epsilon:0.0}";
+ GridLinearVelocity.Text = Loc.GetString("shuttle-console-linear-velocity-value",
+ ("X", $"{gridVelocity.X + 10f * float.Epsilon:0.0}"),
+ ("Y", $"{gridVelocity.Y + 10f * float.Epsilon:0.0}"));
+ GridAngularVelocity.Text = Loc.GetString("shuttle-console-angular-velocity-value",
+ ("angularVelocity", $"{-MathHelper.RadiansToDegrees(gridBody.AngularVelocity) + 10f * float.Epsilon:0.0}"));
}
}
diff --git a/Content.Client/Silicons/StationAi/StationAiMenu.xaml b/Content.Client/Silicons/StationAi/StationAiMenu.xaml
index d56fc8328984..cfa0b93234e7 100644
--- a/Content.Client/Silicons/StationAi/StationAiMenu.xaml
+++ b/Content.Client/Silicons/StationAi/StationAiMenu.xaml
@@ -1,4 +1,4 @@
-
-
+
diff --git a/Content.Client/Silicons/StationAi/StationAiMenu.xaml.cs b/Content.Client/Silicons/StationAi/StationAiMenu.xaml.cs
index b152f5ead8b1..a536d911f3c4 100644
--- a/Content.Client/Silicons/StationAi/StationAiMenu.xaml.cs
+++ b/Content.Client/Silicons/StationAi/StationAiMenu.xaml.cs
@@ -54,7 +54,6 @@ private void BuildButtons()
// TODO: This radial boilerplate is quite annoying
var button = new StationAiMenuButton(action.Event)
{
- StyleClasses = { "RadialMenuButton" },
SetSize = new Vector2(64f, 64f),
ToolTip = action.Tooltip != null ? Loc.GetString(action.Tooltip) : null,
};
@@ -121,7 +120,7 @@ private void UpdatePosition()
}
}
-public sealed class StationAiMenuButton(BaseStationAiAction action) : RadialMenuTextureButton
+public sealed class StationAiMenuButton(BaseStationAiAction action) : RadialMenuTextureButtonWithSector
{
public BaseStationAiAction Action = action;
}
diff --git a/Content.Client/UserInterface/Controls/DialogWindow.xaml.cs b/Content.Client/UserInterface/Controls/DialogWindow.xaml.cs
index 733dbe326583..d831f6024774 100644
--- a/Content.Client/UserInterface/Controls/DialogWindow.xaml.cs
+++ b/Content.Client/UserInterface/Controls/DialogWindow.xaml.cs
@@ -87,9 +87,6 @@ public DialogWindow(string title, List entries, bool ok = true
Prompts.AddChild(box);
}
- // Grab keyboard focus for the first dialog entry
- _promptLines[0].Item2.GrabKeyboardFocus();
-
OkButton.OnPressed += _ => Confirm();
CancelButton.OnPressed += _ =>
@@ -110,6 +107,14 @@ public DialogWindow(string title, List entries, bool ok = true
OpenCentered();
}
+ protected override void Opened()
+ {
+ base.Opened();
+
+ // Grab keyboard focus for the first dialog entry
+ _promptLines[0].Item2.GrabKeyboardFocus();
+ }
+
private void Confirm()
{
var results = new Dictionary();
diff --git a/Content.Client/UserInterface/Controls/RadialContainer.cs b/Content.Client/UserInterface/Controls/RadialContainer.cs
index be9b8817a065..72555aab5f30 100644
--- a/Content.Client/UserInterface/Controls/RadialContainer.cs
+++ b/Content.Client/UserInterface/Controls/RadialContainer.cs
@@ -1,4 +1,3 @@
-using Robust.Client.Graphics;
using Robust.Client.UserInterface.Controls;
using System.Linq;
using System.Numerics;
@@ -8,6 +7,11 @@ namespace Content.Client.UserInterface.Controls;
[Virtual]
public class RadialContainer : LayoutContainer
{
+ ///
+ /// Increment of radius per child element to be rendered.
+ ///
+ private const float RadiusIncrement = 5f;
+
///
/// Specifies the anglular range, in radians, in which child elements will be placed.
/// The first value denotes the angle at which the first element is to be placed, and
@@ -49,10 +53,30 @@ public Vector2 AngularRange
public RAlignment RadialAlignment { get; set; } = RAlignment.Clockwise;
///
- /// Determines how far from the radial container's center that its child elements will be placed
+ /// Radial menu radius determines how far from the radial container's center its child elements will be placed.
+ /// To correctly display dynamic amount of elements control actually resizes depending on amount of child buttons,
+ /// but uses this property as base value for final radius calculation.
///
[ViewVariables(VVAccess.ReadWrite)]
- public float Radius { get; set; } = 100f;
+ public float InitialRadius { get; set; } = 100f;
+
+ ///
+ /// Radial menu radius determines how far from the radial container's center its child elements will be placed.
+ /// This is dynamically calculated (based on child button count) radius, result of and
+ /// multiplied by currently visible child button count.
+ ///
+ [ViewVariables(VVAccess.ReadOnly)]
+ public float CalculatedRadius { get; private set; }
+
+ ///
+ /// Determines radial menu button sectors inner radius, is a multiplier of .
+ ///
+ public float InnerRadiusMultiplier { get; set; } = 0.5f;
+
+ ///
+ /// Determines radial menu button sectors outer radius, is a multiplier of .
+ ///
+ public float OuterRadiusMultiplier { get; set; } = 1.5f;
///
/// Sets whether the container should reserve a space on the layout for child which are not currently visible
@@ -67,37 +91,74 @@ public RadialContainer()
{
}
-
- protected override void Draw(DrawingHandleScreen handle)
+
+ ///
+ protected override Vector2 ArrangeOverride(Vector2 finalSize)
{
-
- const float baseRadius = 100f;
- const float radiusIncrement = 5f;
-
- var children = ReserveSpaceForHiddenChildren ? Children : Children.Where(x => x.Visible);
+ var children = ReserveSpaceForHiddenChildren
+ ? Children
+ : Children.Where(x => x.Visible);
+
var childCount = children.Count();
-
- // Add padding from the center at higher child counts so they don't overlap.
- Radius = baseRadius + (childCount * radiusIncrement);
+
+ // Add padding from the center at higher child counts so they don't overlap.
+ CalculatedRadius = InitialRadius + (childCount * RadiusIncrement);
+
+ var isAntiClockwise = RadialAlignment == RAlignment.AntiClockwise;
// Determine the size of the arc, accounting for clockwise and anti-clockwise arrangements
var arc = AngularRange.Y - AngularRange.X;
- arc = (arc < 0) ? MathF.Tau + arc : arc;
- arc = (RadialAlignment == RAlignment.AntiClockwise) ? MathF.Tau - arc : arc;
+ arc = arc < 0
+ ? MathF.Tau + arc
+ : arc;
+ arc = isAntiClockwise
+ ? MathF.Tau - arc
+ : arc;
// Account for both circular arrangements and arc-based arrangements
- var childMod = MathHelper.CloseTo(arc, MathF.Tau, 0.01f) ? 0 : 1;
+ var childMod = MathHelper.CloseTo(arc, MathF.Tau, 0.01f)
+ ? 0
+ : 1;
// Determine the separation between child elements
var sepAngle = arc / (childCount - childMod);
- sepAngle *= (RadialAlignment == RAlignment.AntiClockwise) ? -1f : 1f;
+ sepAngle *= isAntiClockwise
+ ? -1f
+ : 1f;
+
+ var controlCenter = finalSize * 0.5f;
// Adjust the positions of all the child elements
- foreach (var (i, child) in children.Select((x, i) => (i, x)))
+ var query = children.Select((x, index) => (index, x));
+ foreach (var (childIndex, child) in query)
{
- var position = new Vector2(Radius * MathF.Sin(AngularRange.X + sepAngle * i) + Width / 2f - child.Width / 2f, -Radius * MathF.Cos(AngularRange.X + sepAngle * i) + Height / 2f - child.Height / 2f);
+ const float angleOffset = MathF.PI * 0.5f;
+
+ var targetAngleOfChild = AngularRange.X + sepAngle * (childIndex + 0.5f) + angleOffset;
+
+ // flooring values for snapping float values to physical grid -
+ // it prevents gaps and overlapping between different button segments
+ var position = new Vector2(
+ MathF.Floor(CalculatedRadius * MathF.Cos(targetAngleOfChild)),
+ MathF.Floor(-CalculatedRadius * MathF.Sin(targetAngleOfChild))
+ ) + controlCenter - child.DesiredSize * 0.5f + Position;
+
SetPosition(child, position);
+
+ // radial menu buttons with sector need to also know in which sector and around which point
+ // they should be rendered, how much space sector should should take etc.
+ if (child is IRadialMenuItemWithSector tb)
+ {
+ tb.AngleSectorFrom = sepAngle * childIndex;
+ tb.AngleSectorTo = sepAngle * (childIndex + 1);
+ tb.AngleOffset = angleOffset;
+ tb.InnerRadius = CalculatedRadius * InnerRadiusMultiplier;
+ tb.OuterRadius = CalculatedRadius * OuterRadiusMultiplier;
+ tb.ParentCenter = controlCenter;
+ }
}
+
+ return base.ArrangeOverride(finalSize);
}
///
@@ -109,4 +170,5 @@ public enum RAlignment : byte
Clockwise,
AntiClockwise,
}
+
}
diff --git a/Content.Client/UserInterface/Controls/RadialMenu.cs b/Content.Client/UserInterface/Controls/RadialMenu.cs
index 5f56ad7f866d..1b7f07aa2cc7 100644
--- a/Content.Client/UserInterface/Controls/RadialMenu.cs
+++ b/Content.Client/UserInterface/Controls/RadialMenu.cs
@@ -3,6 +3,9 @@
using Robust.Client.UserInterface.CustomControls;
using System.Linq;
using System.Numerics;
+using Content.Shared.Input;
+using Robust.Client.Graphics;
+using Robust.Shared.Input;
namespace Content.Client.UserInterface.Controls;
@@ -12,11 +15,16 @@ public class RadialMenu : BaseWindow
///
/// Contextual button used to traverse through previous layers of the radial menu
///
- public TextureButton? ContextualButton { get; set; }
+ public RadialMenuContextualCentralTextureButton ContextualButton { get; }
+
+ ///
+ /// Button that represents outer area of menu (closes menu on outside clicks).
+ ///
+ public RadialMenuOuterAreaButton MenuOuterAreaButton { get; }
///
/// Set a style class to be applied to the contextual button when it is set to move the user back through previous layers of the radial menu
- ///
+ ///
public string? BackButtonStyleClass
{
get
@@ -52,7 +60,7 @@ public string? CloseButtonStyleClass
}
}
- private List _path = new();
+ private readonly List _path = new();
private string? _backButtonStyleClass;
private string? _closeButtonStyleClass;
@@ -60,8 +68,8 @@ public string? CloseButtonStyleClass
/// A free floating menu which enables the quick display of one or more radial containers
///
///
- /// Only one radial container is visible at a time (each container forming a separate 'layer' within
- /// the menu), along with a contextual button at the menu center, which will either return the user
+ /// Only one radial container is visible at a time (each container forming a separate 'layer' within
+ /// the menu), along with a contextual button at the menu center, which will either return the user
/// to the previous layer or close the menu if there are no previous layers left to traverse.
/// To create a functional radial menu, simply parent one or more named radial containers to it,
/// and populate the radial containers with RadialMenuButtons. Setting the TargetLayer field of these
@@ -78,23 +86,56 @@ public RadialMenu()
}
// Auto generate a contextual button for moving back through visited layers
- ContextualButton = new TextureButton()
+ ContextualButton = new RadialMenuContextualCentralTextureButton
{
HorizontalAlignment = HAlignment.Center,
VerticalAlignment = VAlignment.Center,
SetSize = new Vector2(64f, 64f),
};
+ MenuOuterAreaButton = new RadialMenuOuterAreaButton();
ContextualButton.OnButtonUp += _ => ReturnToPreviousLayer();
+ MenuOuterAreaButton.OnButtonUp += _ => Close();
AddChild(ContextualButton);
+ AddChild(MenuOuterAreaButton);
// Hide any further add children, unless its promoted to the active layer
- OnChildAdded += child => child.Visible = (GetCurrentActiveLayer() == child);
+ OnChildAdded += child =>
+ {
+ child.Visible = GetCurrentActiveLayer() == child;
+ SetupContextualButtonData(child);
+ };
+ }
+
+ private void SetupContextualButtonData(Control child)
+ {
+ if (child is RadialContainer { Visible: true } container)
+ {
+ var parentCenter = MinSize * 0.5f;
+ ContextualButton.ParentCenter = parentCenter;
+ MenuOuterAreaButton.ParentCenter = parentCenter;
+ ContextualButton.InnerRadius = container.CalculatedRadius * container.InnerRadiusMultiplier;
+ MenuOuterAreaButton.OuterRadius = container.CalculatedRadius * container.OuterRadiusMultiplier;
+ }
+ }
+
+ ///
+ protected override Vector2 ArrangeOverride(Vector2 finalSize)
+ {
+ var result = base.ArrangeOverride(finalSize);
+
+ var currentLayer = GetCurrentActiveLayer();
+ if (currentLayer != null)
+ {
+ SetupContextualButtonData(currentLayer);
+ }
+
+ return result;
}
private Control? GetCurrentActiveLayer()
{
- var children = Children.Where(x => x != ContextualButton);
+ var children = Children.Where(x => x != ContextualButton && x != MenuOuterAreaButton);
if (!children.Any())
return null;
@@ -116,7 +157,7 @@ public bool TryToMoveToNewLayer(string newLayer)
foreach (var child in Children)
{
- if (child == ContextualButton)
+ if (child == ContextualButton || child == MenuOuterAreaButton)
continue;
// Hide layers which are not of interest
@@ -129,6 +170,7 @@ public bool TryToMoveToNewLayer(string newLayer)
else
{
child.Visible = true;
+ SetupContextualButtonData(child);
result = true;
}
}
@@ -158,7 +200,7 @@ public void ReturnToPreviousLayer()
// Hide all children except the contextual button
foreach (var child in Children)
{
- if (child != ContextualButton)
+ if (child != ContextualButton && child != MenuOuterAreaButton)
child.Visible = false;
}
@@ -172,25 +214,104 @@ public void ReturnToPreviousLayer()
}
}
+///
+/// Base class for radial menu buttons. Excludes all actions except clicks and alt-clicks
+/// from interactions.
+///
+[Virtual]
+public class RadialMenuTextureButtonBase : TextureButton
+{
+ ///
+ protected RadialMenuTextureButtonBase()
+ {
+ EnableAllKeybinds = true;
+ }
+
+ ///
+ protected override void KeyBindUp(GUIBoundKeyEventArgs args)
+ {
+ if (args.Function == EngineKeyFunctions.UIClick
+ || args.Function == ContentKeyFunctions.AltActivateItemInWorld)
+ base.KeyBindUp(args);
+ }
+}
+
+///
+/// Special button for closing radial menu or going back between radial menu levels.
+/// Is looking like just but considers whole space around
+/// itself (til radial menu buttons) as itself in case of clicking. But this 'effect'
+/// works only if control have parent, and ActiveContainer property is set.
+/// Also considers all space outside of radial menu buttons as itself for clicking.
+///
+public sealed class RadialMenuContextualCentralTextureButton : RadialMenuTextureButtonBase
+{
+ public float InnerRadius { get; set; }
+
+ public Vector2? ParentCenter { get; set; }
+
+ ///
+ protected override bool HasPoint(Vector2 point)
+ {
+ if (ParentCenter == null)
+ {
+ return base.HasPoint(point);
+ }
+
+ var distSquared = (point + Position - ParentCenter.Value).LengthSquared();
+
+ var innerRadiusSquared = InnerRadius * InnerRadius;
+
+ // comparing to squared values is faster then making sqrt
+ return distSquared < innerRadiusSquared;
+ }
+}
+
+///
+/// Menu button for outer area of radial menu (covers everything 'outside').
+///
+public sealed class RadialMenuOuterAreaButton : RadialMenuTextureButtonBase
+{
+ public float OuterRadius { get; set; }
+
+ public Vector2? ParentCenter { get; set; }
+
+ ///
+ protected override bool HasPoint(Vector2 point)
+ {
+ if (ParentCenter == null)
+ {
+ return base.HasPoint(point);
+ }
+
+ var distSquared = (point + Position - ParentCenter.Value).LengthSquared();
+
+ var outerRadiusSquared = OuterRadius * OuterRadius;
+
+ // comparing to squared values is faster, then making sqrt
+ return distSquared > outerRadiusSquared;
+ }
+}
+
[Virtual]
-public class RadialMenuButton : Button
+public class RadialMenuTextureButton : RadialMenuTextureButtonBase
{
///
- /// Upon clicking this button the radial menu will transition to the named layer
+ /// Upon clicking this button the radial menu will be moved to the named layer
///
- public string? TargetLayer { get; set; }
+ public string TargetLayer { get; set; } = string.Empty;
///
- /// A simple button that can move the user to a different layer within a radial menu
+ /// A simple texture button that can move the user to a different layer within a radial menu
///
- public RadialMenuButton()
+ public RadialMenuTextureButton()
{
+ EnableAllKeybinds = true;
OnButtonUp += OnClicked;
}
private void OnClicked(ButtonEventArgs args)
{
- if (TargetLayer == null || TargetLayer == string.Empty)
+ if (TargetLayer == string.Empty)
return;
var parent = FindParentMultiLayerContainer(this);
@@ -205,51 +326,329 @@ private void OnClicked(ButtonEventArgs args)
{
foreach (var ancestor in control.GetSelfAndLogicalAncestors())
{
- if (ancestor is RadialMenu)
- return ancestor as RadialMenu;
+ if (ancestor is RadialMenu menu)
+ return menu;
}
return null;
}
}
+public interface IRadialMenuItemWithSector
+{
+ ///
+ /// Angle in radian where button sector should start.
+ ///
+ public float AngleSectorFrom { set; }
+
+ ///
+ /// Angle in radian where button sector should end.
+ ///
+ public float AngleSectorTo { set; }
+
+ ///
+ /// Outer radius for drawing segment and pointer detection.
+ ///
+ public float OuterRadius { set; }
+
+ ///
+ /// Outer radius for drawing segment and pointer detection.
+ ///
+ public float InnerRadius { set; }
+
+ ///
+ /// Offset in radian by which menu button should be rotated.
+ ///
+ public float AngleOffset { set; }
+
+ ///
+ /// Coordinates of center in parent component - button container.
+ ///
+ public Vector2 ParentCenter { set; }
+}
+
[Virtual]
-public class RadialMenuTextureButton : TextureButton
+public class RadialMenuTextureButtonWithSector : RadialMenuTextureButton, IRadialMenuItemWithSector
{
+ private Vector2[]? _sectorPointsForDrawing;
+
+ private float _angleSectorFrom;
+ private float _angleSectorTo;
+ private float _outerRadius;
+ private float _innerRadius;
+ private float _angleOffset;
+
+ private bool _isWholeCircle;
+ private Vector2? _parentCenter;
+
+ private Color _backgroundColorSrgb = Color.ToSrgb(new Color(70, 73, 102, 128));
+ private Color _hoverBackgroundColorSrgb = Color.ToSrgb(new Color(87, 91, 127, 128));
+ private Color _borderColorSrgb = Color.ToSrgb(new Color(173, 216, 230, 70));
+ private Color _hoverBorderColorSrgb = Color.ToSrgb(new Color(87, 91, 127, 128));
+
///
- /// Upon clicking this button the radial menu will be moved to the named layer
+ /// Marker, that control should render border of segment. Is false by default.
///
- public string TargetLayer { get; set; } = string.Empty;
+ ///
+ /// By default color of border is same as color of background. Use
+ /// and to change it.
+ ///
+ public bool DrawBorder { get; set; } = false;
+
+ ///
+ /// Marker, that control should render background of all sector. Is true by default.
+ ///
+ public bool DrawBackground { get; set; } = true;
+
+ ///
+ /// Marker, that control should render separator lines.
+ /// Separator lines are used to visually separate sector of radial menu items.
+ /// Is true by default
+ ///
+ public bool DrawSeparators { get; set; } = true;
+
+ ///
+ /// Color of background in non-hovered state. Accepts RGB color, works with sRGB for DrawPrimitive internally.
+ ///
+ public Color BackgroundColor
+ {
+ get => Color.FromSrgb(_backgroundColorSrgb);
+ set => _backgroundColorSrgb = Color.ToSrgb(value);
+ }
+
+ ///
+ /// Color of background in hovered state. Accepts RGB color, works with sRGB for DrawPrimitive internally.
+ ///
+ public Color HoverBackgroundColor
+ {
+ get => Color.FromSrgb(_hoverBackgroundColorSrgb);
+ set => _hoverBackgroundColorSrgb = Color.ToSrgb(value);
+ }
+
+ ///
+ /// Color of button border. Accepts RGB color, works with sRGB for DrawPrimitive internally.
+ ///
+ public Color BorderColor
+ {
+ get => Color.FromSrgb(_borderColorSrgb);
+ set => _borderColorSrgb = Color.ToSrgb(value);
+ }
+
+ ///
+ /// Color of button border when button is hovered. Accepts RGB color, works with sRGB for DrawPrimitive internally.
+ ///
+ public Color HoverBorderColor
+ {
+ get => Color.FromSrgb(_hoverBorderColorSrgb);
+ set => _hoverBorderColorSrgb = Color.ToSrgb(value);
+ }
+
+ ///
+ /// Color of separator lines.
+ /// Separator lines are used to visually separate sector of radial menu items.
+ ///
+ public Color SeparatorColor { get; set; } = new Color(128, 128, 128, 128);
+
+ ///
+ float IRadialMenuItemWithSector.AngleSectorFrom
+ {
+ set
+ {
+ _angleSectorFrom = value;
+ _isWholeCircle = IsWholeCircle(value, _angleSectorTo);
+ }
+ }
+
+ ///
+ float IRadialMenuItemWithSector.AngleSectorTo
+ {
+ set
+ {
+ _angleSectorTo = value;
+ _isWholeCircle = IsWholeCircle(_angleSectorFrom, value);
+ }
+ }
+
+ ///
+ float IRadialMenuItemWithSector.OuterRadius { set => _outerRadius = value; }
+
+ ///
+ float IRadialMenuItemWithSector.InnerRadius { set => _innerRadius = value; }
+
+ ///
+ public float AngleOffset { set => _angleOffset = value; }
+
+ ///
+ Vector2 IRadialMenuItemWithSector.ParentCenter { set => _parentCenter = value; }
///
/// A simple texture button that can move the user to a different layer within a radial menu
///
- public RadialMenuTextureButton()
+ public RadialMenuTextureButtonWithSector()
{
- OnButtonUp += OnClicked;
}
- private void OnClicked(ButtonEventArgs args)
+ ///
+ protected override void Draw(DrawingHandleScreen handle)
{
- if (TargetLayer == string.Empty)
+ base.Draw(handle);
+
+ if (_parentCenter == null)
+ {
return;
+ }
- var parent = FindParentMultiLayerContainer(this);
+ // draw sector where space that button occupies actually is
+ var containerCenter = (_parentCenter.Value - Position) * UIScale;
- if (parent == null)
- return;
+ var angleFrom = _angleSectorFrom + _angleOffset;
+ var angleTo = _angleSectorTo + _angleOffset;
+ if (DrawBackground)
+ {
+ var segmentColor = DrawMode == DrawModeEnum.Hover
+ ? _hoverBackgroundColorSrgb
+ : _backgroundColorSrgb;
- parent.TryToMoveToNewLayer(TargetLayer);
+ DrawAnnulusSector(handle, containerCenter, _innerRadius * UIScale, _outerRadius * UIScale, angleFrom, angleTo, segmentColor);
+ }
+
+ if (DrawBorder)
+ {
+ var borderColor = DrawMode == DrawModeEnum.Hover
+ ? _hoverBorderColorSrgb
+ : _borderColorSrgb;
+ DrawAnnulusSector(handle, containerCenter, _innerRadius * UIScale, _outerRadius * UIScale, angleFrom, angleTo, borderColor, false);
+ }
+
+ if (!_isWholeCircle && DrawSeparators)
+ {
+ DrawSeparatorLines(handle, containerCenter, _innerRadius * UIScale, _outerRadius * UIScale, angleFrom, angleTo, SeparatorColor);
+ }
}
- private RadialMenu? FindParentMultiLayerContainer(Control control)
+ ///
+ protected override bool HasPoint(Vector2 point)
{
- foreach (var ancestor in control.GetSelfAndLogicalAncestors())
+ if (_parentCenter == null)
{
- if (ancestor is RadialMenu)
- return ancestor as RadialMenu;
+ return base.HasPoint(point);
}
- return null;
+ var outerRadiusSquared = _outerRadius * _outerRadius;
+ var innerRadiusSquared = _innerRadius * _innerRadius;
+
+ var distSquared = (point + Position - _parentCenter.Value).LengthSquared();
+ var isInRadius = distSquared < outerRadiusSquared && distSquared > innerRadiusSquared;
+ if (!isInRadius)
+ {
+ return false;
+ }
+
+ // difference from the center of the parent to the `point`
+ var pointFromParent = point + Position - _parentCenter.Value;
+
+ // Flip Y to get from ui coordinates to natural coordinates
+ var angle = MathF.Atan2(-pointFromParent.Y, pointFromParent.X) - _angleOffset;
+ if (angle < 0)
+ {
+ // atan2 range is -pi->pi, while angle sectors are
+ // 0->2pi, so remap the result into that range
+ angle = MathF.PI * 2 + angle;
+ }
+
+ var isInAngle = angle >= _angleSectorFrom && angle < _angleSectorTo;
+ return isInAngle;
+ }
+
+ ///
+ /// Draw segment between two concentrated circles from and to certain angles.
+ ///
+ /// Drawing handle, to which rendering should be delegated.
+ /// Point where circle center should be.
+ /// Radius of internal circle.
+ /// Radius of external circle.
+ /// Angle in radian, from which sector should start.
+ /// Angle in radian, from which sector should start.
+ /// Color for drawing.
+ /// Should figure be filled, or have only border.
+ private void DrawAnnulusSector(
+ DrawingHandleScreen drawingHandleScreen,
+ Vector2 center,
+ float radiusInner,
+ float radiusOuter,
+ float angleSectorFrom,
+ float angleSectorTo,
+ Color color,
+ bool filled = true
+ )
+ {
+ const float minimalSegmentSize = MathF.Tau / 128f;
+
+ var requestedSegmentSize = angleSectorTo - angleSectorFrom;
+ var segmentCount = (int)(requestedSegmentSize / minimalSegmentSize) + 1;
+ var anglePerSegment = requestedSegmentSize / (segmentCount - 1);
+
+ var bufferSize = segmentCount * 2;
+ if (_sectorPointsForDrawing == null || _sectorPointsForDrawing.Length != bufferSize)
+ {
+ _sectorPointsForDrawing ??= new Vector2[bufferSize];
+ }
+
+ for (var i = 0; i < segmentCount; i++)
+ {
+ var angle = angleSectorFrom + anglePerSegment * i;
+
+ // Flip Y to get from ui coordinates to natural coordinates
+ var unitPos = new Vector2(MathF.Cos(angle), -MathF.Sin(angle));
+ var outerPoint = center + unitPos * radiusOuter;
+ var innerPoint = center + unitPos * radiusInner;
+ if (filled)
+ {
+ // to make filled sector we need to create strip from triangles
+ _sectorPointsForDrawing[i * 2] = outerPoint;
+ _sectorPointsForDrawing[i * 2 + 1] = innerPoint;
+ }
+ else
+ {
+ // to make border of sector we need points ordered as sequences on radius
+ _sectorPointsForDrawing[i] = outerPoint;
+ _sectorPointsForDrawing[bufferSize - 1 - i] = innerPoint;
+ }
+ }
+
+ var type = filled
+ ? DrawPrimitiveTopology.TriangleStrip
+ : DrawPrimitiveTopology.LineStrip;
+ drawingHandleScreen.DrawPrimitives(type, _sectorPointsForDrawing, color);
+ }
+
+ private static void DrawSeparatorLines(
+ DrawingHandleScreen drawingHandleScreen,
+ Vector2 center,
+ float radiusInner,
+ float radiusOuter,
+ float angleSectorFrom,
+ float angleSectorTo,
+ Color color
+ )
+ {
+ var fromPoint = new Angle(-angleSectorFrom).RotateVec(Vector2.UnitX);
+ drawingHandleScreen.DrawLine(
+ center + fromPoint * radiusOuter,
+ center + fromPoint * radiusInner,
+ color
+ );
+
+ var toPoint = new Angle(-angleSectorTo).RotateVec(Vector2.UnitX);
+ drawingHandleScreen.DrawLine(
+ center + toPoint * radiusOuter,
+ center + toPoint * radiusInner,
+ color
+ );
+ }
+
+ private static bool IsWholeCircle(float angleSectorFrom, float angleSectorTo)
+ {
+ return new Angle(angleSectorFrom).EqualsApprox(new Angle(angleSectorTo));
}
}
diff --git a/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs b/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
index 9f75b5cecde7..445bcc8601a7 100644
--- a/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
+++ b/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
@@ -45,6 +45,7 @@ public sealed class AHelpUIController: UIController, IOnSystemChanged _aHelpSound = v, true);
+ _config.OnValueChanged(CCVars.BwoinkSoundEnabled, v => _bwoinkSoundEnabled = v, true);
}
public void UnloadButton()
@@ -135,7 +137,7 @@ private void ReceivedBwoink(object? sender, SharedBwoinkSystem.BwoinkTextMessage
}
if (message.PlaySound && localPlayer.UserId != message.TrueSender)
{
- if (_aHelpSound != null)
+ if (_aHelpSound != null && (_bwoinkSoundEnabled || !_adminManager.IsActive()))
_audio.PlayGlobal(_aHelpSound, Filter.Local(), false);
_clyde.RequestWindowAttention();
}
diff --git a/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs b/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs
index bf6fbf4e3f29..6f4a6b8ead3a 100644
--- a/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs
+++ b/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs
@@ -3,6 +3,7 @@
using Content.Shared.Mobs;
using Content.Shared.Mobs.Components;
using Content.Shared.Mobs.Systems;
+using Content.Shared.Traits.Assorted;
using JetBrains.Annotations;
using Robust.Client.Graphics;
using Robust.Client.Player;
@@ -94,8 +95,14 @@ private void UpdateOverlays(EntityUid entity, MobStateComponent? mobState, Damag
{
case MobState.Alive:
{
- if (thresholds.ShowBruteOverlay && damageable.DamagePerGroup.TryGetValue("Brute", out var bruteDamage))
+ if (EntityManager.HasComponent(entity))
+ {
+ _overlay.BruteLevel = 0;
+ }
+ else if (damageable.DamagePerGroup.TryGetValue("Brute", out var bruteDamage))
+ {
_overlay.BruteLevel = FixedPoint2.Min(1f, bruteDamage / critThreshold).Float();
+ }
else
_overlay.BruteLevel = 0;
diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs
index 540d76c129bf..9e20d2d5a9c7 100644
--- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs
+++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs
@@ -138,6 +138,7 @@ private Animation GetThrustAnimation(SpriteComponent sprite, float distance, Ang
const float length = 0.15f;
var startOffset = sprite.Rotation.RotateVec(new Vector2(0f, -distance / 5f));
var endOffset = sprite.Rotation.RotateVec(new Vector2(0f, -distance));
+ sprite.Rotation += spriteRotation;
return new Animation()
{
diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
index 26ec75f99570..dc865803699f 100644
--- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
@@ -170,7 +170,7 @@ protected override bool InRange(EntityUid user, EntityUid target, float range, I
var targetCoordinates = xform.Coordinates;
var targetLocalAngle = xform.LocalRotation;
- return Interaction.InRangeUnobstructed(user, target, targetCoordinates, targetLocalAngle, range);
+ return Interaction.InRangeUnobstructed(user, target, targetCoordinates, targetLocalAngle, range, overlapCheck: false);
}
protected override void DoDamageEffect(List targets, EntityUid? user, TransformComponent targetXform)
diff --git a/Content.Client/Wieldable/WieldableSystem.cs b/Content.Client/Wieldable/WieldableSystem.cs
new file mode 100644
index 000000000000..2de837923c87
--- /dev/null
+++ b/Content.Client/Wieldable/WieldableSystem.cs
@@ -0,0 +1,49 @@
+using System.Numerics;
+using Content.Client.Movement.Components;
+using Content.Client.Movement.Systems;
+using Content.Shared.Camera;
+using Content.Shared.Hands;
+using Content.Shared.Movement.Components;
+using Content.Shared.Wieldable;
+using Content.Shared.Wieldable.Components;
+using Robust.Client.Timing;
+
+namespace Content.Client.Wieldable;
+
+public sealed class WieldableSystem : SharedWieldableSystem
+{
+ [Dependency] private readonly EyeCursorOffsetSystem _eyeOffset = default!;
+ [Dependency] private readonly IClientGameTiming _gameTiming = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnEyeOffsetUnwielded);
+ SubscribeLocalEvent>(OnGetEyeOffset);
+ }
+
+ public void OnEyeOffsetUnwielded(Entity entity, ref ItemUnwieldedEvent args)
+ {
+ if (!TryComp(entity.Owner, out EyeCursorOffsetComponent? cursorOffsetComp))
+ return;
+
+ if (_gameTiming.IsFirstTimePredicted)
+ cursorOffsetComp.CurrentPosition = Vector2.Zero;
+ }
+
+ public void OnGetEyeOffset(Entity entity, ref HeldRelayedEvent args)
+ {
+ if (!TryComp(entity.Owner, out WieldableComponent? wieldableComp))
+ return;
+
+ if (!wieldableComp.Wielded)
+ return;
+
+ var offset = _eyeOffset.OffsetAfterMouse(entity.Owner, null);
+ if (offset == null)
+ return;
+
+ args.Args.Offset += offset.Value;
+ }
+}
diff --git a/Content.Client/_EinsteinEngines/ShortConstruction/UI/ShortConstructionMenu.xaml b/Content.Client/_EinsteinEngines/ShortConstruction/UI/ShortConstructionMenu.xaml
index 6d1e0b12ab63..e16606317782 100644
--- a/Content.Client/_EinsteinEngines/ShortConstruction/UI/ShortConstructionMenu.xaml
+++ b/Content.Client/_EinsteinEngines/ShortConstruction/UI/ShortConstructionMenu.xaml
@@ -7,5 +7,5 @@
MinSize="450 450">
-
+
diff --git a/Content.Client/_EinsteinEngines/ShortConstruction/UI/ShortConstructionMenu.xaml.cs b/Content.Client/_EinsteinEngines/ShortConstruction/UI/ShortConstructionMenu.xaml.cs
index 2a117818878b..20ac9fcedb6a 100644
--- a/Content.Client/_EinsteinEngines/ShortConstruction/UI/ShortConstructionMenu.xaml.cs
+++ b/Content.Client/_EinsteinEngines/ShortConstruction/UI/ShortConstructionMenu.xaml.cs
@@ -59,10 +59,9 @@ public ShortConstructionMenu(EntityUid owner, ShortConstructionMenuBUI bui, Cons
if (!_protoManager.TryIndex(protoId, out var proto))
continue;
- var button = new RadialMenuTextureButton
+ var button = new RadialMenuTextureButtonWithSector
{
ToolTip = Loc.GetString(proto.Name),
- StyleClasses = { "RadialMenuButton" },
SetSize = new Vector2(48f, 48f)
};
diff --git a/Content.Client/_EinsteinEngines/Supermatter/Consoles/SupermatterEntryContainer.xaml b/Content.Client/_EinsteinEngines/Supermatter/Consoles/SupermatterEntryContainer.xaml
index af1aa148f313..974dd6b064ed 100644
--- a/Content.Client/_EinsteinEngines/Supermatter/Consoles/SupermatterEntryContainer.xaml
+++ b/Content.Client/_EinsteinEngines/Supermatter/Consoles/SupermatterEntryContainer.xaml
@@ -23,7 +23,7 @@
-
+
@@ -36,7 +36,7 @@
-
@@ -59,7 +59,7 @@
-
@@ -82,7 +82,7 @@
-
@@ -101,9 +101,9 @@
-
+
-
+
@@ -115,7 +115,7 @@
-
+
@@ -129,7 +129,7 @@
-
@@ -182,8 +182,16 @@
-
-
+
+
+
+
+
+
+
+
diff --git a/Content.Client/_EinsteinEngines/Supermatter/Consoles/SupermatterEntryContainer.xaml.cs b/Content.Client/_EinsteinEngines/Supermatter/Consoles/SupermatterEntryContainer.xaml.cs
index e3f0df35cf7a..5e5d388562b7 100644
--- a/Content.Client/_EinsteinEngines/Supermatter/Consoles/SupermatterEntryContainer.xaml.cs
+++ b/Content.Client/_EinsteinEngines/Supermatter/Consoles/SupermatterEntryContainer.xaml.cs
@@ -31,7 +31,7 @@ public sealed partial class SupermatterEntryContainer : BoxContainer
private readonly Color _colorRed = StyleNano.DangerousRedFore;
private readonly Color _colorOrange = StyleNano.ConcerningOrangeFore;
private readonly Color _colorGreen = StyleNano.GoodGreenFore;
- private readonly Color _colorTurqoise = Color.FromHex("#00fff7");
+ private readonly Color _colorTurquoise = Color.FromHex("#00fff7");
// Arrow icons
private readonly string _arrowUp = "/Textures/_EinsteinEngines/Interface/Supermatter/arrow_up.png";
@@ -45,6 +45,9 @@ public sealed partial class SupermatterEntryContainer : BoxContainer
// Save focus data values so we don't update too often
private SupermatterFocusData _focusData;
+ // Other saved variables
+ private bool _showAllGases;
+
public SupermatterEntryContainer(NetEntity uid)
{
RobustXamlLoader.Load(this);
@@ -60,12 +63,12 @@ public SupermatterEntryContainer(NetEntity uid)
// Set the engine dictionary
_engineDictionary = new()
{
- { "integrity", ( IntegrityBarLabel, IntegrityBar, IntegrityBarBorder, 0.9f, 0.1f, _colorRed, _colorOrange, _colorGreen ) },
- { "power", ( PowerBarLabel, PowerBar, PowerBarBorder, 0.9f, 0.1f, _colorGreen, _colorOrange, _colorRed ) },
- { "radiation", ( RadiationBarLabel, RadiationBar, RadiationBarBorder, 0.1f, 0.9f, _colorGreen, _colorOrange, _colorRed ) },
- { "moles", ( MolesBarLabel, MolesBar, MolesBarBorder, 0.5f, 0.5f, _colorGreen, _colorOrange, _colorRed ) },
- { "temperature", ( TemperatureBarLabel, TemperatureBar, TemperatureBarBorder, 0.9f, 0.1f, _colorTurqoise, _colorGreen, _colorRed ) },
- { "waste", ( WasteBarLabel, WasteBar, WasteBarBorder, 0.5f, 0.5f, _colorGreen, _colorOrange, _colorRed ) }
+ { "integrity", ( IntegrityBarLabel, IntegrityBar, IntegrityBarBorder, 0.9f, 0.1f, _colorRed, _colorOrange, _colorGreen ) },
+ { "power", ( PowerBarLabel, PowerBar, PowerBarBorder, 0.9f, 0.1f, _colorGreen, _colorOrange, _colorRed ) },
+ { "radiation", ( RadiationBarLabel, RadiationBar, RadiationBarBorder, 0.1f, 0.9f, _colorGreen, _colorOrange, _colorRed ) },
+ { "moles", ( MolesBarLabel, MolesBar, MolesBarBorder, 0.5f, 0.5f, _colorGreen, _colorOrange, _colorRed ) },
+ { "temperature", ( TemperatureBarLabel, TemperatureBar, TemperatureBarBorder, 0.9f, 0.1f, _colorTurquoise, _colorGreen, _colorRed ) },
+ { "waste", ( WasteBarLabel, WasteBar, WasteBarBorder, 0.5f, 0.5f, _colorGreen, _colorOrange, _colorRed ) }
};
// Set the gas bar data
@@ -151,6 +154,7 @@ public SupermatterEntryContainer(NetEntity uid)
// Set fonts and font colors
SupermatterNameLabel.FontOverride = headerFont;
SupermatterStatusLabel.FontOverride = normalFont;
+ ShowAllGasLabel.FontOverride = normalFont;
IntegrityHealingInfoLabel.FontColorOverride = _colorGreen;
RadiationBaseInfoLabel.FontColorOverride = _colorGreen;
@@ -174,6 +178,9 @@ public SupermatterEntryContainer(NetEntity uid)
label.FontColorOverride = _colorSlate;
}
+ // Set other variables
+ _showAllGases = false;
+
// On click
foreach (var detail in _expandDetails)
{
@@ -183,6 +190,11 @@ public SupermatterEntryContainer(NetEntity uid)
detail.Arrow.TexturePath = detail.Container.Visible ? _arrowUp : _arrowDown;
};
}
+
+ ShowAllGasButton.OnButtonUp += args =>
+ {
+ _showAllGases = !_showAllGases;
+ };
}
public void UpdateEntry(SupermatterConsoleEntry entry, bool isFocus, SupermatterFocusData? focusData = null)
@@ -253,11 +265,8 @@ public void UpdateEntry(SupermatterConsoleEntry entry, bool isFocus, Supermatter
gasData.Add((data, moles));
data.Bar.UpdateEntry(gas, _focusData);
- // Hide 0% gases
- if (moles == 0f)
- data.Bar.Visible = false;
- else
- data.Bar.Visible = true;
+ // Only show gases above 0%, unless "show all gases" is enabled
+ data.Bar.Visible = moles > 0f || _showAllGases;
}
var gasSort = gasData.OrderByDescending(x => x.Moles).ThenBy(x => x.GasBarData.Gas);
diff --git a/Content.Client/_EinsteinEngines/Supermatter/Consoles/SupermatterGasBarContainer.xaml b/Content.Client/_EinsteinEngines/Supermatter/Consoles/SupermatterGasBarContainer.xaml
index c90539d1dd9c..54f952cfe4a6 100644
--- a/Content.Client/_EinsteinEngines/Supermatter/Consoles/SupermatterGasBarContainer.xaml
+++ b/Content.Client/_EinsteinEngines/Supermatter/Consoles/SupermatterGasBarContainer.xaml
@@ -13,12 +13,12 @@
-
-
+
diff --git a/Content.Client/_EstacaoPirata/Cards/Hand/UI/CardHandMenu.xaml b/Content.Client/_EstacaoPirata/Cards/Hand/UI/CardHandMenu.xaml
index 76cd42473098..1383c7f50621 100644
--- a/Content.Client/_EstacaoPirata/Cards/Hand/UI/CardHandMenu.xaml
+++ b/Content.Client/_EstacaoPirata/Cards/Hand/UI/CardHandMenu.xaml
@@ -8,5 +8,5 @@
MinSize="450 450">
-
+
diff --git a/Content.Client/_EstacaoPirata/Cards/Hand/UI/CardHandMenu.xaml.cs b/Content.Client/_EstacaoPirata/Cards/Hand/UI/CardHandMenu.xaml.cs
index 863799147da1..a6dd6f33252b 100644
--- a/Content.Client/_EstacaoPirata/Cards/Hand/UI/CardHandMenu.xaml.cs
+++ b/Content.Client/_EstacaoPirata/Cards/Hand/UI/CardHandMenu.xaml.cs
@@ -58,7 +58,6 @@ public CardHandMenu(EntityUid owner, CardHandMenuBoundUserInterface bui)
var button = new CardMenuButton()
{
- StyleClasses = { "RadialMenuButton" },
SetSize = new Vector2(64f, 64f),
ToolTip = cardName,
};
@@ -92,7 +91,7 @@ public CardHandMenu(EntityUid owner, CardHandMenuBoundUserInterface bui)
}
}
-public sealed class CardMenuButton : RadialMenuTextureButton
+public sealed class CardMenuButton : RadialMenuTextureButtonWithSector
{
public CardMenuButton()
{
diff --git a/Content.Client/_Goobstation/Changeling/Overlays/ShowFakeMindShieldIconsSystem.cs b/Content.Client/_Goobstation/Changeling/Overlays/ShowFakeMindShieldIconsSystem.cs
deleted file mode 100644
index 9f278232fe6e..000000000000
--- a/Content.Client/_Goobstation/Changeling/Overlays/ShowFakeMindShieldIconsSystem.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Client.Overlays;
-using Content.Shared._Goobstation.FakeMindshield.Components;
-using Content.Shared._Goobstation.Overlays;
-using Content.Shared.StatusIcon.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Client._Goobstation.Overlays;
-
-public sealed class ShowFakeMindShieldIconsSystem : EquipmentHudSystem
-{
- [Dependency] private readonly IPrototypeManager _prototype = default!;
-
- public override void Initialize()
- {
- base.Initialize();
-
- SubscribeLocalEvent(OnGetStatusIconsEvent);
- }
-
- private void OnGetStatusIconsEvent(Entity ent, ref GetStatusIconsEvent ev)
- {
- if (!IsActive)
- return;
-
- if (_prototype.TryIndex(ent.Comp.MindShieldStatusIcon, out var iconPrototype))
- ev.StatusIcons.Add(iconPrototype);
- }
-}
diff --git a/Content.Client/_Goobstation/Heretic/UI/HereticRitualRuneRadialMenu.xaml b/Content.Client/_Goobstation/Heretic/UI/HereticRitualRuneRadialMenu.xaml
index 425ba588c12b..cfa0b93234e7 100644
--- a/Content.Client/_Goobstation/Heretic/UI/HereticRitualRuneRadialMenu.xaml
+++ b/Content.Client/_Goobstation/Heretic/UI/HereticRitualRuneRadialMenu.xaml
@@ -7,7 +7,7 @@
MinSize="450 450">
-
+
diff --git a/Content.Client/_Goobstation/Heretic/UI/HereticRitualRuneRadialMenu.xaml.cs b/Content.Client/_Goobstation/Heretic/UI/HereticRitualRuneRadialMenu.xaml.cs
index a19dcd4f6178..622f76cd8891 100644
--- a/Content.Client/_Goobstation/Heretic/UI/HereticRitualRuneRadialMenu.xaml.cs
+++ b/Content.Client/_Goobstation/Heretic/UI/HereticRitualRuneRadialMenu.xaml.cs
@@ -53,7 +53,6 @@ private void RefreshUI()
var button = new HereticRitualMenuButton
{
- StyleClasses = { "RadialMenuButton" },
SetSize = new Vector2(64, 64),
ToolTip = Loc.GetString(ritualPrototype.LocName),
ProtoId = ritualPrototype.ID
@@ -94,7 +93,7 @@ private void AddHereticRitualMenuButtonOnClickAction(RadialContainer mainControl
}
}
- public sealed class HereticRitualMenuButton : RadialMenuTextureButton
+ public sealed class HereticRitualMenuButton : RadialMenuTextureButtonWithSector
{
public ProtoId ProtoId { get; set; }
}
diff --git a/Content.Client/_Goobstation/Heretic/UI/LivingHeartMenu.xaml b/Content.Client/_Goobstation/Heretic/UI/LivingHeartMenu.xaml
index fd06facd081f..a7119a67a428 100644
--- a/Content.Client/_Goobstation/Heretic/UI/LivingHeartMenu.xaml
+++ b/Content.Client/_Goobstation/Heretic/UI/LivingHeartMenu.xaml
@@ -9,7 +9,7 @@
diff --git a/Content.Client/_Goobstation/Heretic/UI/LivingHeartMenu.xaml.cs b/Content.Client/_Goobstation/Heretic/UI/LivingHeartMenu.xaml.cs
index 79aa2b693917..b60e65ef34d1 100644
--- a/Content.Client/_Goobstation/Heretic/UI/LivingHeartMenu.xaml.cs
+++ b/Content.Client/_Goobstation/Heretic/UI/LivingHeartMenu.xaml.cs
@@ -50,7 +50,6 @@ private void UpdateUI()
var button = new EmbeddedEntityMenuButton
{
- StyleClasses = { "RadialMenuButton" },
SetSize = new Vector2(64, 64),
ToolTip = _ent.TryGetComponent(ent.Value, out var md) ? md.EntityName : "Unknown",
NetEntity = (NetEntity) target,
@@ -90,7 +89,7 @@ private void AddAction(RadialContainer main)
}
}
- public sealed class EmbeddedEntityMenuButton : RadialMenuTextureButton
+ public sealed class EmbeddedEntityMenuButton : RadialMenuTextureButtonWithSector
{
public NetEntity NetEntity;
}
diff --git a/Content.Client/_Impstation/Fishing/FishingRodSystem.cs b/Content.Client/_Impstation/Fishing/FishingRodSystem.cs
new file mode 100644
index 000000000000..6f080f9a805c
--- /dev/null
+++ b/Content.Client/_Impstation/Fishing/FishingRodSystem.cs
@@ -0,0 +1,58 @@
+using System.Net;
+using Content.Client.Hands.Systems;
+using Content.Shared._Impstation.Fishing;
+using Content.Shared.CombatMode;
+using Robust.Client.GameObjects;
+using Robust.Client.Player;
+using Robust.Shared.Input;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Dynamics.Joints;
+
+namespace Content.Client._Impstation.Fishing;
+
+//Imp : Basically a copy of GrapplingGunSystem
+public sealed class FishingRodSystem : SharedFishingRodSystem
+{
+ [Dependency] private readonly HandsSystem _hands = default!;
+ [Dependency] private readonly InputSystem _input = default!;
+ [Dependency] private readonly IPlayerManager _player = default!;
+
+ public override void Update(float frameTime)
+ {
+ base.Update(frameTime);
+
+ // Oh boy another input handler.
+ // If someone thinks of a better way to unify this please tell me.
+ if (!Timing.IsFirstTimePredicted)
+ return;
+
+ var local = _player.LocalEntity;
+ var handUid = _hands.GetActiveHandEntity();
+
+ if (!TryComp(handUid, out var grappling))
+ return;
+
+ if (!TryComp(handUid, out var jointComp) ||
+ !jointComp.GetJoints.TryGetValue(GrapplingJoint, out var joint) ||
+ joint is not DistanceJoint distance)
+ {
+ return;
+ }
+
+ if (distance.MaxLength <= distance.MinLength)
+ return;
+
+ var reelKey = _input.CmdStates.GetState(EngineKeyFunctions.UseSecondary) == BoundKeyState.Down;
+
+ if (!TryComp(local, out var combatMode) ||
+ !combatMode.IsInCombatMode)
+ {
+ reelKey = false;
+ }
+
+ if (grappling.Reeling == reelKey)
+ return;
+
+ RaisePredictiveEvent(new RequestGrapplingReelMessage(reelKey));
+ }
+}
diff --git a/Content.IntegrationTests/Tests/ContrabandTest.cs b/Content.IntegrationTests/Tests/ContrabandTest.cs
new file mode 100644
index 000000000000..ebd6afa7efe2
--- /dev/null
+++ b/Content.IntegrationTests/Tests/ContrabandTest.cs
@@ -0,0 +1,41 @@
+using Content.Shared.Contraband;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests;
+
+[TestFixture]
+public sealed class ContrabandTest
+{
+ [Test]
+ public async Task EntityShowDepartmentsAndJobs()
+ {
+ await using var pair = await PoolManager.GetServerClient();
+ var client = pair.Client;
+ var protoMan = client.ResolveDependency();
+ var componentFactory = client.ResolveDependency();
+
+ await client.WaitAssertion(() =>
+ {
+ foreach (var proto in protoMan.EnumeratePrototypes())
+ {
+ if (proto.Abstract || pair.IsTestPrototype(proto))
+ continue;
+
+ if (!proto.TryGetComponent(out var contraband, componentFactory))
+ continue;
+
+ Assert.That(protoMan.TryIndex(contraband.Severity, out var severity, false),
+ @$"{proto.ID} has a ContrabandComponent with a unknown severity.");
+
+ if (!severity.ShowDepartmentsAndJobs)
+ continue;
+
+ Assert.That(contraband.AllowedDepartments.Count + contraband.AllowedJobs.Count, Is.Not.EqualTo(0),
+ @$"{proto.ID} has a ContrabandComponent with ShowDepartmentsAndJobs but no allowed departments or jobs.");
+ }
+ });
+
+ await pair.CleanReturnAsync();
+ }
+}
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
index f8100afd1fe3..88138886a84f 100644
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -69,6 +69,7 @@ public sealed class PostMapInitTest
"Loop",
"Plasma",
"Elkridge",
+ "Convex",
"Xeno"
};
diff --git a/Content.Server/Access/AccessWireAction.cs b/Content.Server/Access/AccessWireAction.cs
index 7676ce489f43..b3beb3967b9b 100644
--- a/Content.Server/Access/AccessWireAction.cs
+++ b/Content.Server/Access/AccessWireAction.cs
@@ -1,7 +1,6 @@
using Content.Server.Wires;
using Content.Shared.Access;
using Content.Shared.Access.Components;
-using Content.Shared.Emag.Components;
using Content.Shared.Wires;
namespace Content.Server.Access;
@@ -31,11 +30,9 @@ public override bool Cut(EntityUid user, Wire wire, AccessReaderComponent comp)
public override bool Mend(EntityUid user, Wire wire, AccessReaderComponent comp)
{
- if (!EntityManager.HasComponent(wire.Owner))
- {
- comp.Enabled = true;
- EntityManager.Dirty(wire.Owner, comp);
- }
+ comp.Enabled = true;
+ EntityManager.Dirty(wire.Owner, comp);
+
return true;
}
@@ -58,7 +55,7 @@ private void AwaitPulseCancel(Wire wire)
{
if (!wire.IsCut)
{
- if (EntityManager.TryGetComponent(wire.Owner, out var access) && !EntityManager.HasComponent(wire.Owner))
+ if (EntityManager.TryGetComponent(wire.Owner, out var access))
{
access.Enabled = true;
EntityManager.Dirty(wire.Owner, access);
diff --git a/Content.Server/Access/Systems/AccessOverriderSystem.cs b/Content.Server/Access/Systems/AccessOverriderSystem.cs
index a882209b2d17..a0dbc96677b5 100644
--- a/Content.Server/Access/Systems/AccessOverriderSystem.cs
+++ b/Content.Server/Access/Systems/AccessOverriderSystem.cs
@@ -245,6 +245,10 @@ private void TryWriteToTargetAccessReaderId(EntityUid uid,
$"{ToPrettyString(player):player} has modified {ToPrettyString(accessReaderEnt.Value):entity} with the following allowed access level holders: [{string.Join(", ", addedTags.Union(removedTags))}] [{string.Join(", ", newAccessList)}]");
accessReaderEnt.Value.Comp.AccessLists = ConvertAccessListToHashSet(newAccessList);
+
+ var ev = new OnAccessOverriderAccessUpdatedEvent(player);
+ RaiseLocalEvent(component.TargetAccessReaderId, ref ev);
+
Dirty(accessReaderEnt.Value);
}
diff --git a/Content.Server/Administration/Managers/BanManager.Notification.cs b/Content.Server/Administration/Managers/BanManager.Notification.cs
index e9bfa6288415..ff84887f00df 100644
--- a/Content.Server/Administration/Managers/BanManager.Notification.cs
+++ b/Content.Server/Administration/Managers/BanManager.Notification.cs
@@ -1,6 +1,4 @@
-using System.Text.Json;
using System.Text.Json.Serialization;
-using Content.Server.Database;
namespace Content.Server.Administration.Managers;
@@ -30,36 +28,15 @@ public sealed partial class BanManager
private TimeSpan _banNotificationRateLimitStart;
private int _banNotificationRateLimitCount;
- private void OnDatabaseNotification(DatabaseNotification notification)
+ private bool OnDatabaseNotificationEarlyFilter()
{
- if (notification.Channel != BanNotificationChannel)
- return;
-
- if (notification.Payload == null)
- {
- _sawmill.Error("Got ban notification with null payload!");
- return;
- }
-
- BanNotificationData data;
- try
- {
- data = JsonSerializer.Deserialize(notification.Payload)
- ?? throw new JsonException("Content is null");
- }
- catch (JsonException e)
- {
- _sawmill.Error($"Got invalid JSON in ban notification: {e}");
- return;
- }
-
if (!CheckBanRateLimit())
{
_sawmill.Verbose("Not processing ban notification due to rate limit");
- return;
+ return false;
}
- _taskManager.RunOnMainThread(() => ProcessBanNotification(data));
+ return true;
}
private async void ProcessBanNotification(BanNotificationData data)
diff --git a/Content.Server/Administration/Managers/BanManager.cs b/Content.Server/Administration/Managers/BanManager.cs
index 2e21710e51d2..2d76c434e9df 100644
--- a/Content.Server/Administration/Managers/BanManager.cs
+++ b/Content.Server/Administration/Managers/BanManager.cs
@@ -53,7 +53,12 @@ public void Initialize()
{
_netManager.RegisterNetMessage();
- _db.SubscribeToNotifications(OnDatabaseNotification);
+ _db.SubscribeToJsonNotification(
+ _taskManager,
+ _sawmill,
+ BanNotificationChannel,
+ ProcessBanNotification,
+ OnDatabaseNotificationEarlyFilter);
_userDbData.AddOnLoadPlayer(CachePlayerData);
_userDbData.AddOnPlayerDisconnect(ClearPlayerData);
@@ -160,6 +165,8 @@ public async void CreateServerBan(NetUserId? target, string? targetUsername, Net
null);
await _db.AddServerBanAsync(banDef);
+ if (_cfg.GetCVar(CCVars.ServerBanResetLastReadRules) && target != null)
+ await _db.SetLastReadRules(target.Value, null); // Reset their last read rules. They probably need a refresher!
var adminName = banningAdmin == null
? Loc.GetString("system-user")
: (await _db.GetPlayerRecordByUserId(banningAdmin.Value))?.LastSeenUserName ?? Loc.GetString("system-user");
diff --git a/Content.Server/Administration/Managers/MultiServerKickManager.cs b/Content.Server/Administration/Managers/MultiServerKickManager.cs
new file mode 100644
index 000000000000..abc8bb1f2d38
--- /dev/null
+++ b/Content.Server/Administration/Managers/MultiServerKickManager.cs
@@ -0,0 +1,114 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Content.Server.Database;
+using Content.Shared.CCVar;
+using Robust.Server.Player;
+using Robust.Shared.Asynchronous;
+using Robust.Shared.Configuration;
+using Robust.Shared.Enums;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
+
+namespace Content.Server.Administration.Managers;
+
+///
+/// Handles kicking people that connect to multiple servers on the same DB at once.
+///
+///
+public sealed class MultiServerKickManager
+{
+ public const string NotificationChannel = "multi_server_kick";
+
+ [Dependency] private readonly IPlayerManager _playerManager = null!;
+ [Dependency] private readonly IServerDbManager _dbManager = null!;
+ [Dependency] private readonly ILogManager _logManager = null!;
+ [Dependency] private readonly IConfigurationManager _cfg = null!;
+ [Dependency] private readonly IAdminManager _adminManager = null!;
+ [Dependency] private readonly ITaskManager _taskManager = null!;
+ [Dependency] private readonly IServerNetManager _netManager = null!;
+ [Dependency] private readonly ILocalizationManager _loc = null!;
+ [Dependency] private readonly ServerDbEntryManager _serverDbEntry = null!;
+
+ private ISawmill _sawmill = null!;
+ private bool _allowed;
+
+ public void Initialize()
+ {
+ _sawmill = _logManager.GetSawmill("multi_server_kick");
+
+ _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
+ _cfg.OnValueChanged(CCVars.AdminAllowMultiServerPlay, b => _allowed = b, true);
+
+ _dbManager.SubscribeToJsonNotification(
+ _taskManager,
+ _sawmill,
+ NotificationChannel,
+ OnNotification,
+ OnNotificationEarlyFilter
+ );
+ }
+
+ // ReSharper disable once AsyncVoidMethod
+ private async void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs e)
+ {
+ if (_allowed)
+ return;
+
+ if (e.NewStatus != SessionStatus.InGame)
+ return;
+
+ // Send notification to other servers so they can kick this player that just connected.
+ try
+ {
+ await _dbManager.SendNotification(new DatabaseNotification
+ {
+ Channel = NotificationChannel,
+ Payload = JsonSerializer.Serialize(new NotificationData
+ {
+ PlayerId = e.Session.UserId,
+ ServerId = (await _serverDbEntry.ServerEntity).Id,
+ }),
+ });
+ }
+ catch (Exception ex)
+ {
+ _sawmill.Error($"Failed to send notification for multi server kick: {ex}");
+ }
+ }
+
+ private bool OnNotificationEarlyFilter()
+ {
+ if (_allowed)
+ {
+ _sawmill.Verbose("Received notification for player join, but multi server play is allowed on this server. Ignoring");
+ return false;
+ }
+
+ return true;
+ }
+
+ // ReSharper disable once AsyncVoidMethod
+ private async void OnNotification(NotificationData notification)
+ {
+ if (!_playerManager.TryGetSessionById(new NetUserId(notification.PlayerId), out var player))
+ return;
+
+ if (notification.ServerId == (await _serverDbEntry.ServerEntity).Id)
+ return;
+
+ if (_adminManager.IsAdmin(player, includeDeAdmin: true))
+ return;
+
+ _sawmill.Info($"Kicking {player} for connecting to another server. Multi-server play is not allowed.");
+ _netManager.DisconnectChannel(player.Channel, _loc.GetString("multi-server-kick-reason"));
+ }
+
+ private sealed class NotificationData
+ {
+ [JsonPropertyName("player_id")]
+ public Guid PlayerId { get; set; }
+
+ [JsonPropertyName("server_id")]
+ public int ServerId { get; set; }
+ }
+}
diff --git a/Content.Server/Anomaly/Effects/TechAnomalySystem.cs b/Content.Server/Anomaly/Effects/TechAnomalySystem.cs
index 9f81c64dbc10..983cf2c8f465 100644
--- a/Content.Server/Anomaly/Effects/TechAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/TechAnomalySystem.cs
@@ -116,8 +116,11 @@ private void OnSupercritical(Entity tech, ref AnomalySuper
if (_random.Prob(tech.Comp.EmagSupercritProbability))
{
- _emag.DoEmagEffect(tech, source);
- _emag.DoEmagEffect(tech, sink);
+ var sourceEv = new GotEmaggedEvent(tech, EmagType.Access | EmagType.Interaction);
+ RaiseLocalEvent(source, ref sourceEv);
+
+ var sinkEv = new GotEmaggedEvent(tech, EmagType.Access | EmagType.Interaction);
+ RaiseLocalEvent(sink, ref sinkEv);
}
CreateNewLink(tech, source, sink);
diff --git a/Content.Server/Atmos/Components/FlammableComponent.cs b/Content.Server/Atmos/Components/FlammableComponent.cs
index 9ae99a15136e..b94047b50841 100644
--- a/Content.Server/Atmos/Components/FlammableComponent.cs
+++ b/Content.Server/Atmos/Components/FlammableComponent.cs
@@ -82,5 +82,12 @@ public sealed partial class FlammableComponent : Component
[DataField]
public ProtoId FireAlert = "Fire";
+
+ // imp edit
+ ///
+ /// Should the entity enable an AmbientSound component when lit, and disable it when unlit?
+ ///
+ [DataField]
+ public bool ToggleAmbientSound;
}
}
diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index bc96807af2db..1a5924c3b1dc 100644
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -1,5 +1,6 @@
using Content.Server.Administration.Logs;
using Content.Server.Atmos.Components;
+using Content.Server.Audio;
using Content.Server.IgnitionSource;
using Content.Server.Stunnable;
using Content.Server.Temperature.Components;
@@ -9,6 +10,7 @@
using Content.Shared.Alert;
using Content.Shared.Atmos;
using Content.Shared.Atmos.Components;
+using Content.Shared.Audio;
using Content.Shared.Damage;
using Content.Shared.Database;
using Content.Shared.Interaction;
@@ -24,6 +26,7 @@
using Content.Shared.Weapons.Melee.Events;
using Content.Shared.FixedPoint;
using Robust.Server.Audio;
+using Robust.Shared.Physics;
using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Events;
using Robust.Shared.Physics.Systems;
@@ -47,6 +50,7 @@ public sealed class FlammableSystem : EntitySystem
[Dependency] private readonly SharedPopupSystem _popup = default!;
[Dependency] private readonly UseDelaySystem _useDelay = default!;
[Dependency] private readonly AudioSystem _audio = default!;
+ [Dependency] private readonly AmbientSoundSystem _ambient = default!;
[Dependency] private readonly IRobustRandom _random = default!;
private EntityQuery _inventoryQuery;
@@ -137,6 +141,10 @@ private void OnMapInit(EntityUid uid, FlammableComponent component, MapInitEvent
_fixture.TryCreateFixture(uid, component.FlammableCollisionShape, component.FlammableFixtureID, hard: false,
collisionMask: (int) CollisionGroup.FullTileLayer, body: body);
+
+ // imp edit, disables AmbientSound if it's meant to be handled with a toggle
+ if (component.ToggleAmbientSound && TryComp(uid, out var ambient))
+ _ambient.SetAmbience(uid, false, ambient);
}
private void OnInteractUsing(EntityUid uid, FlammableComponent flammable, InteractUsingEvent args)
@@ -211,8 +219,14 @@ private void OnCollide(EntityUid uid, FlammableComponent flammable, ref StartCol
var mass2 = 1f;
if (_physicsQuery.TryComp(uid, out var physics) && _physicsQuery.TryComp(otherUid, out var otherPhys))
{
- mass1 = physics.Mass;
- mass2 = otherPhys.Mass;
+ // imp edit - if either entity has a static BodyType then it has no mass, so just equalise instead
+ var anyStatic = physics.BodyType == BodyType.Static || otherPhys.BodyType == BodyType.Static;
+
+ if (!anyStatic)
+ {
+ mass1 = physics.Mass;
+ mass2 = otherPhys.Mass;
+ }
}
// when the thing on fire is more massive than the other, the following happens:
@@ -315,6 +329,10 @@ public void Extinguish(EntityUid uid, FlammableComponent? flammable = null)
_ignitionSourceSystem.SetIgnited(uid, false);
+ // imp edit
+ if (flammable.ToggleAmbientSound && TryComp(uid, out var ambient))
+ _ambient.SetAmbience(uid, false, ambient);
+
UpdateAppearance(uid, flammable);
}
@@ -338,6 +356,12 @@ public void Ignite(EntityUid uid, EntityUid ignitionSource, FlammableComponent?
flammable.OnFire = true;
}
+ // imp edit
+ if (flammable.ToggleAmbientSound &&
+ TryComp(uid, out var ambient) &&
+ !ambient.Enabled)
+ _ambient.SetAmbience(uid, true, ambient);
+
UpdateAppearance(uid, flammable);
}
diff --git a/Content.Server/Atmos/Monitor/Systems/FireAlarmSystem.cs b/Content.Server/Atmos/Monitor/Systems/FireAlarmSystem.cs
index 0a3ee4d7f7dc..6d768c129261 100644
--- a/Content.Server/Atmos/Monitor/Systems/FireAlarmSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/FireAlarmSystem.cs
@@ -21,6 +21,7 @@ public sealed class FireAlarmSystem : EntitySystem
{
[Dependency] private readonly AtmosDeviceNetworkSystem _atmosDevNet = default!;
[Dependency] private readonly AtmosAlarmableSystem _atmosAlarmable = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
[Dependency] private readonly AccessReaderSystem _access = default!;
[Dependency] private readonly IConfigurationManager _configManager = default!;
@@ -77,11 +78,18 @@ private void OnInteractHand(EntityUid uid, FireAlarmComponent component, Interac
private void OnEmagged(EntityUid uid, FireAlarmComponent component, ref GotEmaggedEvent args)
{
- if (TryComp(uid, out var alarmable))
- {
- // Remove the atmos alarmable component permanently from this device.
- _atmosAlarmable.ForceAlert(uid, AtmosAlarmType.Emagged, alarmable);
- RemCompDeferred(uid);
- }
+ if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+ return;
+
+ if (_emag.CheckFlag(uid, EmagType.Interaction))
+ return;
+
+ if (!TryComp(uid, out var alarmable))
+ return;
+
+ // Remove the atmos alarmable component permanently from this device.
+ _atmosAlarmable.ForceAlert(uid, AtmosAlarmType.Emagged, alarmable);
+ RemCompDeferred(uid);
+ args.Handled = true;
}
}
diff --git a/Content.Server/Atmos/Piping/Binary/Components/GasVolumePumpComponent.cs b/Content.Server/Atmos/Piping/Binary/Components/GasVolumePumpComponent.cs
index 36ced3887d2d..48cdaebb97cb 100644
--- a/Content.Server/Atmos/Piping/Binary/Components/GasVolumePumpComponent.cs
+++ b/Content.Server/Atmos/Piping/Binary/Components/GasVolumePumpComponent.cs
@@ -1,4 +1,5 @@
using Content.Shared.Atmos;
+using Content.Shared.Guidebook;
namespace Content.Server.Atmos.Piping.Binary.Components
{
@@ -38,6 +39,7 @@ public sealed partial class GasVolumePumpComponent : Component
public float LowerThreshold { get; set; } = 0.01f;
[DataField("higherThreshold")]
+ [GuidebookData]
public float HigherThreshold { get; set; } = DefaultHigherThreshold;
public static readonly float DefaultHigherThreshold = 2 * Atmospherics.MaxOutputPressure;
diff --git a/Content.Server/Atmos/Piping/Trinary/Components/PressureControlledValveComponent.cs b/Content.Server/Atmos/Piping/Trinary/Components/PressureControlledValveComponent.cs
index c0b496fae8cb..3f388617de90 100644
--- a/Content.Server/Atmos/Piping/Trinary/Components/PressureControlledValveComponent.cs
+++ b/Content.Server/Atmos/Piping/Trinary/Components/PressureControlledValveComponent.cs
@@ -1,4 +1,5 @@
using Content.Shared.Atmos;
+using Content.Shared.Guidebook;
namespace Content.Server.Atmos.Piping.Trinary.Components
{
@@ -27,6 +28,7 @@ public sealed partial class PressureControlledValveComponent : Component
[ViewVariables(VVAccess.ReadWrite)]
[DataField("threshold")]
+ [GuidebookData]
public float Threshold { get; set; } = Atmospherics.OneAtmosphere;
[DataField("maxTransferRate")]
diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasCanisterComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasCanisterComponent.cs
index 1daa42d7c40d..afbfb912497f 100644
--- a/Content.Server/Atmos/Piping/Unary/Components/GasCanisterComponent.cs
+++ b/Content.Server/Atmos/Piping/Unary/Components/GasCanisterComponent.cs
@@ -1,5 +1,6 @@
using Content.Shared.Atmos;
using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Guidebook;
using Robust.Shared.Audio;
namespace Content.Server.Atmos.Piping.Unary.Components
@@ -61,5 +62,12 @@ public sealed partial class GasCanisterComponent : Component, IGasMixtureHolder
[DataField("accessDeniedSound")]
public SoundSpecifier AccessDeniedSound = new SoundPathSpecifier("/Audio/Machines/custom_deny.ogg");
+
+ #region GuidebookData
+
+ [GuidebookData]
+ public float Volume => Air.Volume;
+
+ #endregion
}
}
diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasOutletInjectorComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasOutletInjectorComponent.cs
index 7e082024a810..65755d62c564 100644
--- a/Content.Server/Atmos/Piping/Unary/Components/GasOutletInjectorComponent.cs
+++ b/Content.Server/Atmos/Piping/Unary/Components/GasOutletInjectorComponent.cs
@@ -1,6 +1,7 @@
using Content.Server.Atmos.Piping.Binary.Components;
using Content.Server.Atmos.Piping.Unary.EntitySystems;
using Content.Shared.Atmos;
+using Content.Shared.Guidebook;
namespace Content.Server.Atmos.Piping.Unary.Components
{
@@ -29,6 +30,7 @@ public float TransferRate
public float MaxTransferRate = Atmospherics.MaxTransferRate;
[DataField("maxPressure")]
+ [GuidebookData]
public float MaxPressure { get; set; } = GasVolumePumpComponent.DefaultHigherThreshold;
[DataField("inlet")]
diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasThermoMachineComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasThermoMachineComponent.cs
index 5da4ec9fdf23..f481443c9434 100644
--- a/Content.Server/Atmos/Piping/Unary/Components/GasThermoMachineComponent.cs
+++ b/Content.Server/Atmos/Piping/Unary/Components/GasThermoMachineComponent.cs
@@ -1,4 +1,5 @@
using Content.Shared.Atmos;
+using Content.Shared.Guidebook;
namespace Content.Server.Atmos.Piping.Unary.Components
{
@@ -13,6 +14,7 @@ public sealed partial class GasThermoMachineComponent : Component
/// thermomachine to heat or cool air.
///
[DataField, ViewVariables(VVAccess.ReadWrite)]
+ [GuidebookData]
public float HeatCapacity = 5000;
[DataField, ViewVariables(VVAccess.ReadWrite)]
@@ -21,6 +23,7 @@ public sealed partial class GasThermoMachineComponent : Component
///
/// Tolerance for temperature setpoint hysteresis.
///
+ [GuidebookData]
[DataField, ViewVariables(VVAccess.ReadOnly)]
public float TemperatureTolerance = 2f;
@@ -44,6 +47,7 @@ public sealed partial class GasThermoMachineComponent : Component
/// Ignored if heater.
///
[DataField, ViewVariables(VVAccess.ReadWrite)]
+ [GuidebookData]
public float MinTemperature = 73.15f;
///
@@ -51,6 +55,7 @@ public sealed partial class GasThermoMachineComponent : Component
/// Ignored if freezer.
///
[DataField, ViewVariables(VVAccess.ReadWrite)]
+ [GuidebookData]
public float MaxTemperature = 593.15f;
///
@@ -63,6 +68,7 @@ public sealed partial class GasThermoMachineComponent : Component
/// An percentage of the energy change that is leaked into the surrounding environment rather than the inlet pipe.
///
[DataField, ViewVariables(VVAccess.ReadWrite)]
+ [GuidebookData]
public float EnergyLeakPercentage;
///
diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs
index fcf3ddf969c7..25b15f0ed55b 100644
--- a/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs
+++ b/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs
@@ -1,6 +1,7 @@
using Content.Shared.Atmos;
using Content.Shared.Atmos.Piping.Unary.Components;
using Content.Shared.DeviceLinking;
+using Content.Shared.Guidebook;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
namespace Content.Server.Atmos.Piping.Unary.Components
@@ -35,6 +36,7 @@ public sealed partial class GasVentPumpComponent : Component
/// In releasing mode, do not pump when environment pressure is below this limit.
///
[DataField]
+ [GuidebookData]
public float UnderPressureLockoutThreshold = 80; // this must be tuned in conjunction with atmos.mmos_spacing_speed
///
@@ -58,7 +60,7 @@ public sealed partial class GasVentPumpComponent : Component
[DataField]
public bool IsPressureLockoutManuallyDisabled = false;
///
- /// The time when the manual pressure lockout will be reenabled.
+ /// The time when the manual pressure lockout will be reenabled.
///
[DataField]
[AutoPausedField]
@@ -101,6 +103,7 @@ public float InternalPressureBound
/// Max pressure of the target gas (NOT relative to source).
///
[DataField]
+ [GuidebookData]
public float MaxPressure = Atmospherics.MaxOutputPressure;
///
@@ -172,5 +175,12 @@ public void FromAirAlarmData(GasVentPumpData data)
InternalPressureBound = data.InternalPressureBound;
PressureLockoutOverride = data.PressureLockoutOverride;
}
+
+ #region GuidebookData
+
+ [GuidebookData]
+ public float DefaultExternalBound => Atmospherics.OneAtmosphere;
+
+ #endregion
}
}
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
index 584928def72a..292b6d94f826 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
@@ -109,7 +109,15 @@ private void OnHoldingTankEjectMessage(EntityUid uid, GasCanisterComponent canis
var item = canister.GasTankSlot.Item;
_slots.TryEjectToHands(uid, canister.GasTankSlot, args.Actor);
- _adminLogger.Add(LogType.CanisterTankEjected, LogImpact.Medium, $"Player {ToPrettyString(args.Actor):player} ejected tank {ToPrettyString(item):tank} from {ToPrettyString(uid):canister}");
+
+ if (canister.ReleaseValve)
+ {
+ _adminLogger.Add(LogType.CanisterTankEjected, LogImpact.High, $"Player {ToPrettyString(args.Actor):player} ejected tank {ToPrettyString(item):tank} from {ToPrettyString(uid):canister} while the valve was open, releasing [{GetContainedGasesString((uid, canister))}] to atmosphere");
+ }
+ else
+ {
+ _adminLogger.Add(LogType.CanisterTankEjected, LogImpact.Medium, $"Player {ToPrettyString(args.Actor):player} ejected tank {ToPrettyString(item):tank} from {ToPrettyString(uid):canister}");
+ }
}
private void OnCanisterChangeReleasePressure(EntityUid uid, GasCanisterComponent canister, GasCanisterChangeReleasePressureMessage args)
@@ -124,24 +132,24 @@ private void OnCanisterChangeReleasePressure(EntityUid uid, GasCanisterComponent
private void OnCanisterChangeReleaseValve(EntityUid uid, GasCanisterComponent canister, GasCanisterChangeReleaseValveMessage args)
{
- var impact = LogImpact.High;
// filling a jetpack with plasma is less important than filling a room with it
- impact = canister.GasTankSlot.HasItem ? LogImpact.Medium : LogImpact.High;
+ var hasItem = canister.GasTankSlot.HasItem;
+ var impact = hasItem ? LogImpact.Medium : LogImpact.High;
- var containedGasDict = new Dictionary();
- var containedGasArray = Enum.GetValues(typeof(Gas));
-
- for (int i = 0; i < containedGasArray.Length; i++)
- {
- containedGasDict.Add((Gas)i, canister.Air[i]);
- }
-
- _adminLogger.Add(LogType.CanisterValve, impact, $"{ToPrettyString(args.Actor):player} set the valve on {ToPrettyString(uid):canister} to {args.Valve:valveState} while it contained [{string.Join(", ", containedGasDict)}]");
+ _adminLogger.Add(
+ LogType.CanisterValve,
+ impact,
+ $"{ToPrettyString(args.Actor):player} {(args.Valve ? "opened" : "closed")} the valve on {ToPrettyString(uid):canister} to {(hasItem ? "inserted tank" : "environment")} while it contained [{GetContainedGasesString((uid, canister))}]");
canister.ReleaseValve = args.Valve;
DirtyUI(uid, canister);
}
+ private static string GetContainedGasesString(Entity canister)
+ {
+ return string.Join(", ", canister.Comp.Air);
+ }
+
private void OnCanisterUpdated(EntityUid uid, GasCanisterComponent canister, ref AtmosDeviceUpdateEvent args)
{
_atmos.React(canister.Air, canister);
diff --git a/Content.Server/Atmos/Portable/PortableScrubberComponent.cs b/Content.Server/Atmos/Portable/PortableScrubberComponent.cs
index ae9a5da96397..b22809180645 100644
--- a/Content.Server/Atmos/Portable/PortableScrubberComponent.cs
+++ b/Content.Server/Atmos/Portable/PortableScrubberComponent.cs
@@ -1,4 +1,5 @@
using Content.Shared.Atmos;
+using Content.Shared.Guidebook;
namespace Content.Server.Atmos.Portable
{
@@ -45,5 +46,12 @@ public sealed partial class PortableScrubberComponent : Component
///
[DataField, ViewVariables(VVAccess.ReadWrite)]
public float TransferRate = 800;
+
+ #region GuidebookData
+
+ [GuidebookData]
+ public float Volume => Air.Volume;
+
+ #endregion
}
}
diff --git a/Content.Server/Atmos/Portable/SpaceHeaterComponent.cs b/Content.Server/Atmos/Portable/SpaceHeaterComponent.cs
index e490ab3ea015..d13826e4e9c5 100644
--- a/Content.Server/Atmos/Portable/SpaceHeaterComponent.cs
+++ b/Content.Server/Atmos/Portable/SpaceHeaterComponent.cs
@@ -1,6 +1,7 @@
using Content.Shared.Atmos;
using Content.Shared.Atmos.Piping.Portable.Components;
using Content.Shared.Atmos.Visuals;
+using Content.Shared.Guidebook;
namespace Content.Server.Atmos.Portable;
@@ -23,12 +24,14 @@ public sealed partial class SpaceHeaterComponent : Component
/// Maximum target temperature the device can be set to
///
[DataField, ViewVariables(VVAccess.ReadWrite)]
+ [GuidebookData]
public float MaxTemperature = Atmospherics.T20C + 20;
///
/// Minimal target temperature the device can be set to
///
[DataField, ViewVariables(VVAccess.ReadWrite)]
+ [GuidebookData]
public float MinTemperature = Atmospherics.T0C - 10;
///
diff --git a/Content.Server/Bed/BedSystem.cs b/Content.Server/Bed/BedSystem.cs
index 2cc8085e725c..b2d688940861 100644
--- a/Content.Server/Bed/BedSystem.cs
+++ b/Content.Server/Bed/BedSystem.cs
@@ -20,6 +20,7 @@ public sealed class BedSystem : EntitySystem
{
[Dependency] private readonly DamageableSystem _damageableSystem = default!;
[Dependency] private readonly ActionsSystem _actionsSystem = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
[Dependency] private readonly SleepingSystem _sleepingSystem = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly MobStateSystem _mobStateSystem = default!;
@@ -114,7 +115,12 @@ private void OnPowerChanged(EntityUid uid, StasisBedComponent component, ref Pow
private void OnEmagged(EntityUid uid, StasisBedComponent component, ref GotEmaggedEvent args)
{
- args.Repeatable = true;
+ if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+ return;
+
+ if (_emag.CheckFlag(uid, EmagType.Interaction))
+ return;
+
// Reset any metabolisms first so they receive the multiplier correctly
UpdateMetabolisms(uid, component, false);
component.Multiplier = 1 / component.Multiplier;
diff --git a/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs b/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs
index a7735787cbb6..c650438b2861 100644
--- a/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs
+++ b/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs
@@ -12,15 +12,22 @@ public sealed partial class StationCargoBountyDatabaseComponent : Component
///
/// Maximum amount of bounties a station can have.
///
- [DataField, ViewVariables(VVAccess.ReadWrite)]
+ [DataField]
public int MaxBounties = 6;
///
/// A list of all the bounties currently active for a station.
///
- [DataField, ViewVariables(VVAccess.ReadWrite)]
+ [DataField]
public List Bounties = new();
+ ///
+ /// A list of all the bounties that have been completed or
+ /// skipped for a station.
+ ///
+ [DataField]
+ 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 373e8e243ba9..7f74fe269d4c 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, true, 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);
}
@@ -179,7 +182,7 @@ private void OnSold(ref EntitySoldEvent args)
continue;
}
- TryRemoveBounty(station, bounty.Value);
+ TryRemoveBounty(station, bounty.Value, false);
FillBountyDatabase(station);
_adminLogger.Add(LogType.Action, LogImpact.Low, $"Bounty \"{bounty.Value.Bounty}\" (id:{bounty.Value.Id}) was fulfilled");
}
@@ -434,24 +437,44 @@ public bool TryAddBounty(EntityUid uid, CargoBountyPrototype bounty, StationCarg
}
[PublicAPI]
- public bool TryRemoveBounty(EntityUid uid, string dataId, StationCargoBountyDatabaseComponent? component = null)
+ public bool TryRemoveBounty(Entity ent,
+ string dataId,
+ bool skipped,
+ EntityUid? actor = null)
{
- if (!TryGetBountyFromId(uid, dataId, out var data, component))
+ if (!TryGetBountyFromId(ent.Owner, dataId, out var data, ent.Comp))
return false;
- return TryRemoveBounty(uid, data.Value, component);
+ return TryRemoveBounty(ent, data.Value, skipped, actor);
}
- public bool TryRemoveBounty(EntityUid uid, CargoBountyData data, StationCargoBountyDatabaseComponent? component = null)
+ public bool TryRemoveBounty(Entity ent,
+ CargoBountyData data,
+ bool skipped,
+ EntityUid? actor = null)
{
- if (!Resolve(uid, ref component))
+ if (!Resolve(ent, ref ent.Comp))
return false;
- for (var i = 0; i < component.Bounties.Count; i++)
+ for (var i = 0; i < ent.Comp.Bounties.Count; i++)
{
- if (component.Bounties[i].Id == data.Id)
+ if (ent.Comp.Bounties[i].Id == data.Id)
{
- component.Bounties.RemoveAt(i);
+ string? actorName = null;
+ if (actor != null)
+ {
+ var getIdentityEvent = new TryGetIdentityShortInfoEvent(ent.Owner, actor.Value);
+ RaiseLocalEvent(getIdentityEvent);
+ actorName = getIdentityEvent.Title;
+ }
+
+ ent.Comp.History.Add(new CargoBountyHistoryData(data,
+ skipped
+ ? CargoBountyHistoryData.BountyResult.Skipped
+ : CargoBountyHistoryData.BountyResult.Completed,
+ _gameTiming.CurTime,
+ actorName));
+ ent.Comp.Bounties.RemoveAt(i);
return true;
}
}
@@ -492,7 +515,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/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
index e4bd9515136b..9dbd2b88dcab 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
@@ -8,7 +8,7 @@
using Content.Shared.Cargo.Events;
using Content.Shared.Cargo.Prototypes;
using Content.Shared.Database;
-using Content.Shared.Emag.Components;
+using Content.Shared.Emag.Systems;
using Content.Shared.IdentityManagement;
using Content.Shared.Interaction;
using Content.Shared.Paper;
@@ -21,6 +21,7 @@ namespace Content.Server.Cargo.Systems
public sealed partial class CargoSystem
{
[Dependency] private readonly SharedTransformSystem _transformSystem = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
///
/// How much time to wait (in seconds) before increasing bank accounts balance.
@@ -41,6 +42,7 @@ private void InitializeConsole()
SubscribeLocalEvent(OnInit);
SubscribeLocalEvent(OnInteractUsing);
SubscribeLocalEvent(OnOrderBalanceUpdated);
+ SubscribeLocalEvent(OnEmagged);
Reset();
}
@@ -75,6 +77,17 @@ private void Reset()
_timer = 0;
}
+ private void OnEmagged(Entity ent, ref GotEmaggedEvent args)
+ {
+ if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+ return;
+
+ if (_emag.CheckFlag(ent, EmagType.Interaction))
+ return;
+
+ args.Handled = true;
+ }
+
private void UpdateConsole(float frameTime)
{
_timer += frameTime;
@@ -85,9 +98,11 @@ private void UpdateConsole(float frameTime)
{
_timer -= Delay;
- foreach (var account in EntityQuery())
+ var stationQuery = EntityQueryEnumerator();
+ while (stationQuery.MoveNext(out var uid, out var bank))
{
- account.Balance += account.IncreasePerSecond * Delay;
+ var balanceToAdd = bank.IncreasePerSecond * Delay;
+ UpdateBankAccount(uid, bank, balanceToAdd);
}
var query = EntityQueryEnumerator();
@@ -192,7 +207,7 @@ private void OnApproveOrderMessage(EntityUid uid, CargoOrderConsoleComponent com
order.Approved = true;
_audio.PlayPvs(component.ConfirmSound, uid);
- if (!HasComp(uid))
+ if (!_emag.CheckFlag(uid, EmagType.Interaction))
{
var tryGetIdentityShortInfoEvent = new TryGetIdentityShortInfoEvent(uid, player);
RaiseLocalEvent(tryGetIdentityShortInfoEvent);
@@ -213,7 +228,7 @@ private void OnApproveOrderMessage(EntityUid uid, CargoOrderConsoleComponent com
$"{ToPrettyString(player):user} approved order [orderId:{order.OrderId}, quantity:{order.OrderQuantity}, product:{order.ProductId}, requester:{order.Requester}, reason:{order.Reason}] with balance at {bank.Balance}");
orderDatabase.Orders.Remove(order);
- DeductFunds(bank, cost);
+ UpdateBankAccount(station.Value, bank, -cost);
UpdateOrders(station.Value);
}
@@ -536,11 +551,6 @@ private bool FulfillOrder(CargoOrderData order, EntityCoordinates spawn, string?
}
- private void DeductFunds(StationBankAccountComponent component, int amount)
- {
- component.Balance = Math.Max(0, component.Balance - amount);
- }
-
#region Station
private bool TryGetOrderDatabase([NotNullWhen(true)] EntityUid? stationUid, [MaybeNullWhen(false)] out StationCargoOrderDatabaseComponent dbComp)
diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs
index 65f927400162..d8aac5651599 100644
--- a/Content.Server/Cloning/CloningSystem.cs
+++ b/Content.Server/Cloning/CloningSystem.cs
@@ -60,6 +60,7 @@ public sealed class CloningSystem : EntitySystem
[Dependency] private readonly SharedMindSystem _mindSystem = default!;
[Dependency] private readonly MetaDataSystem _metaSystem = default!;
[Dependency] private readonly SharedJobSystem _jobs = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
public readonly Dictionary ClonesWaitingForMind = new();
public const float EasyModeCloningCost = 0.7f;
@@ -276,10 +277,15 @@ public override void Update(float frameTime)
///
private void OnEmagged(EntityUid uid, CloningPodComponent clonePod, ref GotEmaggedEvent args)
{
+ if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+ return;
+
+ if (_emag.CheckFlag(uid, EmagType.Interaction))
+ return;
+
if (!this.IsPowered(uid, EntityManager))
return;
- _audio.PlayPvs(clonePod.SparkSound, uid);
_popupSystem.PopupEntity(Loc.GetString("cloning-pod-component-upgrade-emag-requirement"), uid);
args.Handled = true;
}
@@ -309,7 +315,7 @@ private void EndFailedCloning(EntityUid uid, CloningPodComponent clonePod)
var indices = _transformSystem.GetGridTilePositionOrDefault((uid, transform));
var tileMix = _atmosphereSystem.GetTileMixture(transform.GridUid, null, indices, true);
- if (HasComp(uid))
+ if (_emag.CheckFlag(uid, EmagType.Interaction))
{
_audio.PlayPvs(clonePod.ScreamSound, uid);
Spawn(clonePod.MobSpawnId, transform.Coordinates);
@@ -327,7 +333,7 @@ private void EndFailedCloning(EntityUid uid, CloningPodComponent clonePod)
}
_puddleSystem.TrySpillAt(uid, bloodSolution, out _);
- if (!HasComp(uid))
+ if (!_emag.CheckFlag(uid, EmagType.Interaction))
{
_material.SpawnMultipleFromMaterial(_robustRandom.Next(1, (int) (clonePod.UsedBiomass / 2.5)), clonePod.RequiredMaterial, Transform(uid).Coordinates);
}
diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs
index d86c72ffc572..772d21baef1b 100644
--- a/Content.Server/Communications/CommunicationsConsoleSystem.cs
+++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs
@@ -16,7 +16,6 @@
using Content.Shared.Communications;
using Content.Shared.Database;
using Content.Shared.DeviceNetwork;
-using Content.Shared.Emag.Components;
using Content.Shared.IdentityManagement;
using Content.Shared.Popups;
using Robust.Server.GameObjects;
@@ -181,7 +180,7 @@ private static bool CanAnnounce(CommunicationsConsoleComponent comp)
private bool CanUse(EntityUid user, EntityUid console)
{
- if (TryComp(console, out var accessReaderComponent) && !HasComp(console))
+ if (TryComp(console, out var accessReaderComponent))
{
return _accessReaderSystem.IsAllowed(user, console, accessReaderComponent);
}
diff --git a/Content.Server/Construction/Commands/FixRotationsCommand.cs b/Content.Server/Construction/Commands/FixRotationsCommand.cs
index 1a42d4bf38b0..3232f12ed84a 100644
--- a/Content.Server/Construction/Commands/FixRotationsCommand.cs
+++ b/Content.Server/Construction/Commands/FixRotationsCommand.cs
@@ -89,6 +89,8 @@ public void Execute(IConsoleShell shell, string argsOther, string[] args)
valid |= tagSystem.HasTag(child, "ForceFixRotations");
// override
valid &= !tagSystem.HasTag(child, "ForceNoFixRotations");
+ // remove diagonal entities as well
+ valid &= !tagSystem.HasTag(child, "Diagonal");
if (!valid)
continue;
diff --git a/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs b/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs
index ca1d45e64494..72d66c76382f 100644
--- a/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs
+++ b/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs
@@ -13,6 +13,8 @@
using System.Diagnostics.CodeAnalysis;
using Content.Shared.IdentityManagement;
using Content.Shared.Security.Components;
+using System.Linq;
+using Content.Shared.Roles.Jobs;
namespace Content.Server.CriminalRecords.Systems;
@@ -42,6 +44,7 @@ public override void Initialize()
subs.Event(OnChangeStatus);
subs.Event(OnAddHistory);
subs.Event(OnDeleteHistory);
+ subs.Event(OnStatusFilterPressed);
});
}
@@ -57,6 +60,11 @@ private void OnKeySelected(Entity ent, ref Sele
ent.Comp.ActiveKey = msg.SelectedKey;
UpdateUserInterface(ent);
}
+ private void OnStatusFilterPressed(Entity ent, ref CriminalRecordSetStatusFilter msg)
+ {
+ ent.Comp.FilterStatus = msg.FilterStatus;
+ UpdateUserInterface(ent);
+ }
private void OnFiltersChanged(Entity ent, ref SetStationRecordFilter msg)
{
@@ -112,13 +120,26 @@ private void OnChangeStatus(Entity ent, ref Cri
}
// will probably never fail given the checks above
+ name = _records.RecordName(key.Value);
+ officer = Loc.GetString("criminal-records-console-unknown-officer");
+ var jobName = "Unknown";
+
+ _records.TryGetRecord(key.Value, out var entry);
+ if (entry != null)
+ jobName = entry.JobTitle;
+
+ var tryGetIdentityShortInfoEvent = new TryGetIdentityShortInfoEvent(null, mob.Value);
+ RaiseLocalEvent(tryGetIdentityShortInfoEvent);
+ if (tryGetIdentityShortInfoEvent.Title != null)
+ officer = tryGetIdentityShortInfoEvent.Title;
+
_criminalRecords.TryChangeStatus(key.Value, msg.Status, msg.Reason, officer);
(string, object)[] args;
if (reason != null)
- args = new (string, object)[] { ("name", name), ("officer", officer), ("reason", reason) };
+ args = new (string, object)[] { ("name", name), ("officer", officer), ("reason", reason), ("job", jobName) };
else
- args = new (string, object)[] { ("name", name), ("officer", officer) };
+ args = new (string, object)[] { ("name", name), ("officer", officer), ("job", jobName) };
// figure out which radio message to send depending on transition
var statusString = (oldStatus, msg.Status) switch
@@ -193,8 +214,18 @@ private void UpdateUserInterface(Entity ent)
return;
}
+ // get the listing of records to display
var listing = _records.BuildListing((owningStation.Value, stationRecords), console.Filter);
+ // filter the listing by the selected criminal record status
+ //if NONE, dont filter by status, just show all crew
+ if (console.FilterStatus != SecurityStatus.None)
+ {
+ listing = listing
+ .Where(x => _records.TryGetRecord(new StationRecordKey(x.Key, owningStation.Value), out var record) && record.Status == console.FilterStatus)
+ .ToDictionary(x => x.Key, x => x.Value);
+ }
+
var state = new CriminalRecordsConsoleState(listing, console.Filter);
if (console.ActiveKey is { } id)
{
@@ -205,6 +236,9 @@ private void UpdateUserInterface(Entity ent)
state.SelectedKey = id;
}
+ // Set the Current Tab aka the filter status type for the records list
+ state.FilterStatus = console.FilterStatus;
+
_ui.SetUiState(uid, CriminalRecordsConsoleKey.Key, state);
}
diff --git a/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs b/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs
index bc61c5d141a8..8dfe665541c9 100644
--- a/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs
+++ b/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs
@@ -1,5 +1,6 @@
using Content.Shared.Bed.Sleep;
using Content.Shared.Damage;
+using Content.Shared.Damage.Events;
using Content.Shared.Damage.ForceSay;
using Content.Shared.FixedPoint;
using Content.Shared.Mobs;
@@ -47,7 +48,7 @@ public override void Update(float frameTime)
}
}
- private void TryForceSay(EntityUid uid, DamageForceSayComponent component, bool useSuffix=true, string? suffixOverride = null)
+ private void TryForceSay(EntityUid uid, DamageForceSayComponent component, bool useSuffix=true)
{
if (!TryComp(uid, out var actor))
return;
@@ -57,7 +58,13 @@ private void TryForceSay(EntityUid uid, DamageForceSayComponent component, bool
_timing.CurTime < component.NextAllowedTime)
return;
- var suffix = Loc.GetString(suffixOverride ?? component.ForceSayStringPrefix + _random.Next(1, component.ForceSayStringCount));
+ var ev = new BeforeForceSayEvent(component.ForceSayStringDataset);
+ RaiseLocalEvent(uid, ev);
+
+ if (!_prototype.TryIndex(ev.Prefix, out var prefixList))
+ return;
+
+ var suffix = Loc.GetString(_random.Pick(prefixList.Values));
// set cooldown & raise event
component.NextAllowedTime = _timing.CurTime + component.Cooldown;
@@ -80,7 +87,7 @@ private void OnSleep(EntityUid uid, DamageForceSayComponent component, SleepStat
if (!args.FellAsleep)
return;
- TryForceSay(uid, component, true, "damage-force-say-sleep");
+ TryForceSay(uid, component);
AllowNextSpeech(uid);
}
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index c1a52447b799..ccbaf276cd4d 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -1112,7 +1112,7 @@ public async Task RemoveFromWhitelistAsync(NetUserId player)
.SingleOrDefaultAsync());
}
- public async Task SetLastReadRules(NetUserId player, DateTimeOffset date)
+ public async Task SetLastReadRules(NetUserId player, DateTimeOffset? date)
{
await using var db = await GetDb();
@@ -1122,7 +1122,7 @@ public async Task SetLastReadRules(NetUserId player, DateTimeOffset date)
return;
}
- dbPlayer.LastReadRules = date.UtcDateTime;
+ dbPlayer.LastReadRules = date?.UtcDateTime;
await db.DbContext.SaveChangesAsync();
}
@@ -1801,6 +1801,8 @@ await db.DbContext.IPIntelCache
#endregion
+ public abstract Task SendNotification(DatabaseNotification notification);
+
// SQLite returns DateTime as Kind=Unspecified, Npgsql actually knows for sure it's Kind=Utc.
// Normalize DateTimes here so they're always Utc. Thanks.
protected abstract DateTime NormalizeDatabaseTime(DateTime time);
diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs
index 9fee2c021bd3..e3cfb66c7f7a 100644
--- a/Content.Server/Database/ServerDbManager.cs
+++ b/Content.Server/Database/ServerDbManager.cs
@@ -282,7 +282,7 @@ Task AddConnectionLogAsync(
#region Rules
Task GetLastReadRules(NetUserId player);
- Task SetLastReadRules(NetUserId player, DateTimeOffset time);
+ Task SetLastReadRules(NetUserId player, DateTimeOffset? time);
#endregion
@@ -350,6 +350,15 @@ Task AddConnectionLogAsync(
/// The notification to trigger
void InjectTestNotification(DatabaseNotification notification);
+ ///
+ /// Send a notification to all other servers connected to the same database.
+ ///
+ ///
+ /// The local server will receive the sent notification itself again.
+ ///
+ /// The notification to send.
+ Task SendNotification(DatabaseNotification notification);
+
#endregion
}
@@ -821,7 +830,7 @@ public Task PurgeUploadedResourceLogAsync(int days)
return RunDbCommand(() => _db.GetLastReadRules(player));
}
- public Task SetLastReadRules(NetUserId player, DateTimeOffset time)
+ public Task SetLastReadRules(NetUserId player, DateTimeOffset? time)
{
DbWriteOpsMetric.Inc();
return RunDbCommand(() => _db.SetLastReadRules(player, time));
@@ -1045,6 +1054,12 @@ public void InjectTestNotification(DatabaseNotification notification)
HandleDatabaseNotification(notification);
}
+ public Task SendNotification(DatabaseNotification notification)
+ {
+ DbWriteOpsMetric.Inc();
+ return RunDbCommand(() => _db.SendNotification(notification));
+ }
+
private async void HandleDatabaseNotification(DatabaseNotification notification)
{
lock (_notificationHandlers)
diff --git a/Content.Server/Database/ServerDbManagerExt.cs b/Content.Server/Database/ServerDbManagerExt.cs
new file mode 100644
index 000000000000..fad7a7234ec0
--- /dev/null
+++ b/Content.Server/Database/ServerDbManagerExt.cs
@@ -0,0 +1,76 @@
+using System.Text.Json;
+using Robust.Shared.Asynchronous;
+
+namespace Content.Server.Database;
+
+public static class ServerDbManagerExt
+{
+ ///
+ /// Subscribe to a database notification on a specific channel, formatted as JSON.
+ ///
+ /// The database manager to subscribe on.
+ /// The task manager used to run the main callback on the main thread.
+ /// Sawmill to log any errors to.
+ ///
+ /// The notification channel to listen on. Only notifications on this channel will be handled.
+ ///
+ ///
+ /// The action to run on the notification data.
+ /// This runs on the main thread.
+ ///
+ ///
+ /// An early filter callback that runs before the JSON message is deserialized.
+ /// Return false to not handle the notification.
+ /// This does not run on the main thread.
+ ///
+ ///
+ /// A filter callback that runs after the JSON message is deserialized.
+ /// Return false to not handle the notification.
+ /// This does not run on the main thread.
+ ///
+ /// The type of JSON data to deserialize.
+ public static void SubscribeToJsonNotification(
+ this IServerDbManager dbManager,
+ ITaskManager taskManager,
+ ISawmill sawmill,
+ string channel,
+ Action action,
+ Func? earlyFilter = null,
+ Func? filter = null)
+ {
+ dbManager.SubscribeToNotifications(notification =>
+ {
+ if (notification.Channel != channel)
+ return;
+
+ if (notification.Payload == null)
+ {
+ sawmill.Error($"Got {channel} notification with null payload!");
+ return;
+ }
+
+ if (earlyFilter != null && !earlyFilter())
+ return;
+
+ TData data;
+ try
+ {
+ data = JsonSerializer.Deserialize(notification.Payload)
+ ?? throw new JsonException("Content is null");
+ }
+ catch (JsonException e)
+ {
+ sawmill.Error($"Got invalid JSON in {channel} notification: {e}");
+ return;
+ }
+
+ if (filter != null && !filter(data))
+ return;
+
+ taskManager.RunOnMainThread(() =>
+ {
+ action(data);
+ });
+ });
+ }
+}
diff --git a/Content.Server/Database/ServerDbPostgres.Notifications.cs b/Content.Server/Database/ServerDbPostgres.Notifications.cs
index 69cf2c7d775d..91db2d100f8a 100644
--- a/Content.Server/Database/ServerDbPostgres.Notifications.cs
+++ b/Content.Server/Database/ServerDbPostgres.Notifications.cs
@@ -2,6 +2,7 @@
using System.Threading;
using System.Threading.Tasks;
using Content.Server.Administration.Managers;
+using Microsoft.EntityFrameworkCore;
using Npgsql;
namespace Content.Server.Database;
@@ -17,6 +18,7 @@ public sealed partial class ServerDbPostgres
private static readonly string[] NotificationChannels =
[
BanManager.BanNotificationChannel,
+ MultiServerKickManager.NotificationChannel,
];
private static readonly TimeSpan ReconnectWaitIncrease = TimeSpan.FromSeconds(10);
@@ -111,6 +113,14 @@ private void OnNotification(object _, NpgsqlNotificationEventArgs notification)
});
}
+ public override async Task SendNotification(DatabaseNotification notification)
+ {
+ await using var db = await GetDbImpl();
+
+ await db.PgDbContext.Database.ExecuteSqlAsync(
+ $"SELECT pg_notify({notification.Channel}, {notification.Payload})");
+ }
+
public override void Shutdown()
{
_notificationTokenSource.Cancel();
diff --git a/Content.Server/Database/ServerDbSqlite.cs b/Content.Server/Database/ServerDbSqlite.cs
index 6ec90c3332f1..c3109ec6e669 100644
--- a/Content.Server/Database/ServerDbSqlite.cs
+++ b/Content.Server/Database/ServerDbSqlite.cs
@@ -537,6 +537,12 @@ public override async Task AddAdminMessage(AdminMessage message)
return await base.AddAdminMessage(message);
}
+ public override Task SendNotification(DatabaseNotification notification)
+ {
+ // Notifications not implemented on SQLite.
+ return Task.CompletedTask;
+ }
+
protected override DateTime NormalizeDatabaseTime(DateTime time)
{
DebugTools.Assert(time.Kind == DateTimeKind.Unspecified);
diff --git a/Content.Server/EntityEffects/Effects/ExplosionReactionEffect.cs b/Content.Server/EntityEffects/Effects/ExplosionReactionEffect.cs
index 689757d04408..24c58898c652 100644
--- a/Content.Server/EntityEffects/Effects/ExplosionReactionEffect.cs
+++ b/Content.Server/EntityEffects/Effects/ExplosionReactionEffect.cs
@@ -15,7 +15,6 @@ public sealed partial class ExplosionReactionEffect : EntityEffect
/// The type of explosion. Determines damage types and tile break chance scaling.
///
[DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer))]
- [JsonIgnore]
public string ExplosionType = default!;
///
@@ -23,14 +22,12 @@ public sealed partial class ExplosionReactionEffect : EntityEffect
/// chance.
///
[DataField]
- [JsonIgnore]
public float MaxIntensity = 5;
///
/// How quickly intensity drops off as you move away from the epicenter
///
[DataField]
- [JsonIgnore]
public float IntensitySlope = 1;
///
@@ -41,15 +38,20 @@ public sealed partial class ExplosionReactionEffect : EntityEffect
/// A slope of 1 and MaxTotalIntensity of 100 corresponds to a radius of around 4.5 tiles.
///
[DataField]
- [JsonIgnore]
public float MaxTotalIntensity = 100;
///
/// The intensity of the explosion per unit reaction.
///
[DataField]
- [JsonIgnore]
public float IntensityPerUnit = 1;
+
+ ///
+ /// Factor used to scale the explosion intensity when calculating tile break chances. Allows for stronger
+ /// explosives that don't space tiles, without having to create a new explosion-type prototype.
+ ///
+ [DataField]
+ public float TileBreakScale = 1f;
public override bool ShouldLog => true;
@@ -72,6 +74,7 @@ public override void Effect(EntityEffectBaseArgs args)
ExplosionType,
intensity,
IntensitySlope,
- MaxIntensity);
+ MaxIntensity,
+ TileBreakScale);
}
}
diff --git a/Content.Server/Entry/EntryPoint.cs b/Content.Server/Entry/EntryPoint.cs
index 3d4ea922dc0e..b9c20942a029 100644
--- a/Content.Server/Entry/EntryPoint.cs
+++ b/Content.Server/Entry/EntryPoint.cs
@@ -152,6 +152,7 @@ public override void PostInit()
IoCManager.Resolve().GetEntitySystem().PostInitialize();
IoCManager.Resolve().Initialize();
IoCManager.Resolve().PostInit();
+ IoCManager.Resolve().Initialize();
}
}
diff --git a/Content.Server/Fax/FaxSystem.cs b/Content.Server/Fax/FaxSystem.cs
index a43d0171e604..b73c101e3fea 100644
--- a/Content.Server/Fax/FaxSystem.cs
+++ b/Content.Server/Fax/FaxSystem.cs
@@ -50,6 +50,7 @@ public sealed class FaxSystem : EntitySystem
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
[Dependency] private readonly FaxecuteSystem _faxecute = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
private const string PaperSlotId = "Paper";
@@ -227,7 +228,7 @@ private void OnInteractUsing(EntityUid uid, FaxMachineComponent component, Inter
return;
}
- if (component.KnownFaxes.ContainsValue(newName) && !HasComp(uid)) // Allow existing names if emagged for fun
+ if (component.KnownFaxes.ContainsValue(newName) && !_emag.CheckFlag(uid, EmagType.Interaction)) // Allow existing names if emagged for fun
{
_popupSystem.PopupEntity(Loc.GetString("fax-machine-popup-name-exist"), uid);
return;
@@ -246,7 +247,12 @@ private void OnInteractUsing(EntityUid uid, FaxMachineComponent component, Inter
private void OnEmagged(EntityUid uid, FaxMachineComponent component, ref GotEmaggedEvent args)
{
- _audioSystem.PlayPvs(component.EmagSound, uid);
+ if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+ return;
+
+ if (_emag.CheckFlag(uid, EmagType.Interaction))
+ return;
+
args.Handled = true;
}
@@ -260,7 +266,7 @@ private void OnPacketReceived(EntityUid uid, FaxMachineComponent component, Devi
switch (command)
{
case FaxConstants.FaxPingCommand:
- var isForSyndie = HasComp(uid) &&
+ var isForSyndie = _emag.CheckFlag(uid, EmagType.Interaction) &&
args.Data.ContainsKey(FaxConstants.FaxSyndicateData);
if (!isForSyndie && !component.ResponsePings)
return;
@@ -405,7 +411,7 @@ public void Refresh(EntityUid uid, FaxMachineComponent? component = null)
{ DeviceNetworkConstants.Command, FaxConstants.FaxPingCommand }
};
- if (HasComp(uid))
+ if (_emag.CheckFlag(uid, EmagType.Interaction))
payload.Add(FaxConstants.FaxSyndicateData, true);
_deviceNetworkSystem.QueuePacket(uid, null, payload);
diff --git a/Content.Server/GameTicking/GameTicker.CVars.cs b/Content.Server/GameTicking/GameTicker.CVars.cs
index bb6845974000..0b7bb26dfed0 100644
--- a/Content.Server/GameTicking/GameTicker.CVars.cs
+++ b/Content.Server/GameTicking/GameTicker.CVars.cs
@@ -26,6 +26,8 @@ public sealed partial class GameTicker
private WebhookIdentifier? _webhookIdentifier;
+ private WebhookIdentifier? _webhookIdentifierPostround;
+
[ViewVariables]
private string? RoundEndSoundCollection { get; set; }
@@ -63,6 +65,13 @@ private void InitializeCVars()
_discord.GetWebhook(value, data => _webhookIdentifier = data.ToIdentifier());
}
}, true);
+ Subs.CVar(_cfg, CCVars.DiscordPostroundChatWebhook, value =>
+ {
+ if (!string.IsNullOrWhiteSpace(value))
+ {
+ _discord.GetWebhook(value, data => _webhookIdentifierPostround = data.ToIdentifier());
+ }
+ }, true);
Subs.CVar(_cfg, CCVars.DiscordRoundEndRoleWebhook, value =>
{
DiscordRoundEndRole = value;
diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index b220da21b503..de0472f1aeee 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -480,6 +480,15 @@ private async void SendRoundEndDiscordMessage()
payload.AllowedMentions.AllowRoleMentions();
await _discord.CreateMessage(_webhookIdentifier.Value, payload);
+
+ if (_webhookIdentifierPostround == null)
+ return;
+
+ content = Loc.GetString("discord-round-postround-end",
+ ("id", RoundId));
+ payload = new WebhookPayload { Content = content };
+
+ await _discord.CreateMessage(_webhookIdentifierPostround.Value, payload);
}
catch (Exception e)
{
@@ -662,6 +671,15 @@ private async void SendRoundStartedDiscordMessage()
var payload = new WebhookPayload { Content = content };
await _discord.CreateMessage(_webhookIdentifier.Value, payload);
+
+ if (_webhookIdentifierPostround == null)
+ return;
+
+ content = Loc.GetString("discord-round-postround-started",
+ ("id", RoundId));
+ payload = new WebhookPayload { Content = content };
+
+ await _discord.CreateMessage(_webhookIdentifierPostround.Value, payload);
}
catch (Exception e)
{
diff --git a/Content.Server/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs
index c5e6c15b5163..3e99137a2dee 100644
--- a/Content.Server/Holopad/HolopadSystem.cs
+++ b/Content.Server/Holopad/HolopadSystem.cs
@@ -15,6 +15,7 @@
using Content.Shared.UserInterface;
using Content.Shared.Verbs;
using Robust.Server.GameObjects;
+using Robust.Server.GameStates;
using Robust.Shared.Containers;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
@@ -35,22 +36,15 @@ public sealed class HolopadSystem : SharedHolopadSystem
[Dependency] private readonly ChatSystem _chatSystem = default!;
[Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly IGameTiming _timing = default!;
+ [Dependency] private readonly PvsOverrideSystem _pvs = default!;
private float _updateTimer = 1.0f;
-
private const float UpdateTime = 1.0f;
- private const float MinTimeBetweenSyncRequests = 0.5f;
- private TimeSpan _minTimeSpanBetweenSyncRequests;
-
- private HashSet _pendingRequestsForSpriteState = new();
- private HashSet _recentlyUpdatedHolograms = new();
public override void Initialize()
{
base.Initialize();
- _minTimeSpanBetweenSyncRequests = TimeSpan.FromSeconds(MinTimeBetweenSyncRequests);
-
// Holopad UI and bound user interface messages
SubscribeLocalEvent(OnUIOpen);
SubscribeLocalEvent(OnHolopadStartNewCall);
@@ -68,7 +62,6 @@ public override void Initialize()
// Networked events
SubscribeNetworkEvent(OnTypingChanged);
- SubscribeNetworkEvent(OnPlayerSpriteStateMessage);
// Component start/shutdown events
SubscribeLocalEvent(OnHolopadInit);
@@ -268,16 +261,11 @@ private void OnHoloCallCommenced(Entity source, ref TelephoneC
if (source.Comp.Hologram == null)
GenerateHologram(source);
- // Receiver holopad holograms have to be generated now instead of waiting for their own event
- // to fire because holographic avatars get synced immediately
if (TryComp(args.Receiver, out var receivingHolopad) && receivingHolopad.Hologram == null)
GenerateHologram((args.Receiver, receivingHolopad));
- if (source.Comp.User != null)
- {
- // Re-link the user to refresh the sprite data
- LinkHolopadToUser(source, source.Comp.User.Value);
- }
+ // Re-link the user to refresh the sprite data
+ LinkHolopadToUser(source, source.Comp.User);
}
private void OnHoloCallEnded(Entity entity, ref TelephoneCallEndedEvent args)
@@ -323,22 +311,6 @@ private void OnTypingChanged(HolopadUserTypingChangedEvent ev, EntitySessionEven
}
}
- private void OnPlayerSpriteStateMessage(PlayerSpriteStateMessage ev, EntitySessionEventArgs args)
- {
- var uid = args.SenderSession.AttachedEntity;
-
- if (!Exists(uid))
- return;
-
- if (!_pendingRequestsForSpriteState.Remove(uid.Value))
- return;
-
- if (!TryComp(uid, out var holopadUser))
- return;
-
- SyncHolopadUserWithLinkedHolograms((uid.Value, holopadUser), ev.SpriteLayerData);
- }
-
#endregion
#region: Component start/shutdown events
@@ -485,8 +457,6 @@ public override void Update(float frameTime)
}
}
}
-
- _recentlyUpdatedHolograms.Clear();
}
public void UpdateUIState(Entity entity, TelephoneComponent? telephone = null)
@@ -555,10 +525,16 @@ private void DeleteHologram(Entity hologram, Entity entity, EntityUid user)
+ private void LinkHolopadToUser(Entity entity, EntityUid? user)
{
+ if (user == null)
+ {
+ UnlinkHolopadFromUser(entity, null);
+ return;
+ }
+
if (!TryComp(user, out var holopadUser))
- holopadUser = AddComp(user);
+ holopadUser = AddComp(user.Value);
if (user != entity.Comp.User?.Owner)
{
@@ -567,51 +543,44 @@ private void LinkHolopadToUser(Entity entity, EntityUid user)
// Assigns the new user in their place
holopadUser.LinkedHolopads.Add(entity);
- entity.Comp.User = (user, holopadUser);
+ entity.Comp.User = (user.Value, holopadUser);
}
- if (TryComp(user, out var avatar))
- {
- SyncHolopadUserWithLinkedHolograms((user, holopadUser), avatar.LayerData);
- return;
- }
-
- // We have no apriori sprite data for the hologram, request
- // the current appearance of the user from the client
- RequestHolopadUserSpriteUpdate((user, holopadUser));
+ // Add the new user to PVS and sync their appearance with any
+ // holopads connected to the one they are using
+ _pvs.AddGlobalOverride(user.Value);
+ SyncHolopadHologramAppearanceWithTarget(entity, entity.Comp.User);
}
private void UnlinkHolopadFromUser(Entity entity, Entity? user)
{
- if (user == null)
- return;
-
entity.Comp.User = null;
+ SyncHolopadHologramAppearanceWithTarget(entity, null);
- foreach (var linkedHolopad in GetLinkedHolopads(entity))
- {
- if (linkedHolopad.Comp.Hologram != null)
- {
- _appearanceSystem.SetData(linkedHolopad.Comp.Hologram.Value.Owner, TypingIndicatorVisuals.IsTyping, false);
-
- // Send message with no sprite data to the client
- // This will set the holgram sprite to a generic icon
- var ev = new PlayerSpriteStateMessage(GetNetEntity(linkedHolopad.Comp.Hologram.Value));
- RaiseNetworkEvent(ev);
- }
- }
-
- if (!HasComp(user))
+ if (user == null)
return;
user.Value.Comp.LinkedHolopads.Remove(entity);
- if (!user.Value.Comp.LinkedHolopads.Any())
+ if (!user.Value.Comp.LinkedHolopads.Any() &&
+ user.Value.Comp.LifeStage < ComponentLifeStage.Stopping)
{
- _pendingRequestsForSpriteState.Remove(user.Value);
+ _pvs.RemoveGlobalOverride(user.Value);
+ RemComp(user.Value);
+ }
+ }
+ private void SyncHolopadHologramAppearanceWithTarget(Entity entity, Entity? user)
+ {
+ foreach (var linkedHolopad in GetLinkedHolopads(entity))
+ {
+ if (linkedHolopad.Comp.Hologram == null)
+ continue;
+
+ if (user == null)
+ _appearanceSystem.SetData(linkedHolopad.Comp.Hologram.Value.Owner, TypingIndicatorVisuals.IsTyping, false);
- if (user.Value.Comp.LifeStage < ComponentLifeStage.Stopping)
- RemComp(user.Value);
+ linkedHolopad.Comp.Hologram.Value.Comp.LinkedEntity = user;
+ Dirty(linkedHolopad.Comp.Hologram.Value);
}
}
@@ -646,31 +615,6 @@ private void ShutDownHolopad(Entity entity)
Dirty(entity);
}
- private void RequestHolopadUserSpriteUpdate(Entity user)
- {
- if (!_pendingRequestsForSpriteState.Add(user))
- return;
-
- var ev = new PlayerSpriteStateRequest(GetNetEntity(user));
- RaiseNetworkEvent(ev);
- }
-
- private void SyncHolopadUserWithLinkedHolograms(Entity entity, PrototypeLayerData[]? spriteLayerData)
- {
- foreach (var linkedHolopad in entity.Comp.LinkedHolopads)
- {
- foreach (var receivingHolopad in GetLinkedHolopads(linkedHolopad))
- {
- if (receivingHolopad.Comp.Hologram == null || !_recentlyUpdatedHolograms.Add(receivingHolopad.Comp.Hologram.Value))
- continue;
-
- var netHologram = GetNetEntity(receivingHolopad.Comp.Hologram.Value);
- var ev = new PlayerSpriteStateMessage(netHologram, spriteLayerData);
- RaiseNetworkEvent(ev);
- }
- }
- }
-
private void ActivateProjector(Entity entity, EntityUid user)
{
if (!TryComp(entity, out var receiverTelephone))
diff --git a/Content.Server/Implants/ImplantedSystem.cs b/Content.Server/Implants/ImplantedSystem.cs
index 5d27e6471185..c5048cbd8df7 100644
--- a/Content.Server/Implants/ImplantedSystem.cs
+++ b/Content.Server/Implants/ImplantedSystem.cs
@@ -1,4 +1,6 @@
-using Content.Shared.Implants.Components;
+using Content.Server.Body.Components;
+using Content.Shared.Implants.Components;
+using Content.Shared.Storage;
using Robust.Shared.Containers;
namespace Content.Server.Implants;
@@ -9,17 +11,29 @@ public void InitializeImplanted()
{
SubscribeLocalEvent(OnImplantedInit);
SubscribeLocalEvent(OnShutdown);
+ SubscribeLocalEvent(OnGibbed);
}
- private void OnImplantedInit(EntityUid uid, ImplantedComponent component, ComponentInit args)
+ private void OnImplantedInit(Entity ent, ref ComponentInit args)
{
- component.ImplantContainer = _container.EnsureContainer(uid, ImplanterComponent.ImplantSlotId);
- component.ImplantContainer.OccludesLight = false;
+ ent.Comp.ImplantContainer = _container.EnsureContainer(ent.Owner, ImplanterComponent.ImplantSlotId);
+ ent.Comp.ImplantContainer.OccludesLight = false;
}
- private void OnShutdown(EntityUid uid, ImplantedComponent component, ComponentShutdown args)
+ private void OnShutdown(Entity ent, ref ComponentShutdown args)
{
//If the entity is deleted, get rid of the implants
- _container.CleanContainer(component.ImplantContainer);
+ _container.CleanContainer(ent.Comp.ImplantContainer);
+ }
+
+ private void OnGibbed(Entity ent, ref BeingGibbedEvent args)
+ {
+ // Drop the storage implant contents before the implants are deleted by the body being gibbed
+ foreach (var implant in ent.Comp.ImplantContainer.ContainedEntities)
+ {
+ if (TryComp(implant, out var storage))
+ _container.EmptyContainer(storage.Container, destination: Transform(ent).Coordinates);
+ }
+
}
}
diff --git a/Content.Server/Implants/ImplanterSystem.cs b/Content.Server/Implants/ImplanterSystem.cs
index e441574213e9..5efd5dc6fb32 100644
--- a/Content.Server/Implants/ImplanterSystem.cs
+++ b/Content.Server/Implants/ImplanterSystem.cs
@@ -58,17 +58,6 @@ private void OnImplanterAfterInteract(EntityUid uid, ImplanterComponent componen
return;
}
- // Check if we are trying to implant a implant which is already implanted
- if (implant.HasValue && !component.AllowMultipleImplants && CheckSameImplant(target, implant.Value))
- {
- var name = Identity.Name(target, EntityManager, args.User);
- var msg = Loc.GetString("implanter-component-implant-already", ("implant", implant), ("target", name));
- _popup.PopupEntity(msg, target, args.User);
- args.Handled = true;
- return;
- }
-
-
//Implant self instantly, otherwise try to inject the target.
if (args.User == target)
Implant(target, target, uid, component);
@@ -79,14 +68,7 @@ private void OnImplanterAfterInteract(EntityUid uid, ImplanterComponent componen
args.Handled = true;
}
- public bool CheckSameImplant(EntityUid target, EntityUid implant)
- {
- if (!TryComp(target, out var implanted))
- return false;
- var implantPrototype = Prototype(implant);
- return implanted.ImplantContainer.ContainedEntities.Any(entity => Prototype(entity) == implantPrototype);
- }
///
/// Attempt to implant someone else.
diff --git a/Content.Server/Implants/RadioImplantSystem.cs b/Content.Server/Implants/RadioImplantSystem.cs
new file mode 100644
index 000000000000..d9ba2290574e
--- /dev/null
+++ b/Content.Server/Implants/RadioImplantSystem.cs
@@ -0,0 +1,76 @@
+using Content.Server.Radio.Components;
+using Content.Shared.Implants;
+using Content.Shared.Implants.Components;
+using Robust.Shared.Containers;
+
+namespace Content.Server.Implants;
+
+public sealed class RadioImplantSystem : EntitySystem
+{
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnImplantImplanted);
+ SubscribeLocalEvent(OnRemove);
+ }
+
+ ///
+ /// If implanted with a radio implant, installs the necessary intrinsic radio components
+ ///
+ private void OnImplantImplanted(Entity ent, ref ImplantImplantedEvent args)
+ {
+ if (args.Implanted == null)
+ return;
+
+ var activeRadio = EnsureComp(args.Implanted.Value);
+ foreach (var channel in ent.Comp.RadioChannels)
+ {
+ if (activeRadio.Channels.Add(channel))
+ ent.Comp.ActiveAddedChannels.Add(channel);
+ }
+
+ EnsureComp(args.Implanted.Value);
+
+ var intrinsicRadioTransmitter = EnsureComp(args.Implanted.Value);
+ foreach (var channel in ent.Comp.RadioChannels)
+ {
+ if (intrinsicRadioTransmitter.Channels.Add(channel))
+ ent.Comp.TransmitterAddedChannels.Add(channel);
+ }
+ }
+
+ ///
+ /// Removes intrinsic radio components once the Radio Implant is removed
+ ///
+ private void OnRemove(Entity ent, ref EntGotRemovedFromContainerMessage args)
+ {
+ if (TryComp(args.Container.Owner, out var activeRadioComponent))
+ {
+ foreach (var channel in ent.Comp.ActiveAddedChannels)
+ {
+ activeRadioComponent.Channels.Remove(channel);
+ }
+ ent.Comp.ActiveAddedChannels.Clear();
+
+ if (activeRadioComponent.Channels.Count == 0)
+ {
+ RemCompDeferred(args.Container.Owner);
+ }
+ }
+
+ if (!TryComp(args.Container.Owner, out var radioTransmitterComponent))
+ return;
+
+ foreach (var channel in ent.Comp.TransmitterAddedChannels)
+ {
+ radioTransmitterComponent.Channels.Remove(channel);
+ }
+ ent.Comp.TransmitterAddedChannels.Clear();
+
+ if (radioTransmitterComponent.Channels.Count == 0 || activeRadioComponent?.Channels.Count == 0)
+ {
+ RemCompDeferred(args.Container.Owner);
+ }
+ }
+}
diff --git a/Content.Server/Info/RulesManager.cs b/Content.Server/Info/RulesManager.cs
index f4d9e57bd4dd..224d7f7d9af3 100644
--- a/Content.Server/Info/RulesManager.cs
+++ b/Content.Server/Info/RulesManager.cs
@@ -34,7 +34,7 @@ private async void OnConnected(object? sender, NetChannelArgs e)
{
PopupTime = _cfg.GetCVar(CCVars.RulesWaitTime),
CoreRules = _cfg.GetCVar(CCVars.RulesFile),
- ShouldShowRules = !isLocalhost && !hasCooldown
+ ShouldShowRules = !isLocalhost && !hasCooldown,
};
_netManager.ServerSendMessage(showRulesMessage, e.Channel);
}
diff --git a/Content.Server/IoC/ServerContentIoC.cs b/Content.Server/IoC/ServerContentIoC.cs
index 777e13424699..50b248a9ea37 100644
--- a/Content.Server/IoC/ServerContentIoC.cs
+++ b/Content.Server/IoC/ServerContentIoC.cs
@@ -75,6 +75,7 @@ public static void Register()
IoCManager.Register();
IoCManager.Register();
IoCManager.Register();
+ IoCManager.Register();
}
}
}
diff --git a/Content.Server/Lathe/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs
index 18f246dcef49..ba82e65aa79a 100644
--- a/Content.Server/Lathe/LatheSystem.cs
+++ b/Content.Server/Lathe/LatheSystem.cs
@@ -16,6 +16,7 @@
using Content.Shared.UserInterface;
using Content.Shared.Database;
using Content.Shared.Emag.Components;
+using Content.Shared.Emag.Systems;
using Content.Shared.Examine;
using Content.Shared.Lathe;
using Content.Shared.Materials;
@@ -42,6 +43,7 @@ public sealed class LatheSystem : SharedLatheSystem
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly ContainerSystem _container = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
[Dependency] private readonly UserInterfaceSystem _uiSys = default!;
[Dependency] private readonly MaterialStorageSystem _materialStorage = default!;
[Dependency] private readonly PopupSystem _popup = default!;
@@ -292,7 +294,7 @@ private void GetEmagLatheRecipes(EntityUid uid, EmagLatheRecipesComponent compon
{
if (uid != args.Lathe || !TryComp(uid, out var technologyDatabase))
return;
- if (!args.getUnavailable && !HasComp(uid))
+ if (!args.getUnavailable && !_emag.CheckFlag(uid, EmagType.Interaction))
return;
foreach (var recipe in component.EmagDynamicRecipes)
{
diff --git a/Content.Server/Medical/HealingSystem.cs b/Content.Server/Medical/HealingSystem.cs
index cf5869d1cbb7..74bce0eee6ae 100644
--- a/Content.Server/Medical/HealingSystem.cs
+++ b/Content.Server/Medical/HealingSystem.cs
@@ -72,7 +72,10 @@ entity.Comp.DamageContainerID is not null &&
_bloodstreamSystem.TryModifyBleedAmount(entity.Owner, healing.BloodlossModifier);
if (isBleeding != bloodstream.BleedAmount > 0)
{
- _popupSystem.PopupEntity(Loc.GetString("medical-item-stop-bleeding"), entity, args.User);
+ var popup = (args.User == entity.Owner)
+ ? Loc.GetString("medical-item-stop-bleeding-self")
+ : Loc.GetString("medical-item-stop-bleeding", ("target", Identity.Entity(entity.Owner, EntityManager)));
+ _popupSystem.PopupEntity(popup, entity, args.User);
}
}
diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
index 51974d7036cf..b697a42d5132 100644
--- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
+++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
@@ -22,6 +22,7 @@
using Content.Shared.Verbs;
using Robust.Shared.Containers;
using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using Robust.Shared.Timing;
@@ -42,6 +43,7 @@ public sealed class SuitSensorSystem : EntitySystem
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
[Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
[Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+ [Dependency] private readonly IPrototypeManager _proto = default!;
public override void Initialize()
{
@@ -369,7 +371,7 @@ public void SetSensor(Entity sensors, SuitSensorMode mode,
userJobIcon = card.Comp.JobIcon;
foreach (var department in card.Comp.JobDepartments)
- userJobDepartments.Add(Loc.GetString($"department-{department}"));
+ userJobDepartments.Add(Loc.GetString(_proto.Index(department).Name));
}
// get health mob state
diff --git a/Content.Server/Mindshield/MindShieldSystem.cs b/Content.Server/Mindshield/MindShieldSystem.cs
index ca9d91def51f..aab61cf79855 100644
--- a/Content.Server/Mindshield/MindShieldSystem.cs
+++ b/Content.Server/Mindshield/MindShieldSystem.cs
@@ -2,7 +2,7 @@
using Content.Server.Mind;
using Content.Server.Popups;
using Content.Server.Roles;
-using Content.Shared._Goobstation.FakeMindshield.Components;
+using Content.Shared.Changeling;
using Content.Shared.Database;
using Content.Shared.Implants;
using Content.Shared.Implants.Components;
@@ -49,7 +49,7 @@ public void ImplantCheck(EntityUid uid, SubdermalImplantComponent comp, ref Impl
///
public void MindShieldRemovalCheck(EntityUid implanted, EntityUid implant)
{
- if (HasComp(implanted))
+ if (HasComp(implanted) && HasComp(implanted))
{
_popupSystem.PopupEntity(Loc.GetString("changeling-mindshield-overwrite"), implanted, implanted, Shared.Popups.PopupType.MediumCaution);
RemComp(implanted);
diff --git a/Content.Server/Mining/MiningSystem.cs b/Content.Server/Mining/MiningSystem.cs
index 18e96e576962..6b1b0fed4d8c 100644
--- a/Content.Server/Mining/MiningSystem.cs
+++ b/Content.Server/Mining/MiningSystem.cs
@@ -35,7 +35,7 @@ private void OnDestruction(EntityUid uid, OreVeinComponent component, Destructio
return;
var coords = Transform(uid).Coordinates;
- var toSpawn = _random.Next(proto.MinOreYield, proto.MaxOreYield);
+ var toSpawn = _random.Next(proto.MinOreYield, proto.MaxOreYield+1);
for (var i = 0; i < toSpawn; i++)
{
Spawn(proto.OreEntity, coords.Offset(_random.NextVector2(0.2f)));
diff --git a/Content.Server/Movement/Components/EyeCursorOffsetComponent.cs b/Content.Server/Movement/Components/EyeCursorOffsetComponent.cs
new file mode 100644
index 000000000000..b3809fe794b1
--- /dev/null
+++ b/Content.Server/Movement/Components/EyeCursorOffsetComponent.cs
@@ -0,0 +1,12 @@
+using System.Numerics;
+using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Systems;
+using Robust.Shared.GameStates;
+
+namespace Content.Server.Movement.Components;
+
+[RegisterComponent]
+public sealed partial class EyeCursorOffsetComponent : SharedEyeCursorOffsetComponent
+{
+
+}
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs
index 2cc735194f6a..bac9cfcf40b4 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs
@@ -1,5 +1,5 @@
using Content.Server.Chat.Systems;
-using Content.Server.NPC.Components;
+using Content.Shared.NPC.Components;
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.Damage;
using Content.Shared.Emag.Components;
@@ -55,34 +55,11 @@ public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTi
if (!_entMan.TryGetComponent(owner, out var botComp))
return HTNOperatorStatus.Failed;
-
- if (!_entMan.TryGetComponent(target, out var damage))
- return HTNOperatorStatus.Failed;
-
- if (!_solutionContainer.TryGetInjectableSolution(target, out var injectable, out _))
+ if (!_medibot.CheckInjectable((owner, botComp), target) || !_medibot.TryInject((owner, botComp), target))
return HTNOperatorStatus.Failed;
- if (!_interaction.InRangeUnobstructed(owner, target))
- return HTNOperatorStatus.Failed;
-
- var total = damage.TotalDamage;
-
- // always inject healthy patients when emagged
- if (total == 0 && !_entMan.HasComponent(owner))
- return HTNOperatorStatus.Failed;
-
- if (!_entMan.TryGetComponent(target, out var mobState))
- return HTNOperatorStatus.Failed;
-
- var state = mobState.CurrentState;
- if (!_medibot.TryGetTreatment(botComp, mobState.CurrentState, out var treatment) || !treatment.IsValid(total))
- return HTNOperatorStatus.Failed;
-
- _entMan.EnsureComponent(target);
- _solutionContainer.TryAddReagent(injectable.Value, treatment.Reagent, treatment.Quantity, out _);
- _popup.PopupEntity(Loc.GetString("hypospray-component-feel-prick-message"), target, target);
- _audio.PlayPvs(botComp.InjectSound, target);
_chat.TrySendInGameICMessage(owner, Loc.GetString("medibot-finish-inject"), InGameICChatType.Speak, hideChat: true, hideLog: true);
+
return HTNOperatorStatus.Finished;
}
}
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyInjectableOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyInjectableOperator.cs
index a71091ad97dd..f351d582c6ee 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyInjectableOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyInjectableOperator.cs
@@ -1,6 +1,6 @@
using System.Threading;
using System.Threading.Tasks;
-using Content.Server.NPC.Components;
+using Content.Shared.NPC.Components;
using Content.Server.NPC.Pathfinding;
using Content.Shared.Chemistry.Components.SolutionManager;
using Content.Shared.Damage;
diff --git a/Content.Server/NPC/Systems/NPCPerceptionSystem.RecentlyInjected.cs b/Content.Server/NPC/Systems/NPCPerceptionSystem.RecentlyInjected.cs
index dd4ff6c65f19..6d8cb9dfe54e 100644
--- a/Content.Server/NPC/Systems/NPCPerceptionSystem.RecentlyInjected.cs
+++ b/Content.Server/NPC/Systems/NPCPerceptionSystem.RecentlyInjected.cs
@@ -1,4 +1,4 @@
-using Content.Server.NPC.Components;
+using Content.Shared.NPC.Components;
namespace Content.Server.NPC.Systems;
diff --git a/Content.Server/Nuke/NukeComponent.cs b/Content.Server/Nuke/NukeComponent.cs
index 141e99055cf3..e1a117f4bdbe 100644
--- a/Content.Server/Nuke/NukeComponent.cs
+++ b/Content.Server/Nuke/NukeComponent.cs
@@ -25,6 +25,13 @@ public sealed partial class NukeComponent : SharedNukeComponent
[ViewVariables(VVAccess.ReadWrite)]
public int Timer = 300;
+ ///
+ /// If the nuke is disarmed, this sets the minimum amount of time the timer can have.
+ /// The remaining time will reset to this value if it is below it.
+ ///
+ [DataField]
+ public int MinimumTime = 180;
+
///
/// How long until the bomb can arm again after deactivation.
/// Used to prevent announcements spam.
diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs
index 0e9ceb7714fc..4003cd73fcf5 100644
--- a/Content.Server/Nuke/NukeSystem.cs
+++ b/Content.Server/Nuke/NukeSystem.cs
@@ -530,6 +530,9 @@ public void DisarmBomb(EntityUid uid, NukeComponent? component = null)
_sound.PlayGlobalOnStation(uid, _audio.GetSound(component.DisarmSound));
_sound.StopStationEventMusic(uid, StationEventMusicType.Nuke);
+ // reset nuke remaining time to either itself or the minimum time, whichever is higher
+ component.RemainingTime = Math.Max(component.RemainingTime, component.MinimumTime);
+
// disable sound and reset it
component.PlayedAlertSound = false;
component.AlertAudioStream = _audio.Stop(component.AlertAudioStream);
diff --git a/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs b/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs
index 6e9856a61dc0..8f4c5f415003 100644
--- a/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs
@@ -21,6 +21,7 @@ namespace Content.Server.Nutrition.EntitySystems;
public sealed class FatExtractorSystem : EntitySystem
{
[Dependency] private readonly IGameTiming _timing = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
[Dependency] private readonly HungerSystem _hunger = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
@@ -36,8 +37,13 @@ public override void Initialize()
private void OnGotEmagged(EntityUid uid, FatExtractorComponent component, ref GotEmaggedEvent args)
{
+ if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+ return;
+
+ if (_emag.CheckFlag(uid, EmagType.Interaction))
+ return;
+
args.Handled = true;
- args.Repeatable = false;
}
private void OnClosed(EntityUid uid, FatExtractorComponent component, ref StorageAfterCloseEvent args)
@@ -103,7 +109,7 @@ public bool TryGetValidOccupant(EntityUid uid, [NotNullWhen(true)] out EntityUid
if (_hunger.GetHunger(hunger) < component.NutritionPerSecond)
return false;
- if (hunger.CurrentThreshold < component.MinHungerThreshold && !HasComp(uid))
+ if (hunger.CurrentThreshold < component.MinHungerThreshold && !_emag.CheckFlag(uid, EmagType.Interaction))
return false;
return true;
diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs
index 26fa5ca3cc8f..48fb946135e7 100644
--- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs
+++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs
@@ -24,6 +24,7 @@ public sealed partial class SmokingSystem
{
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
[Dependency] private readonly DamageableSystem _damageableSystem = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
[Dependency] private readonly FoodSystem _foodSystem = default!;
[Dependency] private readonly ExplosionSystem _explosionSystem = default!;
[Dependency] private readonly PopupSystem _popupSystem = default!;
@@ -63,7 +64,7 @@ private void OnVapeInteraction(Entity entity, ref AfterInteractEv
forced = false;
}
- if (entity.Comp.ExplodeOnUse || HasComp(entity.Owner))
+ if (entity.Comp.ExplodeOnUse || _emag.CheckFlag(entity, EmagType.Interaction))
{
_explosionSystem.QueueExplosion(entity.Owner, "Default", entity.Comp.ExplosionIntensity, 0.5f, 3, canCreateVacuum: false);
EntityManager.DeleteEntity(entity);
@@ -161,8 +162,15 @@ private void OnVapeDoAfter(Entity entity, ref VapeDoAfterEvent ar
args.Args.Target.Value);
}
}
+
private void OnEmagged(Entity entity, ref GotEmaggedEvent args)
{
+ if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+ return;
+
+ if (_emag.CheckFlag(entity, EmagType.Interaction))
+ return;
+
args.Handled = true;
}
}
diff --git a/Content.Server/Power/Components/BatteryComponent.cs b/Content.Server/Power/Components/BatteryComponent.cs
index 4ef889133392..860b7b219a83 100644
--- a/Content.Server/Power/Components/BatteryComponent.cs
+++ b/Content.Server/Power/Components/BatteryComponent.cs
@@ -1,4 +1,5 @@
using Content.Server.Power.EntitySystems;
+using Content.Shared.Guidebook;
namespace Content.Server.Power.Components
{
@@ -16,6 +17,7 @@ public partial class BatteryComponent : Component
/// Maximum charge of the battery in joules (ie. watt seconds)
///
[DataField]
+ [GuidebookData]
public float MaxCharge;
///
diff --git a/Content.Server/Power/Components/PowerNetworkBatteryComponent.cs b/Content.Server/Power/Components/PowerNetworkBatteryComponent.cs
index a0f74df6a127..fcef03903b9a 100644
--- a/Content.Server/Power/Components/PowerNetworkBatteryComponent.cs
+++ b/Content.Server/Power/Components/PowerNetworkBatteryComponent.cs
@@ -1,4 +1,5 @@
using Content.Server.Power.Pow3r;
+using Content.Shared.Guidebook;
namespace Content.Server.Power.Components
{
@@ -24,6 +25,7 @@ public float MaxChargeRate
[DataField("maxSupply")]
[ViewVariables(VVAccess.ReadWrite)]
+ [GuidebookData]
public float MaxSupply
{
get => NetworkBattery.MaxSupply;
diff --git a/Content.Server/Power/Components/PowerSupplierComponent.cs b/Content.Server/Power/Components/PowerSupplierComponent.cs
index cf23288fcd63..30f8335c4957 100644
--- a/Content.Server/Power/Components/PowerSupplierComponent.cs
+++ b/Content.Server/Power/Components/PowerSupplierComponent.cs
@@ -1,5 +1,6 @@
using Content.Server.Power.NodeGroups;
using Content.Server.Power.Pow3r;
+using Content.Shared.Guidebook;
namespace Content.Server.Power.Components
{
@@ -8,6 +9,7 @@ public sealed partial class PowerSupplierComponent : BaseNetConnectorComponent NetworkSupply.MaxSupply; set => NetworkSupply.MaxSupply = value; }
[ViewVariables(VVAccess.ReadWrite)]
diff --git a/Content.Server/Power/EntitySystems/ApcSystem.cs b/Content.Server/Power/EntitySystems/ApcSystem.cs
index 14dddbb43e32..29c1431179da 100644
--- a/Content.Server/Power/EntitySystems/ApcSystem.cs
+++ b/Content.Server/Power/EntitySystems/ApcSystem.cs
@@ -4,7 +4,6 @@
using Content.Server.Power.Pow3r;
using Content.Shared.Access.Systems;
using Content.Shared.APC;
-using Content.Shared.Emag.Components;
using Content.Shared.Emag.Systems;
using Content.Shared.Popups;
using Content.Shared.Rounding;
@@ -19,6 +18,7 @@ public sealed class ApcSystem : EntitySystem
{
[Dependency] private readonly AccessReaderSystem _accessReader = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
[Dependency] private readonly PopupSystem _popup = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
@@ -111,7 +111,12 @@ public void ApcToggleBreaker(EntityUid uid, ApcComponent? apc = null, PowerNetwo
private void OnEmagged(EntityUid uid, ApcComponent comp, ref GotEmaggedEvent args)
{
- // no fancy conditions
+ if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+ return;
+
+ if (_emag.CheckFlag(uid, EmagType.Interaction))
+ return;
+
args.Handled = true;
}
@@ -170,7 +175,7 @@ public void UpdateUIState(EntityUid uid,
private ApcChargeState CalcChargeState(EntityUid uid, PowerState.Battery battery)
{
- if (HasComp(uid))
+ if (_emag.CheckFlag(uid, EmagType.Interaction))
return ApcChargeState.Emag;
if (battery.CurrentStorage / battery.Capacity > ApcComponent.HighPowerThreshold)
diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs
index f015cf091ea3..52370b9dc6f5 100644
--- a/Content.Server/Projectiles/ProjectileSystem.cs
+++ b/Content.Server/Projectiles/ProjectileSystem.cs
@@ -1,10 +1,12 @@
using Content.Server.Administration.Logs;
+using Content.Server.Destructible;
using Content.Server.Effects;
using Content.Server.Weapons.Ranged.Systems;
using Content.Shared.Camera;
using Content.Shared.Damage;
using Content.Shared.Damage.Events;
using Content.Shared.Database;
+using Content.Shared.FixedPoint;
using Content.Shared.Projectiles;
using Robust.Shared.Physics.Events;
using Robust.Shared.Player;
@@ -17,6 +19,7 @@ public sealed class ProjectileSystem : SharedProjectileSystem
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
[Dependency] private readonly ColorFlashEffectSystem _color = default!;
[Dependency] private readonly DamageableSystem _damageableSystem = default!;
+ [Dependency] private readonly DestructibleSystem _destructibleSystem = default!;
[Dependency] private readonly GunSystem _guns = default!;
[Dependency] private readonly SharedCameraRecoilSystem _sharedCameraRecoil = default!;
@@ -31,7 +34,7 @@ private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref St
{
// This is so entities that shouldn't get a collision are ignored.
if (args.OurFixtureId != ProjectileFixture || !args.OtherFixture.Hard
- || component.DamagedEntity || component is { Weapon: null, OnlyCollideWhenShot: true })
+ || component.ProjectileSpent || component is { Weapon: null, OnlyCollideWhenShot: true })
return;
var target = args.OtherEntity;
@@ -48,7 +51,13 @@ private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref St
RaiseLocalEvent(uid, ref ev);
var otherName = ToPrettyString(target);
- var modifiedDamage = _damageableSystem.TryChangeDamage(target, ev.Damage, component.IgnoreResistances, origin: component.Shooter);
+ var damageRequired = _destructibleSystem.DestroyedAt(target);
+ if (TryComp(target, out var damageableComponent))
+ {
+ damageRequired -= damageableComponent.TotalDamage;
+ damageRequired = FixedPoint2.Max(damageRequired, FixedPoint2.Zero);
+ }
+ var modifiedDamage = _damageableSystem.TryChangeDamage(target, ev.Damage, component.IgnoreResistances, damageable: damageableComponent, origin: component.Shooter);
var deleted = Deleted(target);
if (modifiedDamage is not null && EntityManager.EntityExists(component.Shooter))
@@ -63,6 +72,46 @@ private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref St
$"Projectile {ToPrettyString(uid):projectile} shot by {ToPrettyString(component.Shooter!.Value):user} hit {otherName:target} and dealt {modifiedDamage.GetTotal():damage} damage");
}
+ // If penetration is to be considered, we need to do some checks to see if the projectile should stop.
+ if (modifiedDamage is not null && component.PenetrationThreshold != 0)
+ {
+ // If a damage type is required, stop the bullet if the hit entity doesn't have that type.
+ if (component.PenetrationDamageTypeRequirement != null)
+ {
+ var stopPenetration = false;
+ foreach (var requiredDamageType in component.PenetrationDamageTypeRequirement)
+ {
+ if (!modifiedDamage.DamageDict.Keys.Contains(requiredDamageType))
+ {
+ stopPenetration = true;
+ break;
+ }
+ }
+ if (stopPenetration)
+ component.ProjectileSpent = true;
+ }
+
+ // If the object won't be destroyed, it "tanks" the penetration hit.
+ if (modifiedDamage.GetTotal() < damageRequired)
+ {
+ component.ProjectileSpent = true;
+ }
+
+ if (!component.ProjectileSpent)
+ {
+ component.PenetrationAmount += damageRequired;
+ // The projectile has dealt enough damage to be spent.
+ if (component.PenetrationAmount >= component.PenetrationThreshold)
+ {
+ component.ProjectileSpent = true;
+ }
+ }
+ }
+ else
+ {
+ component.ProjectileSpent = true;
+ }
+
if (!deleted)
{
_guns.PlayImpactSound(target, modifiedDamage, component.SoundHit, component.ForceSound);
@@ -71,9 +120,7 @@ private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref St
_sharedCameraRecoil.KickCamera(target, args.OurBody.LinearVelocity.Normalized());
}
- component.DamagedEntity = true;
-
- if (component.DeleteOnCollide)
+ if (component.DeleteOnCollide && component.ProjectileSpent)
QueueDel(uid);
if (component.ImpactEffect != null && TryComp(uid, out TransformComponent? xform))
diff --git a/Content.Server/Radiation/Systems/RadiationSystem.Debug.cs b/Content.Server/Radiation/Systems/RadiationSystem.Debug.cs
index a5f74e09e9db..44360905652a 100644
--- a/Content.Server/Radiation/Systems/RadiationSystem.Debug.cs
+++ b/Content.Server/Radiation/Systems/RadiationSystem.Debug.cs
@@ -5,6 +5,7 @@
using Content.Shared.Radiation.Events;
using Content.Shared.Radiation.Systems;
using Robust.Shared.Console;
+using Robust.Shared.Debugging;
using Robust.Shared.Enums;
using Robust.Shared.Map.Components;
using Robust.Shared.Player;
@@ -42,12 +43,12 @@ public void ToggleDebugView(ICommonSession session)
///
private void UpdateDebugOverlay(EntityEventArgs ev)
{
- var sessions = _debugSessions.ToArray();
- foreach (var session in sessions)
+ foreach (var session in _debugSessions)
{
if (session.Status != SessionStatus.InGame)
_debugSessions.Remove(session);
- RaiseNetworkEvent(ev, session.Channel);
+ else
+ RaiseNetworkEvent(ev, session);
}
}
@@ -70,13 +71,16 @@ private void UpdateResistanceDebugOverlay()
UpdateDebugOverlay(ev);
}
- private void UpdateGridcastDebugOverlay(double elapsedTime, int totalSources,
- int totalReceivers, List rays)
+ private void UpdateGridcastDebugOverlay(
+ double elapsedTime,
+ int totalSources,
+ int totalReceivers,
+ List? rays)
{
if (_debugSessions.Count == 0)
return;
- var ev = new OnRadiationOverlayUpdateEvent(elapsedTime, totalSources, totalReceivers, rays);
+ var ev = new OnRadiationOverlayUpdateEvent(elapsedTime, totalSources, totalReceivers, rays ?? new());
UpdateDebugOverlay(ev);
}
}
diff --git a/Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs b/Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs
index ccee7cf227cb..15e1c352564b 100644
--- a/Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs
+++ b/Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs
@@ -1,12 +1,9 @@
-using System.Linq;
using System.Numerics;
using Content.Server.Radiation.Components;
using Content.Server.Radiation.Events;
using Content.Shared.Radiation.Components;
using Content.Shared.Radiation.Systems;
-using Content.Shared.Stacks;
using Robust.Shared.Collections;
-using Robust.Shared.Containers;
using Robust.Shared.Map.Components;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
@@ -16,68 +13,86 @@ namespace Content.Server.Radiation.Systems;
// main algorithm that fire radiation rays to target
public partial class RadiationSystem
{
- [Dependency] private readonly SharedStackSystem _stack = default!;
- [Dependency] private readonly SharedContainerSystem _container = default!;
+ private List> _grids = new();
- private EntityQuery _radiationBlockingContainers;
+ private readonly record struct SourceData(
+ float Intensity,
+ Entity Entity,
+ Vector2 WorldPosition)
+ {
+ public EntityUid? GridUid => Entity.Comp2.GridUid;
+ public float Slope => Entity.Comp1.Slope;
+ public TransformComponent Transform => Entity.Comp2;
+ }
private void UpdateGridcast()
{
// should we save debug information into rays?
// if there is no debug sessions connected - just ignore it
- var saveVisitedTiles = _debugSessions.Count > 0;
+ var debug = _debugSessions.Count > 0;
var stopwatch = new Stopwatch();
stopwatch.Start();
+ _sources.Clear();
+ _sources.EnsureCapacity(EntityManager.Count());
+
var sources = EntityQueryEnumerator();
var destinations = EntityQueryEnumerator();
- var resistanceQuery = GetEntityQuery();
- var transformQuery = GetEntityQuery();
- var gridQuery = GetEntityQuery();
- var stackQuery = GetEntityQuery();
-
- _radiationBlockingContainers = GetEntityQuery();
- // precalculate world positions for each source
- // so we won't need to calc this in cycle over and over again
- var sourcesData = new ValueList<(EntityUid, RadiationSourceComponent, TransformComponent, Vector2)>();
- while (sources.MoveNext(out var uid, out var source, out var sourceTrs))
+ while (sources.MoveNext(out var uid, out var source, out var xform))
{
if (!source.Enabled)
continue;
- var worldPos = _transform.GetWorldPosition(sourceTrs, transformQuery);
- var data = (uid, source, sourceTrs, worldPos);
- sourcesData.Add(data);
+ var worldPos = _transform.GetWorldPosition(xform);
+
+ // Intensity is scaled by stack size.
+ var intensity = source.Intensity * _stack.GetCount(uid);
+
+ // Apply rad modifier if the source is enclosed within a radiation blocking container
+ // Note that this also applies to receivers, and it doesn't bother to check if the container sits between them.
+ // I.e., a source & receiver in the same blocking container will get double-blocked, when no blocking should be applied.
+ intensity = GetAdjustedRadiationIntensity(uid, intensity);
+
+ _sources.Add(new(intensity, (uid, source, xform), worldPos));
}
- // trace all rays from rad source to rad receivers
- var rays = new List();
+ var debugRays = debug ? new List() : null;
var receiversTotalRads = new ValueList<(Entity, float)>();
+
+ // TODO RADIATION Parallelize
+ // Would need to give receiversTotalRads a fixed size.
+ // Also the _grids list needs to be local to a job. (or better yet cached in SourceData)
+ // And I guess disable parallelization when debugging to make populating the debug List easier.
+ // Or just make it threadsafe?
while (destinations.MoveNext(out var destUid, out var dest, out var destTrs))
{
- var destWorld = _transform.GetWorldPosition(destTrs, transformQuery);
+ var destWorld = _transform.GetWorldPosition(destTrs);
var rads = 0f;
- foreach (var (uid, source, sourceTrs, sourceWorld) in sourcesData)
+ foreach (var source in _sources)
{
- stackQuery.TryGetComponent(uid, out var stack);
- var intensity = source.Intensity * _stack.GetCount(uid, stack);
-
// send ray towards destination entity
- var ray = Irradiate(uid, sourceTrs, sourceWorld,
- destUid, destTrs, destWorld,
- intensity, source.Slope, saveVisitedTiles, resistanceQuery, transformQuery, gridQuery);
- if (ray == null)
+ if (Irradiate(source, destUid, destTrs, destWorld, debug) is not {} ray)
continue;
- // save ray for debug
- rays.Add(ray);
-
// add rads to total rad exposure
if (ray.ReachedDestination)
rads += ray.Rads;
+
+ if (!debug)
+ continue;
+
+ debugRays!.Add(new DebugRadiationRay(
+ ray.MapId,
+ GetNetEntity(ray.SourceUid),
+ ray.Source,
+ GetNetEntity(ray.DestinationUid),
+ ray.Destination,
+ ray.Rads,
+ ray.Blockers ?? new())
+ );
}
// Apply modifier if the destination entity is hidden within a radiation blocking container
@@ -88,9 +103,9 @@ private void UpdateGridcast()
// update information for debug overlay
var elapsedTime = stopwatch.Elapsed.TotalMilliseconds;
- var totalSources = sourcesData.Count;
+ var totalSources = _sources.Count;
var totalReceivers = receiversTotalRads.Count;
- UpdateGridcastDebugOverlay(elapsedTime, totalSources, totalReceivers, rays);
+ UpdateGridcastDebugOverlay(elapsedTime, totalSources, totalReceivers, debugRays);
// send rads to each entity
foreach (var (receiver, rads) in receiversTotalRads)
@@ -108,19 +123,20 @@ private void UpdateGridcast()
RaiseLocalEvent(new RadiationSystemUpdatedEvent());
}
- private RadiationRay? Irradiate(EntityUid sourceUid, TransformComponent sourceTrs, Vector2 sourceWorld,
- EntityUid destUid, TransformComponent destTrs, Vector2 destWorld,
- float incomingRads, float slope, bool saveVisitedTiles,
- EntityQuery resistanceQuery,
- EntityQuery transformQuery, EntityQuery gridQuery)
+ private RadiationRay? Irradiate(SourceData source,
+ EntityUid destUid,
+ TransformComponent destTrs,
+ Vector2 destWorld,
+ bool saveVisitedTiles)
{
// lets first check that source and destination on the same map
- if (sourceTrs.MapID != destTrs.MapID)
+ if (source.Transform.MapID != destTrs.MapID)
return null;
- var mapId = sourceTrs.MapID;
+
+ var mapId = destTrs.MapID;
// get direction from rad source to destination and its distance
- var dir = destWorld - sourceWorld;
+ var dir = destWorld - source.WorldPosition;
var dist = dir.Length();
// check if receiver is too far away
@@ -128,41 +144,42 @@ private void UpdateGridcast()
return null;
// will it even reach destination considering distance penalty
- var rads = incomingRads - slope * dist;
-
- // Apply rad modifier if the source is enclosed within a radiation blocking container
- rads = GetAdjustedRadiationIntensity(sourceUid, rads);
-
- if (rads <= MinIntensity)
+ var rads = source.Intensity - source.Slope * dist;
+ if (rads < MinIntensity)
return null;
// create a new radiation ray from source to destination
// at first we assume that it doesn't hit any radiation blockers
// and has only distance penalty
- var ray = new RadiationRay(mapId, GetNetEntity(sourceUid), sourceWorld, GetNetEntity(destUid), destWorld, rads);
+ var ray = new RadiationRay(mapId, source.Entity, source.WorldPosition, destUid, destWorld, rads);
// if source and destination on the same grid it's possible that
// between them can be another grid (ie. shuttle in center of donut station)
// however we can do simplification and ignore that case
- if (GridcastSimplifiedSameGrid && sourceTrs.GridUid != null && sourceTrs.GridUid == destTrs.GridUid)
+ if (GridcastSimplifiedSameGrid && destTrs.GridUid is {} gridUid && source.GridUid == gridUid)
{
- if (!gridQuery.TryGetComponent(sourceTrs.GridUid.Value, out var gridComponent))
+ if (!_gridQuery.TryGetComponent(gridUid, out var gridComponent))
return ray;
- return Gridcast((sourceTrs.GridUid.Value, gridComponent), ray, saveVisitedTiles, resistanceQuery, sourceTrs, destTrs, transformQuery.GetComponent(sourceTrs.GridUid.Value));
+ return Gridcast((gridUid, gridComponent, Transform(gridUid)), ref ray, saveVisitedTiles, source.Transform, destTrs);
}
// lets check how many grids are between source and destination
// do a box intersection test between target and destination
// it's not very precise, but really cheap
- var box = Box2.FromTwoPoints(sourceWorld, destWorld);
- var grids = new List>();
- _mapManager.FindGridsIntersecting(mapId, box, ref grids, true);
+
+ // TODO RADIATION
+ // Consider caching this in SourceData?
+ // I.e., make the lookup for grids as large as the sources's max distance and store the result in SourceData.
+ // Avoids having to do a lookup per source*receiver.
+ var box = Box2.FromTwoPoints(source.WorldPosition, destWorld);
+ _grids.Clear();
+ _mapManager.FindGridsIntersecting(mapId, box, ref _grids, true);
// gridcast through each grid and try to hit some radiation blockers
// the ray will be updated with each grid that has some blockers
- foreach (var grid in grids)
+ foreach (var grid in _grids)
{
- ray = Gridcast(grid, ray, saveVisitedTiles, resistanceQuery, sourceTrs, destTrs, transformQuery.GetComponent(grid));
+ ray = Gridcast((grid.Owner, grid.Comp, Transform(grid)), ref ray, saveVisitedTiles, source.Transform, destTrs);
// looks like last grid blocked all radiation
// we can return right now
@@ -170,20 +187,23 @@ private void UpdateGridcast()
return ray;
}
+ _grids.Clear();
+
return ray;
}
- private RadiationRay Gridcast(Entity grid, RadiationRay ray, bool saveVisitedTiles,
- EntityQuery resistanceQuery,
+ private RadiationRay Gridcast(
+ Entity grid,
+ ref RadiationRay ray,
+ bool saveVisitedTiles,
TransformComponent sourceTrs,
- TransformComponent destTrs,
- TransformComponent gridTrs)
+ TransformComponent destTrs)
{
- var blockers = new List<(Vector2i, float)>();
+ var blockers = saveVisitedTiles ? new List<(Vector2i, float)>() : null;
// if grid doesn't have resistance map just apply distance penalty
var gridUid = grid.Owner;
- if (!resistanceQuery.TryGetComponent(gridUid, out var resistance))
+ if (!_resistanceQuery.TryGetComponent(gridUid, out var resistance))
return ray;
var resistanceMap = resistance.ResistancePerTile;
@@ -195,19 +215,19 @@ private RadiationRay Gridcast(Entity grid, RadiationRay ray, b
Vector2 srcLocal = sourceTrs.ParentUid == grid.Owner
? sourceTrs.LocalPosition
- : Vector2.Transform(ray.Source, gridTrs.InvLocalMatrix);
+ : Vector2.Transform(ray.Source, grid.Comp2.InvLocalMatrix);
Vector2 dstLocal = destTrs.ParentUid == grid.Owner
? destTrs.LocalPosition
- : Vector2.Transform(ray.Destination, gridTrs.InvLocalMatrix);
+ : Vector2.Transform(ray.Destination, grid.Comp2.InvLocalMatrix);
Vector2i sourceGrid = new(
- (int) Math.Floor(srcLocal.X / grid.Comp.TileSize),
- (int) Math.Floor(srcLocal.Y / grid.Comp.TileSize));
+ (int) Math.Floor(srcLocal.X / grid.Comp1.TileSize),
+ (int) Math.Floor(srcLocal.Y / grid.Comp1.TileSize));
Vector2i destGrid = new(
- (int) Math.Floor(dstLocal.X / grid.Comp.TileSize),
- (int) Math.Floor(dstLocal.Y / grid.Comp.TileSize));
+ (int) Math.Floor(dstLocal.X / grid.Comp1.TileSize),
+ (int) Math.Floor(dstLocal.Y / grid.Comp1.TileSize));
// iterate tiles in grid line from source to destination
var line = new GridLineEnumerator(sourceGrid, destGrid);
@@ -220,7 +240,7 @@ private RadiationRay Gridcast(Entity grid, RadiationRay ray, b
// save data for debug
if (saveVisitedTiles)
- blockers.Add((point, ray.Rads));
+ blockers!.Add((point, ray.Rads));
// no intensity left after blocker
if (ray.Rads <= MinIntensity)
@@ -230,21 +250,45 @@ private RadiationRay Gridcast(Entity grid, RadiationRay ray, b
}
}
+ if (!saveVisitedTiles || blockers!.Count <= 0)
+ return ray;
+
// save data for debug if needed
- if (saveVisitedTiles && blockers.Count > 0)
- ray.Blockers.Add(GetNetEntity(gridUid), blockers);
+ ray.Blockers ??= new();
+ ray.Blockers.Add(GetNetEntity(gridUid), blockers);
return ray;
}
private float GetAdjustedRadiationIntensity(EntityUid uid, float rads)
{
- var radblockingComps = new List();
- if (_container.TryFindComponentsOnEntityContainerOrParent(uid, _radiationBlockingContainers, radblockingComps))
+ var child = uid;
+ var xform = Transform(uid);
+ var parent = xform.ParentUid;
+
+ while (parent.IsValid())
{
- rads -= radblockingComps.Sum(x => x.RadResistance);
+ var parentXform = Transform(parent);
+ var childMeta = MetaData(child);
+
+ if ((childMeta.Flags & MetaDataFlags.InContainer) != MetaDataFlags.InContainer)
+ {
+ child = parent;
+ parent = parentXform.ParentUid;
+ continue;
+ }
+
+ if (_blockerQuery.TryComp(xform.ParentUid, out var blocker))
+ {
+ rads -= blocker.RadResistance;
+ if (rads < 0)
+ return 0;
+ }
+
+ child = parent;
+ parent = parentXform.ParentUid;
}
- return float.Max(rads, 0);
+ return rads;
}
}
diff --git a/Content.Server/Radiation/Systems/RadiationSystem.cs b/Content.Server/Radiation/Systems/RadiationSystem.cs
index e184c022f2f4..3ba393959c25 100644
--- a/Content.Server/Radiation/Systems/RadiationSystem.cs
+++ b/Content.Server/Radiation/Systems/RadiationSystem.cs
@@ -1,8 +1,10 @@
using Content.Server.Radiation.Components;
using Content.Shared.Radiation.Components;
using Content.Shared.Radiation.Events;
+using Content.Shared.Stacks;
using Robust.Shared.Configuration;
using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
namespace Content.Server.Radiation.Systems;
@@ -11,14 +13,26 @@ public sealed partial class RadiationSystem : EntitySystem
[Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
+ [Dependency] private readonly SharedStackSystem _stack = default!;
+
+ private EntityQuery _blockerQuery;
+ private EntityQuery _resistanceQuery;
+ private EntityQuery _gridQuery;
+ private EntityQuery _stackQuery;
private float _accumulator;
+ private List _sources = new();
public override void Initialize()
{
base.Initialize();
SubscribeCvars();
InitRadBlocking();
+
+ _blockerQuery = GetEntityQuery();
+ _resistanceQuery = GetEntityQuery();
+ _gridQuery = GetEntityQuery();
+ _stackQuery = GetEntityQuery();
}
public override void Update(float frameTime)
diff --git a/Content.Server/Remotes/DoorRemoteSystem.cs b/Content.Server/Remotes/DoorRemoteSystem.cs
index de327bd08403..27df5ef34d20 100644
--- a/Content.Server/Remotes/DoorRemoteSystem.cs
+++ b/Content.Server/Remotes/DoorRemoteSystem.cs
@@ -1,13 +1,13 @@
using Content.Server.Administration.Logs;
-using Content.Shared.Interaction;
-using Content.Shared.Doors.Components;
-using Content.Shared.Access.Components;
using Content.Server.Doors.Systems;
using Content.Server.Power.EntitySystems;
+using Content.Shared.Access.Components;
using Content.Shared.Database;
+using Content.Shared.Doors.Components;
using Content.Shared.Examine;
-using Content.Shared.Remotes.EntitySystems;
+using Content.Shared.Interaction;
using Content.Shared.Remotes.Components;
+using Content.Shared.Remotes.EntitySystems;
namespace Content.Shared.Remotes
{
@@ -17,6 +17,7 @@ public sealed class DoorRemoteSystem : SharedDoorRemoteSystem
[Dependency] private readonly AirlockSystem _airlock = default!;
[Dependency] private readonly DoorSystem _doorSystem = default!;
[Dependency] private readonly ExamineSystemShared _examine = default!;
+
public override void Initialize()
{
base.Initialize();
@@ -31,9 +32,12 @@ private void OnBeforeInteract(Entity entity, ref BeforeRang
if (args.Handled
|| args.Target == null
|| !TryComp(args.Target, out var doorComp) // If it isn't a door we don't use it
- // Only able to control doors if they are within your vision and within your max range.
- // Not affected by mobs or machines anymore.
- || !_examine.InRangeUnOccluded(args.User, args.Target.Value, SharedInteractionSystem.MaxRaycastRange, null))
+ // Only able to control doors if they are within your vision and within your max range.
+ // Not affected by mobs or machines anymore.
+ || !_examine.InRangeUnOccluded(args.User,
+ args.Target.Value,
+ SharedInteractionSystem.MaxRaycastRange,
+ null))
{
return;
@@ -50,7 +54,8 @@ private void OnBeforeInteract(Entity entity, ref BeforeRang
if (TryComp(args.Target, out var accessComponent)
&& !_doorSystem.HasAccess(args.Target.Value, args.Used, doorComp, accessComponent))
{
- _doorSystem.Deny(args.Target.Value, doorComp, args.User);
+ if (isAirlock)
+ _doorSystem.Deny(args.Target.Value, doorComp, args.User);
Popup.PopupEntity(Loc.GetString("door-remote-denied"), args.User, args.User);
return;
}
@@ -59,7 +64,9 @@ private void OnBeforeInteract(Entity entity, ref BeforeRang
{
case OperatingMode.OpenClose:
if (_doorSystem.TryToggleDoor(args.Target.Value, doorComp, args.Used))
- _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)}: {doorComp.State}");
+ _adminLogger.Add(LogType.Action,
+ LogImpact.Medium,
+ $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)}: {doorComp.State}");
break;
case OperatingMode.ToggleBolts:
if (TryComp(args.Target, out var boltsComp))
@@ -67,17 +74,22 @@ private void OnBeforeInteract(Entity entity, ref BeforeRang
if (!boltsComp.BoltWireCut)
{
_doorSystem.SetBoltsDown((args.Target.Value, boltsComp), !boltsComp.BoltsDown, args.Used);
- _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)} to {(boltsComp.BoltsDown ? "" : "un")}bolt it");
+ _adminLogger.Add(LogType.Action,
+ LogImpact.Medium,
+ $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)} to {(boltsComp.BoltsDown ? "" : "un")}bolt it");
}
}
+
break;
case OperatingMode.ToggleEmergencyAccess:
if (airlockComp != null)
{
_airlock.SetEmergencyAccess((args.Target.Value, airlockComp), !airlockComp.EmergencyAccess);
- _adminLogger.Add(LogType.Action, LogImpact.Medium,
+ _adminLogger.Add(LogType.Action,
+ LogImpact.Medium,
$"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)} to set emergency access {(airlockComp.EmergencyAccess ? "on" : "off")}");
}
+
break;
default:
throw new InvalidOperationException(
diff --git a/Content.Server/Research/Systems/ResearchSystem.Console.cs b/Content.Server/Research/Systems/ResearchSystem.Console.cs
index 127b80a631e6..c227aee7f075 100644
--- a/Content.Server/Research/Systems/ResearchSystem.Console.cs
+++ b/Content.Server/Research/Systems/ResearchSystem.Console.cs
@@ -3,6 +3,7 @@
using Content.Shared.UserInterface;
using Content.Shared.Access.Components;
using Content.Shared.Emag.Components;
+using Content.Shared.Emag.Systems;
using Content.Shared.IdentityManagement;
using Content.Shared.Research.Components;
using Content.Shared.Research.Prototypes;
@@ -11,6 +12,8 @@ namespace Content.Server.Research.Systems;
public sealed partial class ResearchSystem
{
+ [Dependency] private readonly EmagSystem _emag = default!;
+
private void InitializeConsole()
{
SubscribeLocalEvent(OnConsoleUnlock);
@@ -18,6 +21,7 @@ private void InitializeConsole()
SubscribeLocalEvent(OnPointsChanged);
SubscribeLocalEvent(OnConsoleRegistrationChanged);
SubscribeLocalEvent(OnConsoleDatabaseModified);
+ SubscribeLocalEvent(OnEmagged);
}
private void OnConsoleUnlock(EntityUid uid, ResearchConsoleComponent component, ConsoleUnlockTechnologyMessage args)
@@ -39,7 +43,7 @@ private void OnConsoleUnlock(EntityUid uid, ResearchConsoleComponent component,
if (!UnlockTechnology(uid, args.Id, act))
return;
- if (!HasComp(uid))
+ if (!_emag.CheckFlag(uid, EmagType.Interaction))
{
var getIdentityEvent = new TryGetIdentityShortInfoEvent(uid, act);
RaiseLocalEvent(getIdentityEvent);
@@ -52,7 +56,7 @@ private void OnConsoleUnlock(EntityUid uid, ResearchConsoleComponent component,
);
_radio.SendRadioMessage(uid, message, component.AnnouncementChannel, uid, escapeMarkup: false);
}
-
+
SyncClientWithServer(uid);
UpdateConsoleInterface(uid, component);
}
@@ -100,4 +104,15 @@ private void OnConsoleDatabaseModified(EntityUid uid, ResearchConsoleComponent c
UpdateConsoleInterface(uid, component);
}
+ private void OnEmagged(Entity ent, ref GotEmaggedEvent args)
+ {
+ if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+ return;
+
+ if (_emag.CheckFlag(ent, EmagType.Interaction))
+ return;
+
+ args.Handled = true;
+ }
+
}
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
index 3bcdc1abeb66..f91b5754e156 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
@@ -43,7 +43,6 @@ public sealed partial class RevenantSystem
{
[Dependency] private readonly ThrowingSystem _throwing = default!;
[Dependency] private readonly EntityStorageSystem _entityStorage = default!;
- [Dependency] private readonly EmagSystem _emag = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!;
[Dependency] private readonly GhostSystem _ghost = default!;
@@ -420,7 +419,8 @@ private void OnMalfunctionAction(EntityUid uid, RevenantComponent component, Rev
_whitelistSystem.IsBlacklistPass(component.MalfunctionBlacklist, ent))
continue;
- _emag.DoEmagEffect(uid, ent); //it does not emag itself. adorable.
+ var ev = new GotEmaggedEvent(uid, EmagType.Interaction | EmagType.Access);
+ RaiseLocalEvent(ent, ref ev);
}
}
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs b/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
index b4ba14004415..4d2a8912e830 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
@@ -8,6 +8,7 @@
using Content.Server.DeviceNetwork.Components;
using Content.Server.DeviceNetwork.Systems;
using Content.Server.Explosion.Components;
+using Content.Shared.Emag.Systems;
using Robust.Shared.Utility;
namespace Content.Server.Silicons.Borgs;
@@ -15,6 +16,8 @@ namespace Content.Server.Silicons.Borgs;
///
public sealed partial class BorgSystem
{
+ [Dependency] private readonly EmagSystem _emag = default!;
+
private void InitializeTransponder()
{
SubscribeLocalEvent(OnPacketReceived);
@@ -127,7 +130,7 @@ private void Destroy(Entity ent)
private bool CheckEmagged(EntityUid uid, string name)
{
- if (HasComp(uid))
+ if (_emag.CheckFlag(uid, EmagType.Interaction))
{
Popup.PopupEntity(Loc.GetString($"borg-transponder-emagged-{name}-popup"), uid, uid, PopupType.LargeCaution);
return true;
diff --git a/Content.Server/Silicons/Laws/SiliconLawSystem.cs b/Content.Server/Silicons/Laws/SiliconLawSystem.cs
index 109c183f0401..f5ead80bddbf 100644
--- a/Content.Server/Silicons/Laws/SiliconLawSystem.cs
+++ b/Content.Server/Silicons/Laws/SiliconLawSystem.cs
@@ -6,7 +6,6 @@
using Content.Server.Station.Systems;
using Content.Shared.Administration;
using Content.Shared.Chat;
-using Content.Shared.Emag.Components;
using Content.Shared.Emag.Systems;
using Content.Shared.GameTicking;
using Content.Shared.Mind;
@@ -14,7 +13,6 @@
using Content.Shared.Roles;
using Content.Shared.Silicons.Laws;
using Content.Shared.Silicons.Laws.Components;
-using Content.Shared.Stunnable;
using Content.Shared.Wires;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
@@ -22,7 +20,6 @@
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
using Robust.Shared.Toolshed;
-using Robust.Shared.Audio;
namespace Content.Server.Silicons.Laws;
@@ -34,8 +31,8 @@ public sealed class SiliconLawSystem : SharedSiliconLawSystem
[Dependency] private readonly IPrototypeManager _prototype = default!;
[Dependency] private readonly SharedRoleSystem _roles = default!;
[Dependency] private readonly StationSystem _station = default!;
- [Dependency] private readonly SharedStunSystem _stunSystem = default!;
[Dependency] private readonly UserInterfaceSystem _userInterface = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
///
public override void Initialize()
@@ -52,7 +49,7 @@ public override void Initialize()
SubscribeLocalEvent(OnIonStormLaws);
SubscribeLocalEvent(OnLawProviderMindAdded);
SubscribeLocalEvent(OnLawProviderMindRemoved);
- SubscribeLocalEvent(OnEmagLawsAdded);
+ SubscribeLocalEvent(OnEmagLawsAdded);
}
private void OnMapInit(EntityUid uid, SiliconLawBoundComponent component, MapInitEvent args)
@@ -135,7 +132,7 @@ private void OnDirectedGetLaws(EntityUid uid, SiliconLawProviderComponent compon
private void OnIonStormLaws(EntityUid uid, SiliconLawProviderComponent component, ref IonStormLawsEvent args)
{
// Emagged borgs are immune to ion storm
- if (!HasComp(uid))
+ if (!_emag.CheckFlag(uid, EmagType.Interaction))
{
component.Lawset = args.Lawset;
@@ -152,9 +149,8 @@ private void OnIonStormLaws(EntityUid uid, SiliconLawProviderComponent component
}
}
- private void OnEmagLawsAdded(EntityUid uid, SiliconLawProviderComponent component, ref GotEmaggedEvent args)
+ private void OnEmagLawsAdded(EntityUid uid, SiliconLawProviderComponent component, ref SiliconEmaggedEvent args)
{
-
if (component.Lawset == null)
component.Lawset = GetLawset(component.Laws);
@@ -164,7 +160,7 @@ private void OnEmagLawsAdded(EntityUid uid, SiliconLawProviderComponent componen
// Add the first emag law before the others
component.Lawset?.Laws.Insert(0, new SiliconLaw
{
- LawString = Loc.GetString("law-emag-custom", ("name", Name(args.UserUid)), ("title", Loc.GetString(component.Lawset.ObeysTo))),
+ LawString = Loc.GetString("law-emag-custom", ("name", Name(args.user)), ("title", Loc.GetString(component.Lawset.ObeysTo))),
Order = 0
});
@@ -176,20 +172,6 @@ private void OnEmagLawsAdded(EntityUid uid, SiliconLawProviderComponent componen
});
}
- protected override void OnGotEmagged(EntityUid uid, EmagSiliconLawComponent component, ref GotEmaggedEvent args)
- {
- if (component.RequireOpenPanel && TryComp(uid, out var panel) && !panel.Open)
- return;
-
- base.OnGotEmagged(uid, component, ref args);
- NotifyLawsChanged(uid, component.EmaggedSound);
- if(_mind.TryGetMind(uid, out var mindId, out _))
- EnsureSubvertedSiliconRole(mindId);
-
- _stunSystem.TryParalyze(uid, component.StunTime, true);
-
- }
-
private void EnsureSubvertedSiliconRole(EntityUid mindId)
{
if (!_roles.MindHasRole(mindId))
diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs
index c20a6a46446c..c2ea6dd1ac00 100644
--- a/Content.Server/VendingMachines/VendingMachineSystem.cs
+++ b/Content.Server/VendingMachines/VendingMachineSystem.cs
@@ -39,6 +39,7 @@ public sealed class VendingMachineSystem : SharedVendingMachineSystem
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly SpeakOnUIClosedSystem _speakOnUIClosed = default!;
[Dependency] private readonly SharedPointLightSystem _light = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
private const float WallVendEjectDistanceFromWall = 1f;
@@ -48,7 +49,6 @@ public override void Initialize()
SubscribeLocalEvent(OnPowerChanged);
SubscribeLocalEvent(OnBreak);
- SubscribeLocalEvent(OnEmagged);
SubscribeLocalEvent(OnDamageChanged);
SubscribeLocalEvent(OnVendingPrice);
SubscribeLocalEvent(OnEmpPulse);
@@ -123,12 +123,6 @@ private void OnBreak(EntityUid uid, VendingMachineComponent vendComponent, Break
TryUpdateVisualState(uid, vendComponent);
}
- private void OnEmagged(EntityUid uid, VendingMachineComponent component, ref GotEmaggedEvent args)
- {
- // only emag if there are emag-only items
- args.Handled = component.EmaggedInventory.Count > 0;
- }
-
private void OnDamageChanged(EntityUid uid, VendingMachineComponent component, DamageChangedEvent args)
{
if (!args.DamageIncreased && component.Broken)
@@ -232,7 +226,7 @@ public bool IsAuthorized(EntityUid uid, EntityUid sender, VendingMachineComponen
if (!TryComp(uid, out var accessReader))
return true;
- if (_accessReader.IsAllowed(sender, uid, accessReader) || HasComp(uid))
+ if (_accessReader.IsAllowed(sender, uid, accessReader))
return true;
Popup.PopupEntity(Loc.GetString("vending-machine-component-try-eject-access-denied"), uid);
@@ -422,7 +416,7 @@ private void EjectItem(EntityUid uid, VendingMachineComponent? vendComponent = n
if (!Resolve(uid, ref component))
return null;
- if (type == InventoryType.Emagged && HasComp(uid))
+ if (type == InventoryType.Emagged && _emag.CheckFlag(uid, EmagType.Interaction))
return component.EmaggedInventory.GetValueOrDefault(entryId);
if (type == InventoryType.Contraband && component.Contraband)
diff --git a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
index ec462ae23e8f..3c8314041f4f 100644
--- a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
@@ -78,7 +78,7 @@ protected override bool ArcRaySuccessful(EntityUid targetUid,
// Could also check the arc though future effort + if they're aimbotting it's not really going to make a difference.
// (This runs lagcomp internally and is what clickattacks use)
- if (!Interaction.InRangeUnobstructed(ignore, targetUid, range + 0.1f))
+ if (!Interaction.InRangeUnobstructed(ignore, targetUid, range + 0.1f, overlapCheck: false))
return false;
// TODO: Check arc though due to the aforementioned aimbot + damage split comments it's less important.
@@ -193,7 +193,7 @@ protected override bool InRange(EntityUid user, EntityUid target, float range, I
if (session is { } pSession)
{
(targetCoordinates, targetLocalAngle) = _lag.GetCoordinatesAngle(target, pSession);
- return Interaction.InRangeUnobstructed(user, target, targetCoordinates, targetLocalAngle, range);
+ return Interaction.InRangeUnobstructed(user, target, targetCoordinates, targetLocalAngle, range, overlapCheck: false);
}
return Interaction.InRangeUnobstructed(user, target, range);
diff --git a/Content.Server/Wieldable/WieldableSystem.cs b/Content.Server/Wieldable/WieldableSystem.cs
new file mode 100644
index 000000000000..35f75276a8ff
--- /dev/null
+++ b/Content.Server/Wieldable/WieldableSystem.cs
@@ -0,0 +1,45 @@
+using Content.Server.Movement.Components;
+using Content.Server.Movement.Systems;
+using Content.Shared.Camera;
+using Content.Shared.Hands;
+using Content.Shared.Movement.Components;
+using Content.Shared.Wieldable;
+using Content.Shared.Wieldable.Components;
+
+namespace Content.Server.Wieldable;
+
+public sealed class WieldableSystem : SharedWieldableSystem
+{
+ [Dependency] private readonly ContentEyeSystem _eye = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnEyeOffsetUnwielded);
+ SubscribeLocalEvent(OnEyeOffsetWielded);
+ SubscribeLocalEvent>(OnGetEyePvsScale);
+ }
+
+ private void OnEyeOffsetUnwielded(Entity entity, ref ItemUnwieldedEvent args)
+ {
+ _eye.UpdatePvsScale(args.User);
+ }
+
+ private void OnEyeOffsetWielded(Entity entity, ref ItemWieldedEvent args)
+ {
+ _eye.UpdatePvsScale(args.User);
+ }
+
+ private void OnGetEyePvsScale(Entity entity,
+ ref HeldRelayedEvent args)
+ {
+ if (!TryComp(entity, out EyeCursorOffsetComponent? eyeCursorOffset) || !TryComp(entity.Owner, out WieldableComponent? wieldableComp))
+ return;
+
+ if (!wieldableComp.Wielded)
+ return;
+
+ args.Args.Scale += eyeCursorOffset.PvsIncrease;
+ }
+}
diff --git a/Content.Server/_EinsteinEngines/Supermatter/Systems/SupermatterSystem.Processing.cs b/Content.Server/_EinsteinEngines/Supermatter/Systems/SupermatterSystem.Processing.cs
index 74b2254aba71..2cc085a6e7b8 100644
--- a/Content.Server/_EinsteinEngines/Supermatter/Systems/SupermatterSystem.Processing.cs
+++ b/Content.Server/_EinsteinEngines/Supermatter/Systems/SupermatterSystem.Processing.cs
@@ -15,6 +15,7 @@
using Content.Shared.Radiation.Components;
using Content.Shared.Silicons.Laws.Components;
using Content.Shared.Speech;
+using Content.Shared.Storage.Components;
using Content.Shared.Traits.Assorted;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
@@ -674,10 +675,11 @@ private void HandleDelamination(EntityUid uid, SupermatterComponent sm)
// Play the reality distortion sound for every player on the map
_audio.PlayGlobal(sm.DistortSound, mapFilter, true);
- // Add hallucinations to every player on the map
+ // Add hallucinations to every mob on the map, except those in EntityStorage (lockers, etc)
// TODO: change this from paracusia to actual hallucinations whenever those are real
var mobLookup = new HashSet>();
_entityLookup.GetEntitiesOnMap(mapId, mobLookup);
+ mobLookup.RemoveWhere(x => HasComp(x));
// These values match the paracusia disability, since we can't double up on paracusia
var paracusiaSounds = new SoundCollectionSpecifier("Paracusia");
@@ -744,7 +746,7 @@ private void HandleLight(EntityUid uid, SupermatterComponent sm)
}
///
- /// Checks for
+ /// Checks whether a mob can see the supermatter, then applies hallucinations and psychologist coefficient
///
private void HandleVision(EntityUid uid, SupermatterComponent sm)
{
diff --git a/Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs b/Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs
index 0d26c4407664..3a53fcc0d2c8 100644
--- a/Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs
+++ b/Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs
@@ -22,7 +22,6 @@
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
using Content.Shared.Mindshield.Components;
-using Content.Shared._Goobstation.FakeMindshield.Components;
namespace Content.Server.Changeling;
@@ -419,8 +418,7 @@ private void OnStingBlind(EntityUid uid, ChangelingComponent comp, ref StingBlin
if (!TryComp(target, out var blindable) || blindable.IsBlind)
return;
- _blindable.AdjustEyeDamage((target, blindable), 2);
- var timeSpan = TimeSpan.FromSeconds(5f);
+ var timeSpan = TimeSpan.FromSeconds(18f);
_statusEffect.TryAddStatusEffect(target, TemporaryBlindnessSystem.BlindingStatusEffect, timeSpan, false, TemporaryBlindnessSystem.BlindingStatusEffect);
}
private void OnStingCryo(EntityUid uid, ChangelingComponent comp, ref StingCryoEvent args)
@@ -718,7 +716,9 @@ public void OnMindshieldFake(Entity ent, ref ActionMindshie
return;
}
- EnsureComp(ent);
+ EnsureComp(ent, out var comp);
+ comp.IsEnabled = true;
+
_popup.PopupEntity(Loc.GetString("changeling-mindshield-start"), ent, ent);
}
diff --git a/Content.Server/_Goobstation/Heretic/EntitySystems/HereticSystem.cs b/Content.Server/_Goobstation/Heretic/EntitySystems/HereticSystem.cs
index 332a6c3ecdf7..66c5ef1dff2a 100644
--- a/Content.Server/_Goobstation/Heretic/EntitySystems/HereticSystem.cs
+++ b/Content.Server/_Goobstation/Heretic/EntitySystems/HereticSystem.cs
@@ -23,6 +23,7 @@
using Content.Shared.Roles.Jobs;
using Robust.Shared.Prototypes;
using Content.Shared.Roles;
+using Content.Shared.Changeling;
namespace Content.Server.Heretic.EntitySystems;
@@ -54,7 +55,7 @@ public override void Initialize()
SubscribeLocalEvent(OnBeforeDamage);
SubscribeLocalEvent(OnDamage);
-
+
}
public override void Update(float frameTime)
@@ -123,7 +124,7 @@ private void OnRerollTargets(Entity ent, ref EventHereticRerol
eligibleTargets.Add(target.AttachedEntity!.Value); // it can't be null because see .Where(HasValue)
// no heretics or other baboons
- eligibleTargets = eligibleTargets.Where(t => !HasComp(t) && !HasComp(t)).ToList();
+ eligibleTargets = eligibleTargets.Where(t => !HasComp(t) || !HasComp(t) || !HasComp(t)).ToList();
var pickedTargets = new List();
diff --git a/Content.Server/_Goobstation/Heretic/Ritual/CustomBehavior.Knowledge.cs b/Content.Server/_Goobstation/Heretic/Ritual/CustomBehavior.Knowledge.cs
index fe34fe851fd2..6c0797a359c5 100644
--- a/Content.Server/_Goobstation/Heretic/Ritual/CustomBehavior.Knowledge.cs
+++ b/Content.Server/_Goobstation/Heretic/Ritual/CustomBehavior.Knowledge.cs
@@ -3,6 +3,7 @@
using Content.Shared.Heretic;
using Content.Shared.Heretic.Prototypes;
using Content.Shared.Tag;
+using Robust.Shared.Containers;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using System.Text;
@@ -19,6 +20,8 @@ public sealed partial class RitualKnowledgeBehavior : RitualCustomBehavior
private IRobustRandom _rand = default!;
private EntityLookupSystem _lookup = default!;
private HereticSystem _heretic = default!;
+ private SharedContainerSystem _container = default!;
+
[ValidatePrototypeId]
public const string EligibleTagsDataset = "EligibleTags";
@@ -31,6 +34,7 @@ public override bool Execute(RitualData args, out string? outstr)
_lookup = args.EntityManager.System();
_heretic = args.EntityManager.System();
+
outstr = null;
// generate new set of tags
@@ -45,7 +49,9 @@ public override bool Execute(RitualData args, out string? outstr)
{
foreach (var tag in requiredTags)
{
- if (!args.EntityManager.TryGetComponent(look, out var tags))
+ //WHY DID THEY JUST COPY-PASTE THE NORMAL RITUAL CODE. JUST USE THE NORMAL RITUAL CODE I AM BEGGING
+ if (!args.EntityManager.TryGetComponent(look, out var tags)
+ || _container.IsEntityInContainer(look))
continue;
var ltags = tags.Tags;
diff --git a/Content.Server/_Impstation/Fishing/FishingRodSystem.cs b/Content.Server/_Impstation/Fishing/FishingRodSystem.cs
new file mode 100644
index 000000000000..1db4be52de67
--- /dev/null
+++ b/Content.Server/_Impstation/Fishing/FishingRodSystem.cs
@@ -0,0 +1,9 @@
+using Content.Shared._Impstation.Fishing;
+
+namespace Content.Server._Impstation.Fishing;
+
+//Imp : Basically a copy of GrapplingGunSystem
+public sealed class FishingRodSystem : SharedFishingRodSystem
+{
+
+}
diff --git a/Content.Server/_Impstation/Speech/Components/DwarfAccentComponent.cs b/Content.Server/_Impstation/Speech/Components/DwarfAccentComponent.cs
new file mode 100644
index 000000000000..937bb253da74
--- /dev/null
+++ b/Content.Server/_Impstation/Speech/Components/DwarfAccentComponent.cs
@@ -0,0 +1,6 @@
+namespace Content.Server.Speech.Components;
+
+[RegisterComponent]
+public sealed partial class DwarfAccentComponent : Component
+{
+}
diff --git a/Content.Server/_Impstation/Speech/EntitySystems/DwarfAccentSystem.cs b/Content.Server/_Impstation/Speech/EntitySystems/DwarfAccentSystem.cs
new file mode 100644
index 000000000000..d5704ccaddfe
--- /dev/null
+++ b/Content.Server/_Impstation/Speech/EntitySystems/DwarfAccentSystem.cs
@@ -0,0 +1,38 @@
+using System.Text.RegularExpressions;
+using Content.Server.Speech.Components;
+
+namespace Content.Server.Speech.EntitySystems;
+
+public sealed class DwarfAccentComponentSystem : EntitySystem
+{
+ [Dependency] private readonly ReplacementAccentSystem _replacement = default!;
+
+ private static readonly Regex RegexAhAmContractionLower = new(@"(?(OnAccent);
+ }
+
+ private void OnAccent(EntityUid uid, DwarfAccentComponent component, AccentGetEvent args)
+ {
+ var message = args.Message;
+
+ message = _replacement.ApplyReplacements(message, "dwarf");
+
+ message = RegexAhAmContractionLower.Replace(message, "a'm");
+ message = RegexAhAmContractionUpperLeft.Replace(message, "A'M");
+ message = RegexAhAmContractionUpperRight.Replace(message, "A'M");
+ message = RegexAhLower.Replace(message, "ah");
+ message = RegexAhUpperLeft.Replace(message, "AH");
+ message = RegexAhUpperRight.Replace(message, "AH");
+
+ args.Message = message;
+ }
+}
diff --git a/Content.Server/_Impstation/Speech/EntitySystems/GrayAccentSystem.cs b/Content.Server/_Impstation/Speech/EntitySystems/GrayAccentSystem.cs
index fae24bf85961..0699c301c6e4 100644
--- a/Content.Server/_Impstation/Speech/EntitySystems/GrayAccentSystem.cs
+++ b/Content.Server/_Impstation/Speech/EntitySystems/GrayAccentSystem.cs
@@ -7,13 +7,15 @@ public sealed class GrayAccentComponentAccentSystem : EntitySystem
{
[Dependency] private readonly ReplacementAccentSystem _replacement = default!;
- private static readonly Regex RegexAmContraction = new(@"([a-z])'[Mm]\b");
- private static readonly Regex RegexAmContractionUpper = new(@"([A-Z])'[Mm]\b");
- private static readonly Regex RegexAreContraction = new(@"([a-z])'[Rr][Ee]\b");
- private static readonly Regex RegexAreContractionUpper = new(@"([A-Z])'[Rr][Ee]\b");
- private static readonly Regex RegexThuiLower = new(@"(.)\b[Tt]hui\b");
- private static readonly Regex RegexThuiUpperLeft = new(@"(\b[A-Z]+.)\b[Tt]hui\b");
- private static readonly Regex RegexThuiUpperRight = new(@"\b[Tt]hui\b(.[A-Z]+\b)");
+ private static readonly Regex RegexPuUpperLeft = new(@"(?<=\b[A-Z]+.)\b[Pp]u\b");
+ private static readonly Regex RegexPuUpperRight = new(@"\b[Pp]u\b(?=.[A-Z]+\b)");
+ private static readonly Regex RegexThuiLower = new(@"(?
-/// When added to a mob, removes the health alert and the damage overlays
-///
-/// Note: This is PAINFULLY coupled to the internals of MobThresholds.
-///
-[RegisterComponent, Access(typeof(PainInsensitivitySystem))]
-public sealed partial class PainInsensitivityComponent : Component
-{
- public bool OriginalShowOverlays;
- public bool OriginalShowBruteOverlay;
- public bool OriginalShowAirlossOverlay;
- public bool OriginalShowCritOverlay;
- public bool OriginalTriggersAlerts;
-
- [DataField]
- public bool ShowOverlays = true;
-
- [DataField]
- public bool ShowBruteOverlay = false;
-
- [DataField]
- public bool ShowAirlossOverlay = false;
-
- [DataField]
- public bool ShowCritOverlay = false;
-
- [DataField]
- public bool TriggersAlerts = false;
-
- public PainInsensitivityComponent(MobThresholdsComponent comp) : this(
- comp.ShowOverlays,
- comp.ShowBruteOverlay,
- comp.ShowAirlossOverlay,
- comp.ShowCritOverlay
- )
- {
- }
-
- public PainInsensitivityComponent(
- bool origShowOverlays,
- bool origShowBruteOverlay,
- bool origShowAirlossOverlay,
- bool origShowCritOverlay
- )
- {
- OriginalShowOverlays = origShowOverlays;
- OriginalShowBruteOverlay = origShowBruteOverlay;
- OriginalShowAirlossOverlay = origShowAirlossOverlay;
- OriginalShowCritOverlay = origShowCritOverlay;
- }
-}
diff --git a/Content.Server/_Impstation/Traits/EntitySystems/PainInsensitivitySystem.cs b/Content.Server/_Impstation/Traits/EntitySystems/PainInsensitivitySystem.cs
deleted file mode 100644
index 5edbaa88cf61..000000000000
--- a/Content.Server/_Impstation/Traits/EntitySystems/PainInsensitivitySystem.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using Content.Shared.Alert;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Mobs.Systems;
-
-namespace Content.Server._Impstation.Traits;
-
-public sealed partial class PainInsensitivitySystem : EntitySystem
-{
- [Dependency] private readonly MobThresholdSystem _thresholds = default!;
- [Dependency] private readonly AlertsSystem _alerts = default!;
-
- [ValidatePrototypeId]
- private const string HealthAlertCategoryProto = "Health";
-
- public override void Initialize()
- {
- base.Initialize();
-
- SubscribeLocalEvent(OnStartup);
- SubscribeLocalEvent(OnShutdown);
- }
-
- private void OnStartup(EntityUid uid, PainInsensitivityComponent comp, ComponentStartup args)
- {
- if (comp.LifeStage != ComponentLifeStage.Starting)
- return;
-
- if (!TryComp(uid, out var thresholds))
- {
- Log.Warning("PainInsensitivity attached to entity with no MobThresholds. Removing...");
- RemComp(uid, comp);
- return;
- }
- comp.OriginalShowOverlays = thresholds.ShowOverlays;
- comp.OriginalShowBruteOverlay = thresholds.ShowBruteOverlay;
- comp.OriginalShowAirlossOverlay = thresholds.ShowAirlossOverlay;
- comp.OriginalShowCritOverlay = thresholds.ShowCritOverlay;
- comp.OriginalTriggersAlerts = thresholds.TriggersAlerts;
-
- _thresholds.SetOverlaysEnabled(uid, comp.ShowOverlays, thresholds);
- _thresholds.SetBruteOverlayEnabled(uid, comp.ShowBruteOverlay, thresholds);
- _thresholds.SetAirlossOverlayEnabled(uid, comp.ShowAirlossOverlay, thresholds);
- _thresholds.SetCritOverlayEnabled(uid, comp.ShowCritOverlay, thresholds);
- _thresholds.SetTriggersAlerts(uid, comp.TriggersAlerts, thresholds);
-
- if(!comp.TriggersAlerts)
- _alerts.ClearAlertCategory(uid, HealthAlertCategoryProto);
- }
-
- private void OnShutdown(EntityUid uid, PainInsensitivityComponent comp, ComponentShutdown args)
- {
- if (!TryComp(uid, out var thresholds))
- return;
-
- _thresholds.SetOverlaysEnabled(uid, comp.OriginalShowOverlays, thresholds);
- _thresholds.SetBruteOverlayEnabled(uid, comp.OriginalShowBruteOverlay, thresholds);
- _thresholds.SetAirlossOverlayEnabled(uid, comp.OriginalShowAirlossOverlay, thresholds);
- _thresholds.SetCritOverlayEnabled(uid, comp.OriginalShowCritOverlay, thresholds);
- }
-}
diff --git a/Content.Shared/Access/Components/AccessReaderComponent.cs b/Content.Shared/Access/Components/AccessReaderComponent.cs
index 903ceab186d1..0219fd2b1ad6 100644
--- a/Content.Shared/Access/Components/AccessReaderComponent.cs
+++ b/Content.Shared/Access/Components/AccessReaderComponent.cs
@@ -76,7 +76,7 @@ public sealed partial class AccessReaderComponent : Component
/// Whether or not emag interactions have an effect on this.
///
[DataField]
- public bool BreakOnEmag = true;
+ public bool BreakOnAccessBreaker = true;
}
[DataDefinition, Serializable, NetSerializable]
diff --git a/Content.Shared/Access/Components/IdCardComponent.cs b/Content.Shared/Access/Components/IdCardComponent.cs
index e80ced646438..3b8322671beb 100644
--- a/Content.Shared/Access/Components/IdCardComponent.cs
+++ b/Content.Shared/Access/Components/IdCardComponent.cs
@@ -22,6 +22,8 @@ public sealed partial class IdCardComponent : Component
[Access(typeof(SharedIdCardSystem), typeof(SharedPdaSystem), typeof(SharedAgentIdCardSystem), Other = AccessPermissions.ReadWrite)]
public LocId? JobTitle;
+ [DataField]
+ [AutoNetworkedField]
private string? _jobTitle;
[Access(typeof(SharedIdCardSystem), typeof(SharedPdaSystem), typeof(SharedAgentIdCardSystem), Other = AccessPermissions.ReadWriteExecute)]
diff --git a/Content.Shared/Access/Systems/AccessReaderSystem.cs b/Content.Shared/Access/Systems/AccessReaderSystem.cs
index 0b1d508cc241..84de549b6636 100644
--- a/Content.Shared/Access/Systems/AccessReaderSystem.cs
+++ b/Content.Shared/Access/Systems/AccessReaderSystem.cs
@@ -2,7 +2,6 @@
using System.Linq;
using Content.Shared.Access.Components;
using Content.Shared.DeviceLinking.Events;
-using Content.Shared.Emag.Components;
using Content.Shared.Emag.Systems;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Inventory;
@@ -24,6 +23,7 @@ public sealed class AccessReaderSystem : EntitySystem
[Dependency] private readonly IPrototypeManager _prototype = default!;
[Dependency] private readonly InventorySystem _inventorySystem = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
[Dependency] private readonly SharedGameTicker _gameTicker = default!;
[Dependency] private readonly SharedHandsSystem _handsSystem = default!;
[Dependency] private readonly SharedContainerSystem _containerSystem = default!;
@@ -71,17 +71,28 @@ private void OnLinkAttempt(EntityUid uid, AccessReaderComponent component, LinkA
{
if (args.User == null) // AutoLink (and presumably future external linkers) have no user.
return;
- if (!HasComp(uid) && !IsAllowed(args.User.Value, uid, component))
+ if (!IsAllowed(args.User.Value, uid, component))
args.Cancel();
}
private void OnEmagged(EntityUid uid, AccessReaderComponent reader, ref GotEmaggedEvent args)
{
- if (!reader.BreakOnEmag)
+ if (!_emag.CompareFlag(args.Type, EmagType.Access))
return;
+
+ if (!reader.BreakOnAccessBreaker)
+ return;
+
+ if (!GetMainAccessReader(uid, out var accessReader))
+ return;
+
+ if (accessReader.Value.Comp.AccessLists.Count < 1)
+ return;
+
+ args.Repeatable = true;
args.Handled = true;
- reader.Enabled = false;
- reader.AccessLog.Clear();
+ accessReader.Value.Comp.AccessLists.Clear();
+ accessReader.Value.Comp.AccessLog.Clear();
Dirty(uid, reader);
}
@@ -135,6 +146,7 @@ public bool GetMainAccessReader(EntityUid uid, [NotNullWhen(true)] out Entity
[DataField]
+ [GuidebookData]
public float MaxTargetPressure = Atmospherics.MaxOutputPressure;
}
diff --git a/Content.Shared/Atmos/GasMixture.cs b/Content.Shared/Atmos/GasMixture.cs
index 0f1efba97666..deca8faaed36 100644
--- a/Content.Shared/Atmos/GasMixture.cs
+++ b/Content.Shared/Atmos/GasMixture.cs
@@ -1,4 +1,5 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Collections;
+using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Runtime.CompilerServices;
using Content.Shared.Atmos.EntitySystems;
@@ -13,12 +14,12 @@ namespace Content.Shared.Atmos
///
[Serializable]
[DataDefinition]
- public sealed partial class GasMixture : IEquatable, ISerializationHooks
+ public sealed partial class GasMixture : IEquatable, ISerializationHooks, IEnumerable<(Gas gas, float moles)>
{
public static GasMixture SpaceGas => new() {Volume = Atmospherics.CellVolume, Temperature = Atmospherics.TCMB, Immutable = true};
// No access, to ensure immutable mixtures are never accidentally mutated.
- [Access(typeof(SharedAtmosphereSystem), typeof(SharedAtmosDebugOverlaySystem), Other = AccessPermissions.None)]
+ [Access(typeof(SharedAtmosphereSystem), typeof(SharedAtmosDebugOverlaySystem), typeof(GasEnumerator), Other = AccessPermissions.None)]
[DataField]
public float[] Moles = new float[Atmospherics.AdjustedNumberOfGases];
@@ -249,6 +250,16 @@ public GasMixtureStringRepresentation ToPrettyString()
return new GasMixtureStringRepresentation(TotalMoles, Temperature, Pressure, molesPerGas);
}
+ GasEnumerator GetEnumerator()
+ {
+ return new GasEnumerator(this);
+ }
+
+ IEnumerator<(Gas gas, float moles)> IEnumerable<(Gas gas, float moles)>.GetEnumerator()
+ {
+ return GetEnumerator();
+ }
+
public override bool Equals(object? obj)
{
if (obj is GasMixture mix)
@@ -289,6 +300,11 @@ public override int GetHashCode()
return hashCode.ToHashCode();
}
+ IEnumerator IEnumerable.GetEnumerator()
+ {
+ return GetEnumerator();
+ }
+
public GasMixture Clone()
{
if (Immutable)
@@ -302,5 +318,28 @@ public GasMixture Clone()
};
return newMixture;
}
+
+ public struct GasEnumerator(GasMixture mixture) : IEnumerator<(Gas gas, float moles)>
+ {
+ private int _idx = -1;
+
+ public void Dispose()
+ {
+ // Nada.
+ }
+
+ public bool MoveNext()
+ {
+ return ++_idx < Atmospherics.TotalNumberOfGases;
+ }
+
+ public void Reset()
+ {
+ _idx = -1;
+ }
+
+ public (Gas gas, float moles) Current => ((Gas)_idx, mixture.Moles[_idx]);
+ object? IEnumerator.Current => Current;
+ }
}
}
diff --git a/Content.Shared/Bed/Sleep/SleepingComponent.cs b/Content.Shared/Bed/Sleep/SleepingComponent.cs
index cbea0a0516f0..dbabb8bb9fda 100644
--- a/Content.Shared/Bed/Sleep/SleepingComponent.cs
+++ b/Content.Shared/Bed/Sleep/SleepingComponent.cs
@@ -1,6 +1,8 @@
+using Content.Shared.Dataset;
using Content.Shared.FixedPoint;
using Robust.Shared.Audio;
using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
namespace Content.Shared.Bed.Sleep;
@@ -39,4 +41,11 @@ public sealed partial class SleepingComponent : Component
{
Params = AudioParams.Default.WithVariation(0.05f)
};
+
+ ///
+ /// The fluent string prefix to use when picking a random suffix
+ /// This is only active for those who have the sleeping component
+ ///
+ [DataField]
+ public ProtoId ForceSaySleepDataset = "ForceSaySleepDataset";
}
diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs
index 90e1fd38e862..d0c6c753deb5 100644
--- a/Content.Shared/Bed/Sleep/SleepingSystem.cs
+++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs
@@ -1,6 +1,7 @@
using Content.Shared.Actions;
using Content.Shared.Buckle.Components;
using Content.Shared.Damage;
+using Content.Shared.Damage.Events;
using Content.Shared.Damage.ForceSay;
using Content.Shared.Emoting;
using Content.Shared.Examine;
@@ -18,6 +19,7 @@
using Content.Shared.Speech;
using Content.Shared.StatusEffect;
using Content.Shared.Stunnable;
+using Content.Shared.Traits.Assorted;
using Content.Shared.Verbs;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Prototypes;
@@ -63,6 +65,8 @@ public override void Initialize()
SubscribeLocalEvent(OnInit);
SubscribeLocalEvent(OnUnbuckleAttempt);
SubscribeLocalEvent(OnEmoteAttempt);
+
+ SubscribeLocalEvent(OnChangeForceSay, after: new []{typeof(PainNumbnessSystem)});
}
private void OnUnbuckleAttempt(Entity ent, ref UnbuckleAttemptEvent args)
@@ -317,6 +321,11 @@ public void OnEmoteAttempt(Entity ent, ref EmoteAttemptEvent
{
args.Cancel();
}
+
+ private void OnChangeForceSay(Entity ent, ref BeforeForceSayEvent args)
+ {
+ args.Prefix = ent.Comp.ForceSaySleepDataset;
+ }
}
diff --git a/Content.Shared/CCVar/CCVars.Admin.cs b/Content.Shared/CCVar/CCVars.Admin.cs
index 7754a6cbb8b6..f05eb3376ea7 100644
--- a/Content.Shared/CCVar/CCVars.Admin.cs
+++ b/Content.Shared/CCVar/CCVars.Admin.cs
@@ -89,6 +89,12 @@ public sealed partial class CCVars
public static readonly CVarDef ServerBanErasePlayer =
CVarDef.Create("admin.server_ban_erase_player", false, CVar.ARCHIVE | CVar.SERVER | CVar.REPLICATED);
+ ///
+ /// If true, will reset the last time the player has read the rules. This will mean on their next login they will be shown the rules again.
+ ///
+ public static readonly CVarDef ServerBanResetLastReadRules =
+ CVarDef.Create("admin.server_ban_reset_last_read_rules", true, CVar.ARCHIVE | CVar.SERVER);
+
///
/// Minimum players sharing a connection required to create an alert. -1 to disable the alert.
///
@@ -176,4 +182,11 @@ public sealed partial class CCVars
public static readonly CVarDef BanHardwareIds =
CVarDef.Create("ban.hardware_ids", true, CVar.SERVERONLY);
+
+ ///
+ /// If true, players are allowed to connect to multiple game servers at once.
+ /// If false, they will be kicked from the first when connecting to another.
+ ///
+ public static readonly CVarDef AdminAllowMultiServerPlay =
+ CVarDef.Create("admin.allow_multi_server_play", true, CVar.SERVERONLY);
}
diff --git a/Content.Shared/CCVar/CCVars.Discord.cs b/Content.Shared/CCVar/CCVars.Discord.cs
index 6e4ef532cdc7..5f63f2afa3f1 100644
--- a/Content.Shared/CCVar/CCVars.Discord.cs
+++ b/Content.Shared/CCVar/CCVars.Discord.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
namespace Content.Shared.CCVar;
@@ -53,6 +53,12 @@ public sealed partial class CCVars
public static readonly CVarDef DiscordRoundUpdateWebhook =
CVarDef.Create("discord.round_update_webhook", string.Empty, CVar.SERVERONLY | CVar.CONFIDENTIAL);
+ ///
+ /// URL of the Discord webhook which will relay round restart messages.
+ ///
+ public static readonly CVarDef DiscordPostroundChatWebhook =
+ CVarDef.Create("discord.postround_chat_webhook", string.Empty, CVar.SERVERONLY | CVar.CONFIDENTIAL);
+
///
/// Role id for the Discord webhook to ping when the round ends.
///
diff --git a/Content.Shared/CCVar/CCVars.Sounds.cs b/Content.Shared/CCVar/CCVars.Sounds.cs
index 73d9d3852f1f..5e2a82518307 100644
--- a/Content.Shared/CCVar/CCVars.Sounds.cs
+++ b/Content.Shared/CCVar/CCVars.Sounds.cs
@@ -21,6 +21,9 @@ public sealed partial class CCVars
public static readonly CVarDef AdminSoundsEnabled =
CVarDef.Create("audio.admin_sounds_enabled", true, CVar.ARCHIVE | CVar.CLIENTONLY);
+ public static readonly CVarDef BwoinkSoundEnabled =
+ CVarDef.Create("audio.bwoink_sound_enabled", true, CVar.ARCHIVE | CVar.CLIENTONLY);
+
public static readonly CVarDef AdminChatSoundPath =
CVarDef.Create("audio.admin_chat_sound_path",
"/Audio/Items/pop.ogg",
diff --git a/Content.Shared/Camera/GetEyeOffsetEvent.cs b/Content.Shared/Camera/GetEyeOffsetEvent.cs
index de9c7c9e178f..0e3c00110a32 100644
--- a/Content.Shared/Camera/GetEyeOffsetEvent.cs
+++ b/Content.Shared/Camera/GetEyeOffsetEvent.cs
@@ -1,4 +1,5 @@
using System.Numerics;
+using Content.Shared.Inventory;
using Content.Shared.Movement.Systems;
namespace Content.Shared.Camera;
@@ -17,3 +18,15 @@ namespace Content.Shared.Camera;
///
[ByRefEvent]
public record struct GetEyeOffsetEvent(Vector2 Offset);
+
+///
+/// Raised on any equipped and in-hand items that may modify the eye offset.
+/// Pockets and suitstorage are excluded.
+///
+[ByRefEvent]
+public sealed class GetEyeOffsetRelayedEvent : EntityEventArgs, IInventoryRelayEvent
+{
+ public SlotFlags TargetSlots { get; } = ~(SlotFlags.POCKET & SlotFlags.SUITSTORAGE);
+
+ public Vector2 Offset;
+}
diff --git a/Content.Shared/Camera/GetEyePvsScaleEvent.cs b/Content.Shared/Camera/GetEyePvsScaleEvent.cs
new file mode 100644
index 000000000000..482b755db8d3
--- /dev/null
+++ b/Content.Shared/Camera/GetEyePvsScaleEvent.cs
@@ -0,0 +1,33 @@
+using System.Numerics;
+using Content.Shared.Inventory;
+using Content.Shared.Movement.Systems;
+
+namespace Content.Shared.Camera;
+
+///
+/// Raised directed by-ref when is called.
+/// Should be subscribed to by any systems that want to modify an entity's eye PVS scale,
+/// so that they do not override each other. Keep in mind that this should be done serverside;
+/// the client may set a new PVS scale, but the server won't provide the data if it isn't done on the server.
+///
+///
+/// The total scale to apply.
+///
+///
+/// Note that in most cases should be incremented or decremented by subscribers, not set.
+/// Otherwise, any offsets applied by previous subscribing systems will be overridden.
+///
+[ByRefEvent]
+public record struct GetEyePvsScaleEvent(float Scale);
+
+///
+/// Raised on any equipped and in-hand items that may modify the eye offset.
+/// Pockets and suitstorage are excluded.
+///
+[ByRefEvent]
+public sealed class GetEyePvsScaleRelayedEvent : EntityEventArgs, IInventoryRelayEvent
+{
+ public SlotFlags TargetSlots { get; } = ~(SlotFlags.POCKET & SlotFlags.SUITSTORAGE);
+
+ public float Scale;
+}
diff --git a/Content.Shared/Camera/SharedCameraRecoilSystem.cs b/Content.Shared/Camera/SharedCameraRecoilSystem.cs
index a2ce0e77e20c..a497016c46f0 100644
--- a/Content.Shared/Camera/SharedCameraRecoilSystem.cs
+++ b/Content.Shared/Camera/SharedCameraRecoilSystem.cs
@@ -1,4 +1,6 @@
using System.Numerics;
+using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Systems;
using JetBrains.Annotations;
using Robust.Shared.Network;
using Robust.Shared.Serialization;
@@ -28,7 +30,7 @@ public abstract class SharedCameraRecoilSystem : EntitySystem
///
protected const float KickMagnitudeMax = 1f;
- [Dependency] private readonly SharedEyeSystem _eye = default!;
+ [Dependency] private readonly SharedContentEyeSystem _eye = default!;
[Dependency] private readonly INetManager _net = default!;
public override void Initialize()
@@ -81,9 +83,7 @@ private void UpdateEyes(float frameTime)
continue;
recoil.LastKick = recoil.CurrentKick;
- var ev = new GetEyeOffsetEvent();
- RaiseLocalEvent(uid, ref ev);
- _eye.SetOffset(uid, ev.Offset, eye);
+ _eye.UpdateEyeOffset((uid, eye));
}
}
diff --git a/Content.Shared/Cargo/CargoBountyHistoryData.cs b/Content.Shared/Cargo/CargoBountyHistoryData.cs
new file mode 100644
index 000000000000..eb46bc194425
--- /dev/null
+++ b/Content.Shared/Cargo/CargoBountyHistoryData.cs
@@ -0,0 +1,67 @@
+using Content.Shared.Cargo.Prototypes;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Cargo;
+
+///
+/// A data structure for storing historical information about bounties.
+///
+[DataDefinition, NetSerializable, Serializable]
+public readonly partial record struct CargoBountyHistoryData
+{
+ ///
+ /// A unique id used to identify the bounty
+ ///
+ [DataField]
+ public string Id { get; init; } = string.Empty;
+
+ ///
+ /// Whether this bounty was completed or skipped.
+ ///
+ [DataField]
+ public BountyResult Result { get; init; } = BountyResult.Completed;
+
+ ///
+ /// Optional name of the actor that completed/skipped the bounty.
+ ///
+ [DataField]
+ public string? ActorName { get; init; } = default;
+
+ ///
+ /// Time when this bounty was completed or skipped
+ ///
+ [DataField]
+ public TimeSpan Timestamp { get; init; } = TimeSpan.MinValue;
+
+ ///
+ /// The prototype containing information about the bounty.
+ ///
+ [DataField(required: true)]
+ public ProtoId Bounty { get; init; } = string.Empty;
+
+ public CargoBountyHistoryData(CargoBountyData bounty, BountyResult result, TimeSpan timestamp, string? actorName)
+ {
+ Bounty = bounty.Bounty;
+ Result = result;
+ Id = bounty.Id;
+ ActorName = actorName;
+ Timestamp = timestamp;
+ }
+
+ ///
+ /// Covers how a bounty was actually finished.
+ ///
+ public enum BountyResult
+ {
+ ///
+ /// Bounty was actually fulfilled and the goods sold
+ ///
+ Completed = 0,
+
+ ///
+ /// Bounty was explicitly skipped by some actor
+ ///
+ Skipped = 1,
+ }
+}
diff --git a/Content.Shared/Cargo/Components/CargoBountyConsoleComponent.cs b/Content.Shared/Cargo/Components/CargoBountyConsoleComponent.cs
index bf82a08127e5..8c78312be19b 100644
--- a/Content.Shared/Cargo/Components/CargoBountyConsoleComponent.cs
+++ b/Content.Shared/Cargo/Components/CargoBountyConsoleComponent.cs
@@ -50,11 +50,13 @@ public sealed partial class CargoBountyConsoleComponent : Component
public sealed class CargoBountyConsoleState : BoundUserInterfaceState
{
public List Bounties;
+ public List History;
public TimeSpan UntilNextSkip;
- public CargoBountyConsoleState(List bounties, TimeSpan untilNextSkip)
+ public CargoBountyConsoleState(List bounties, List history, TimeSpan untilNextSkip)
{
Bounties = bounties;
+ History = history;
UntilNextSkip = untilNextSkip;
}
}
diff --git a/Content.Shared/Cloning/CloningPodComponent.cs b/Content.Shared/Cloning/CloningPodComponent.cs
index 88d587c14577..d588b62eb37f 100644
--- a/Content.Shared/Cloning/CloningPodComponent.cs
+++ b/Content.Shared/Cloning/CloningPodComponent.cs
@@ -46,15 +46,6 @@ public sealed partial class CloningPodComponent : Component
[DataField("mobSpawnId"), ViewVariables(VVAccess.ReadWrite)]
public EntProtoId MobSpawnId = "MobAbomination";
- ///
- /// Emag sound effects.
- ///
- [DataField("sparkSound")]
- public SoundSpecifier SparkSound = new SoundCollectionSpecifier("sparks")
- {
- Params = AudioParams.Default.WithVolume(8),
- };
-
// TODO: Remove this from here when cloning and/or zombies are refactored
[DataField("screamSound")]
public SoundSpecifier ScreamSound = new SoundCollectionSpecifier("ZombieScreams")
diff --git a/Content.Shared/Clothing/Components/MaskComponent.cs b/Content.Shared/Clothing/Components/MaskComponent.cs
index 41b2b797f5d8..47f2fd3079c2 100644
--- a/Content.Shared/Clothing/Components/MaskComponent.cs
+++ b/Content.Shared/Clothing/Components/MaskComponent.cs
@@ -20,8 +20,11 @@ public sealed partial class MaskComponent : Component
[DataField, AutoNetworkedField]
public bool IsToggled;
+ ///
+ /// Equipped prefix to use after the mask was pulled down.
+ ///
[DataField, AutoNetworkedField]
- public string EquippedPrefix = "toggled";
+ public string EquippedPrefix = "up";
///
/// When will function normally, otherwise will not react to events
diff --git a/Content.Shared/Contraband/ContrabandComponent.cs b/Content.Shared/Contraband/ContrabandComponent.cs
index a4ce652f2f56..f758d91f0cd8 100644
--- a/Content.Shared/Contraband/ContrabandComponent.cs
+++ b/Content.Shared/Contraband/ContrabandComponent.cs
@@ -24,5 +24,13 @@ public sealed partial class ContrabandComponent : Component
///
[DataField]
[AutoNetworkedField]
- public HashSet>? AllowedDepartments = ["Security"];
+ public HashSet> AllowedDepartments = new();
+
+ ///
+ /// Which jobs is this item restricted to?
+ /// If empty, no jobs are allowed to use this beyond the allowed departments.
+ ///
+ [DataField]
+ [AutoNetworkedField]
+ public HashSet> AllowedJobs = new();
}
diff --git a/Content.Shared/Contraband/ContrabandSeverityPrototype.cs b/Content.Shared/Contraband/ContrabandSeverityPrototype.cs
index d3a7ae96d2a1..a2a8104e80d0 100644
--- a/Content.Shared/Contraband/ContrabandSeverityPrototype.cs
+++ b/Content.Shared/Contraband/ContrabandSeverityPrototype.cs
@@ -25,8 +25,8 @@ public sealed partial class ContrabandSeverityPrototype : IPrototype
public LocId ExamineText;
///
- /// When examining the contraband, should this take into account the viewer's departments?
+ /// When examining the contraband, should this take into account the viewer's departments and job?
///
[DataField]
- public bool ShowDepartments;
+ public bool ShowDepartmentsAndJobs;
}
diff --git a/Content.Shared/Contraband/ContrabandSystem.cs b/Content.Shared/Contraband/ContrabandSystem.cs
index 6ccf6e58b661..b0c86bb2c91c 100644
--- a/Content.Shared/Contraband/ContrabandSystem.cs
+++ b/Content.Shared/Contraband/ContrabandSystem.cs
@@ -40,6 +40,7 @@ public void CopyDetails(EntityUid uid, ContrabandComponent other, ContrabandComp
contraband.Severity = other.Severity;
contraband.AllowedDepartments = other.AllowedDepartments;
+ contraband.AllowedJobs = other.AllowedJobs;
Dirty(uid, contraband);
}
@@ -54,11 +55,14 @@ private void OnExamined(Entity ent, ref ExaminedEvent args)
using (args.PushGroup(nameof(ContrabandComponent)))
{
+ var localizedDepartments = ent.Comp.AllowedDepartments.Select(p => Loc.GetString("contraband-department-plural", ("department", Loc.GetString(_proto.Index(p).Name))));
+ var localizedJobs = ent.Comp.AllowedJobs.Select(p => Loc.GetString("contraband-job-plural", ("job", _proto.Index(p).LocalizedName)));
+
var severity = _proto.Index(ent.Comp.Severity);
- if (severity.ShowDepartments && ent.Comp is { AllowedDepartments: not null })
+ if (severity.ShowDepartmentsAndJobs)
{
- // TODO shouldn't department prototypes have a localized name instead of just using the ID for this?
- var list = ContentLocalizationManager.FormatList(ent.Comp.AllowedDepartments.Select(p => Loc.GetString($"department-{p.Id}")).ToList());
+ //creating a combined list of jobs and departments for the restricted text
+ var list = ContentLocalizationManager.FormatList(localizedDepartments.Concat(localizedJobs).ToList());
// department restricted text
args.PushMarkup(Loc.GetString("contraband-examine-text-Restricted-department", ("color", severity.ExamineColor), ("departments", list))); // imp edit
@@ -69,23 +73,30 @@ private void OnExamined(Entity ent, ref ExaminedEvent args)
}
// text based on ID card
- List>? departments = null;
+ List> departments = new();
+ var jobId = "";
+
if (_id.TryFindIdCard(args.Examiner, out var id))
{
departments = id.Comp.JobDepartments;
+ if (id.Comp.LocalizedJobTitle is not null)
+ {
+ jobId = id.Comp.LocalizedJobTitle;
+ }
}
- // either its fully restricted, you have no departments, or your departments dont intersect with the restricted departments
- if (ent.Comp.AllowedDepartments is null
- || departments is null
- || !departments.Intersect(ent.Comp.AllowedDepartments).Any())
+ // for the jobs we compare the localized string in case you use an agent ID or custom job name that is not a prototype
+ if (departments.Intersect(ent.Comp.AllowedDepartments).Any()
+ || localizedJobs.Contains(jobId))
+ {
+ // you are allowed to use this!
+ args.PushMarkup(Loc.GetString("contraband-examine-text-in-the-clear"));
+ }
+ else
{
+ // straight to jail!
args.PushMarkup(Loc.GetString("contraband-examine-text-avoid-carrying-around"));
- return;
}
-
- // otherwise fine to use :tm:
- args.PushMarkup(Loc.GetString("contraband-examine-text-in-the-clear"));
}
}
}
diff --git a/Content.Shared/CriminalRecords/Components/CriminalRecordsConsoleComponent.cs b/Content.Shared/CriminalRecords/Components/CriminalRecordsConsoleComponent.cs
index 70e927e3cb84..3a35b807c01c 100644
--- a/Content.Shared/CriminalRecords/Components/CriminalRecordsConsoleComponent.cs
+++ b/Content.Shared/CriminalRecords/Components/CriminalRecordsConsoleComponent.cs
@@ -1,7 +1,10 @@
using Content.Shared.CriminalRecords.Systems;
+using Content.Shared.CriminalRecords.Components;
+using Content.Shared.CriminalRecords;
using Content.Shared.Radio;
using Content.Shared.StationRecords;
using Robust.Shared.Prototypes;
+using Content.Shared.Security;
namespace Content.Shared.CriminalRecords.Components;
@@ -31,6 +34,12 @@ public sealed partial class CriminalRecordsConsoleComponent : Component
[DataField]
public StationRecordsFilter? Filter;
+ ///
+ /// Current seleced security status for the filter by criminal status dropdown.
+ ///
+ [DataField]
+ public SecurityStatus FilterStatus;
+
///
/// Channel to send messages to when someone's status gets changed.
///
diff --git a/Content.Shared/CriminalRecords/CriminalRecordsUi.cs b/Content.Shared/CriminalRecords/CriminalRecordsUi.cs
index 287de36ac736..b8ad9ede15ef 100644
--- a/Content.Shared/CriminalRecords/CriminalRecordsUi.cs
+++ b/Content.Shared/CriminalRecords/CriminalRecordsUi.cs
@@ -35,9 +35,9 @@ public sealed class CriminalRecordsConsoleState : BoundUserInterfaceState
/// Currently selected crewmember record key.
///
public uint? SelectedKey = null;
-
public CriminalRecord? CriminalRecord = null;
public GeneralStationRecord? StationRecord = null;
+ public SecurityStatus FilterStatus = SecurityStatus.None;
public readonly Dictionary? RecordListing;
public readonly StationRecordsFilter? Filter;
@@ -100,3 +100,20 @@ public CriminalRecordDeleteHistory(uint index)
Index = index;
}
}
+
+///
+/// Used to set what status to filter by index.
+///
+///
+///
+[Serializable, NetSerializable]
+
+public sealed class CriminalRecordSetStatusFilter : BoundUserInterfaceMessage
+{
+ public readonly SecurityStatus FilterStatus;
+ public CriminalRecordSetStatusFilter(SecurityStatus newFilterStatus)
+ {
+ FilterStatus = newFilterStatus;
+ }
+}
+
diff --git a/Content.Shared/Damage/Events/BeforeForceSayEvent.cs b/Content.Shared/Damage/Events/BeforeForceSayEvent.cs
new file mode 100644
index 000000000000..9e35f6ce7309
--- /dev/null
+++ b/Content.Shared/Damage/Events/BeforeForceSayEvent.cs
@@ -0,0 +1,14 @@
+using Content.Shared.Dataset;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Damage.Events;
+
+///
+/// Event for interrupting and changing the prefix for when an entity is being forced to say something
+///
+[Serializable, NetSerializable]
+public sealed class BeforeForceSayEvent(ProtoId prefixDataset) : EntityEventArgs
+{
+ public ProtoId Prefix = prefixDataset;
+}
diff --git a/Content.Shared/Damage/ForceSay/DamageForceSayComponent.cs b/Content.Shared/Damage/ForceSay/DamageForceSayComponent.cs
index 163cc7cbf4cc..e184f4beb97c 100644
--- a/Content.Shared/Damage/ForceSay/DamageForceSayComponent.cs
+++ b/Content.Shared/Damage/ForceSay/DamageForceSayComponent.cs
@@ -1,8 +1,8 @@
using Content.Shared.Damage.Prototypes;
+using Content.Shared.Dataset;
using Content.Shared.FixedPoint;
using Robust.Shared.GameStates;
using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
namespace Content.Shared.Damage.ForceSay;
@@ -30,14 +30,7 @@ public sealed partial class DamageForceSayComponent : Component
/// The fluent string prefix to use when picking a random suffix
///
[DataField]
- public string ForceSayStringPrefix = "damage-force-say-";
-
- ///
- /// The number of suffixes that exist for use with .
- /// i.e. (prefix)-1 through (prefix)-(count)
- ///
- [DataField]
- public int ForceSayStringCount = 7;
+ public ProtoId ForceSayStringDataset = "ForceSayStringDataset";
///
/// The amount of total damage between that needs to be taken before
diff --git a/Content.Shared/Decals/DecalGridChunkCollectionTypeSerializer.cs b/Content.Shared/Decals/DecalGridChunkCollectionTypeSerializer.cs
index 85364fe5f40c..ae4c89c97034 100644
--- a/Content.Shared/Decals/DecalGridChunkCollectionTypeSerializer.cs
+++ b/Content.Shared/Decals/DecalGridChunkCollectionTypeSerializer.cs
@@ -32,6 +32,8 @@ public DecalGridChunkCollection Read(ISerializationManager serializationManager,
node.TryGetValue(new ValueDataNode("version"), out var versionNode);
var version = ((ValueDataNode?) versionNode)?.AsInt() ?? 1;
Dictionary dictionary;
+ uint nextIndex = 0;
+ var ids = new HashSet();
// TODO: Dump this when we don't need support anymore.
if (version > 1)
@@ -53,22 +55,31 @@ public DecalGridChunkCollection Read(ISerializationManager serializationManager,
var chunkOrigin = SharedMapSystem.GetChunkIndices(coords, SharedDecalSystem.ChunkSize);
var chunk = dictionary.GetOrNew(chunkOrigin);
var decal = new Decal(coords, data.Id, data.Color, data.Angle, data.ZIndex, data.Cleanable);
- chunk.Decals.Add(dUid, decal);
+
+ nextIndex = Math.Max(nextIndex, dUid);
+
+ // Re-used ID somehow
+ // This will bump all IDs by up to 1 but will ensure the map is still readable.
+ if (!ids.Add(dUid))
+ {
+ dUid = nextIndex++;
+ ids.Add(dUid);
+ }
+
+ chunk.Decals[dUid] = decal;
}
}
}
else
{
dictionary = serializationManager.Read>(node, hookCtx, context, notNullableOverride: true);
- }
- uint nextIndex = 0;
-
- foreach (var decals in dictionary.Values)
- {
- foreach (var uid in decals.Decals.Keys)
+ foreach (var decals in dictionary.Values)
{
- nextIndex = Math.Max(uid, nextIndex);
+ foreach (var uid in decals.Decals.Keys)
+ {
+ nextIndex = Math.Max(uid, nextIndex);
+ }
}
}
diff --git a/Content.Shared/DisplacementMap/DisplacementData.cs b/Content.Shared/DisplacementMap/DisplacementData.cs
index 7bd5b580e143..4a7dcf3c1f9e 100644
--- a/Content.Shared/DisplacementMap/DisplacementData.cs
+++ b/Content.Shared/DisplacementMap/DisplacementData.cs
@@ -11,4 +11,7 @@ public sealed partial class DisplacementData
[DataField]
public string? ShaderOverride = "DisplacedStencilDraw";
+
+ [DataField]
+ public string ShaderOverrideUnshaded = "DisplacedStencilDrawUnshaded";
}
diff --git a/Content.Shared/Disposal/SharedDisposalUnitSystem.cs b/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
index 9fdb4a6a804d..a650ef72f803 100644
--- a/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
+++ b/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
@@ -24,6 +24,7 @@ public sealed partial class DisposalDoAfterEvent : SimpleDoAfterEvent
public abstract class SharedDisposalUnitSystem : EntitySystem
{
[Dependency] protected readonly IGameTiming GameTiming = default!;
+ [Dependency] protected readonly EmagSystem _emag = default!;
[Dependency] protected readonly MetaDataSystem Metadata = default!;
[Dependency] protected readonly SharedJointSystem Joints = default!;
[Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
@@ -102,6 +103,12 @@ protected void OnCanDragDropOn(EntityUid uid, SharedDisposalUnitComponent compon
protected void OnEmagged(EntityUid uid, SharedDisposalUnitComponent component, ref GotEmaggedEvent args)
{
+ if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+ return;
+
+ if (component.DisablePressure == true)
+ return;
+
component.DisablePressure = true;
args.Handled = true;
}
diff --git a/Content.Shared/Doors/Components/FirelockComponent.cs b/Content.Shared/Doors/Components/FirelockComponent.cs
index 3f7d6c3f7049..cc9278dfe7e4 100644
--- a/Content.Shared/Doors/Components/FirelockComponent.cs
+++ b/Content.Shared/Doors/Components/FirelockComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Guidebook;
using Robust.Shared.GameStates;
namespace Content.Shared.Doors.Components
@@ -23,12 +24,14 @@ public sealed partial class FirelockComponent : Component
/// Maximum pressure difference before the firelock will refuse to open, in kPa.
///
[DataField("pressureThreshold"), ViewVariables(VVAccess.ReadWrite)]
+ [GuidebookData]
public float PressureThreshold = 20;
///
/// Maximum temperature difference before the firelock will refuse to open, in k.
///
[DataField("temperatureThreshold"), ViewVariables(VVAccess.ReadWrite)]
+ [GuidebookData]
public float TemperatureThreshold = 330;
// this used to check for hot-spots, but because accessing that data is a a mess this now just checks
// temperature. This does mean a cold room will trigger hot-air pop-ups
diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
index adbd61e4c259..8ac24bc216e2 100644
--- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
@@ -40,6 +40,7 @@ public abstract partial class SharedDoorSystem : EntitySystem
[Dependency] private readonly INetManager _net = default!;
[Dependency] protected readonly SharedPhysicsSystem PhysicsSystem = default!;
[Dependency] private readonly DamageableSystem _damageableSystem = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
[Dependency] private readonly SharedStunSystem _stunSystem = default!;
[Dependency] protected readonly TagSystem Tags = default!;
[Dependency] protected readonly SharedAudioSystem Audio = default!;
@@ -88,8 +89,6 @@ public override void Initialize()
SubscribeLocalEvent(OnWeldAttempt);
SubscribeLocalEvent(OnWeldChanged);
SubscribeLocalEvent(OnPryTimeModifier);
-
- SubscribeLocalEvent(OnAttemptEmag);
SubscribeLocalEvent(OnEmagged);
}
@@ -129,31 +128,24 @@ private void OnRemove(Entity door, ref ComponentRemove args)
_activeDoors.Remove(door);
}
- private void OnAttemptEmag(EntityUid uid, DoorComponent door, ref OnAttemptEmagEvent args)
+ private void OnEmagged(EntityUid uid, DoorComponent door, ref GotEmaggedEvent args)
{
+ if (!_emag.CompareFlag(args.Type, EmagType.Access))
+ return;
+
if (!TryComp(uid, out var airlock))
- {
- args.Handled = true;
return;
- }
if (IsBolted(uid) || !airlock.Powered)
- {
- args.Handled = true;
return;
- }
if (door.State != DoorState.Closed)
- {
- args.Handled = true;
- }
- }
+ return;
- private void OnEmagged(EntityUid uid, DoorComponent door, ref GotEmaggedEvent args)
- {
if (!SetState(uid, DoorState.Emagging, door))
return;
- Audio.PlayPredicted(door.SparkSound, uid, args.UserUid, AudioParams.Default.WithVolume(8));
+
+ args.Repeatable = true;
args.Handled = true;
}
diff --git a/Content.Shared/DrawDepth/DrawDepth.cs b/Content.Shared/DrawDepth/DrawDepth.cs
index d0d2daf5d90f..4a93b5f0eaf3 100644
--- a/Content.Shared/DrawDepth/DrawDepth.cs
+++ b/Content.Shared/DrawDepth/DrawDepth.cs
@@ -9,32 +9,42 @@ public enum DrawDepth
///
/// This is for sub-floors, the floors you see after prying off a tile.
///
- LowFloors = DrawDepthTag.Default - 11,
+ LowFloors = DrawDepthTag.Default - 14,
// various entity types that require different
// draw depths, as to avoid hiding
#region SubfloorEntities
- ThickPipe = DrawDepthTag.Default - 10,
- ThickWire = DrawDepthTag.Default - 9,
- ThinPipe = DrawDepthTag.Default - 8,
- ThinWire = DrawDepthTag.Default - 7,
+ ThickPipe = DrawDepthTag.Default - 13,
+ ThickWire = DrawDepthTag.Default - 12,
+ ThinPipe = DrawDepthTag.Default - 11,
+ ThinWire = DrawDepthTag.Default - 10,
#endregion
///
/// Things that are beneath regular floors.
///
- BelowFloor = DrawDepthTag.Default - 7,
+ BelowFloor = DrawDepthTag.Default - 9,
///
/// Used for entities like carpets.
///
- FloorTiles = DrawDepthTag.Default - 6,
+ FloorTiles = DrawDepthTag.Default - 8,
///
- /// Things that are actually right on the floor, like puddles. This does not mean objects like
+ /// Things that are actually right on the floor, like ice crust or atmos devices. This does not mean objects like
/// tables, even though they are technically "on the floor".
///
- FloorObjects = DrawDepthTag.Default - 5,
+ FloorObjects = DrawDepthTag.Default - 7,
+
+ ///
+ // Discrete drawdepth to avoid z-fighting with other FloorObjects but also above floor entities.
+ ///
+ Puddles = DrawDepthTag.Default - 6,
+
+ ///
+ // Objects that are on the floor, but should render above puddles. This includes kudzu, holopads, telepads and levers.
+ ///
+ HighFloorObjects = DrawDepthTag.Default - 5,
DeadMobs = DrawDepthTag.Default - 4,
diff --git a/Content.Shared/Emag/Components/EmagComponent.cs b/Content.Shared/Emag/Components/EmagComponent.cs
index 27e60fe6ac7e..2922c6cd60bf 100644
--- a/Content.Shared/Emag/Components/EmagComponent.cs
+++ b/Content.Shared/Emag/Components/EmagComponent.cs
@@ -1,7 +1,9 @@
using Content.Shared.Emag.Systems;
using Content.Shared.Tag;
using Content.Shared.Whitelist;
+using Robust.Shared.Audio;
using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
using Robust.Shared.Serialization;
@@ -15,9 +17,9 @@ public sealed partial class EmagComponent : Component
///
/// The tag that marks an entity as immune to emags
///
- [DataField("emagImmuneTag", customTypeSerializer: typeof(PrototypeIdSerializer)), ViewVariables(VVAccess.ReadWrite)]
+ [DataField]
[AutoNetworkedField]
- public string EmagImmuneTag = "EmagImmune";
+ public ProtoId EmagImmuneTag = "EmagImmune";
// DeltaV - Add a whitelist/blacklist to the Emag
///
@@ -32,4 +34,18 @@ public sealed partial class EmagComponent : Component
[DataField]
public EntityWhitelist? Blacklist;
// End of DV code
+
+ ///
+ /// What type of emag effect this device will do
+ ///
+ [DataField]
+ [AutoNetworkedField]
+ public EmagType EmagType = EmagType.Interaction;
+
+ ///
+ /// What sound should the emag play when used
+ ///
+ [DataField]
+ [AutoNetworkedField]
+ public SoundSpecifier EmagSound = new SoundCollectionSpecifier("sparks");
}
diff --git a/Content.Shared/Emag/Components/EmaggedComponent.cs b/Content.Shared/Emag/Components/EmaggedComponent.cs
index 337f1a8e5611..152fdca8e368 100644
--- a/Content.Shared/Emag/Components/EmaggedComponent.cs
+++ b/Content.Shared/Emag/Components/EmaggedComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Emag.Systems;
using Robust.Shared.GameStates;
namespace Content.Shared.Emag.Components;
@@ -5,7 +6,12 @@ namespace Content.Shared.Emag.Components;
///
/// Marker component for emagged entities
///
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
public sealed partial class EmaggedComponent : Component
{
+ ///
+ /// The EmagType flags that were used to emag this device
+ ///
+ [DataField, AutoNetworkedField]
+ public EmagType EmagType = EmagType.None;
}
diff --git a/Content.Shared/Emag/Systems/EmagSystem.cs b/Content.Shared/Emag/Systems/EmagSystem.cs
index dab45d417860..f3d92ef55560 100644
--- a/Content.Shared/Emag/Systems/EmagSystem.cs
+++ b/Content.Shared/Emag/Systems/EmagSystem.cs
@@ -6,9 +6,10 @@
using Content.Shared.IdentityManagement;
using Content.Shared.Interaction;
using Content.Shared.Popups;
-using Content.Shared.Silicons.Laws.Components;
using Content.Shared.Tag;
using Content.Shared.Whitelist;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Serialization;
namespace Content.Shared.Emag.Systems;
@@ -24,97 +25,133 @@ public sealed class EmagSystem : EntitySystem
[Dependency] private readonly SharedChargesSystem _charges = default!;
[Dependency] private readonly SharedPopupSystem _popup = default!;
[Dependency] private readonly TagSystem _tag = default!;
+ [Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly EntityWhitelistSystem _whitelist = default!; // DeltaV - Add a whitelist/blacklist to the Emag
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent(OnAfterInteract);
+ SubscribeLocalEvent(OnAccessOverriderAccessUpdated);
}
+ private void OnAccessOverriderAccessUpdated(Entity entity, ref OnAccessOverriderAccessUpdatedEvent args)
+ {
+ if (!CompareFlag(entity.Comp.EmagType, EmagType.Access))
+ return;
+
+ entity.Comp.EmagType &= ~EmagType.Access;
+ Dirty(entity);
+ }
private void OnAfterInteract(EntityUid uid, EmagComponent comp, AfterInteractEvent args)
{
if (!args.CanReach || args.Target is not { } target)
return;
- args.Handled = TryUseEmag(uid, args.User, target, comp);
+ args.Handled = TryEmagEffect((uid, comp), args.User, target);
}
///
- /// Tries to use the emag on a target entity
+ /// Does the emag effect on a specified entity
///
- public bool TryUseEmag(EntityUid uid, EntityUid user, EntityUid target, EmagComponent? comp = null)
+ public bool TryEmagEffect(Entity ent, EntityUid user, EntityUid target)
{
- if (!Resolve(uid, ref comp, false))
+ if (!Resolve(ent, ref ent.Comp, false))
return false;
- if (_tag.HasTag(target, comp.EmagImmuneTag))
+ if (_tag.HasTag(target, ent.Comp.EmagImmuneTag))
return false;
- // DeltaV - Add a whitelist / blacklist to the Emag
- if (_whitelist.IsWhitelistFail(comp.Whitelist, target)
- || _whitelist.IsBlacklistPass(comp.Blacklist, target))
+ // DeltaV - Add a whitelist / blacklist to the Emag
+ if (_whitelist.IsWhitelistFail(ent.Comp.Whitelist, target)
+ || _whitelist.IsBlacklistPass(ent.Comp.Blacklist, target))
{
- _popup.PopupClient(Loc.GetString("emag-invalid-target", ("emag", uid), ("target", target)), user, user);
+ _popup.PopupClient(Loc.GetString("emag-invalid-target", ("emag", ent), ("target", target)), user, user);
return false;
}
- // End of DV code
+ // End of DV code
- TryComp(uid, out var charges);
- if (_charges.IsEmpty(uid, charges))
+ TryComp(ent, out var charges);
+ if (_charges.IsEmpty(ent, charges))
{
_popup.PopupClient(Loc.GetString("emag-no-charges"), user, user);
return false;
}
- var handled = DoEmagEffect(user, target);
- if (!handled)
+ var emaggedEvent = new GotEmaggedEvent(user, ent.Comp.EmagType);
+ RaiseLocalEvent(target, ref emaggedEvent);
+
+ if (!emaggedEvent.Handled)
return false;
- _popup.PopupClient(Loc.GetString("emag-success", ("target", Identity.Entity(target, EntityManager))), user,
- user, PopupType.Medium);
+ _popup.PopupPredicted(Loc.GetString("emag-success", ("target", Identity.Entity(target, EntityManager))), user, user, PopupType.Medium);
- _adminLogger.Add(LogType.Emag, LogImpact.High, $"{ToPrettyString(user):player} emagged {ToPrettyString(target):target}");
+ _audio.PlayPredicted(ent.Comp.EmagSound, ent, ent);
- if (charges != null)
- _charges.UseCharge(uid, charges);
- return true;
+ _adminLogger.Add(LogType.Emag, LogImpact.High, $"{ToPrettyString(user):player} emagged {ToPrettyString(target):target} with flag(s): {ent.Comp.EmagType}");
+
+ if (charges != null && emaggedEvent.Handled)
+ _charges.UseCharge(ent, charges);
+
+ if (!emaggedEvent.Repeatable)
+ {
+ EnsureComp(target, out var emaggedComp);
+
+ emaggedComp.EmagType |= ent.Comp.EmagType;
+ Dirty(target, emaggedComp);
+ }
+
+ return emaggedEvent.Handled;
}
///
- /// Does the emag effect on a specified entity
+ /// Checks whether an entity has the EmaggedComponent with a set flag.
///
- public bool DoEmagEffect(EntityUid user, EntityUid target)
+ /// The target entity to check for the flag.
+ /// The EmagType flag to check for.
+ /// True if entity has EmaggedComponent and the provided flag. False if the entity lacks EmaggedComponent or provided flag.
+ public bool CheckFlag(EntityUid target, EmagType flag)
{
- // prevent emagging twice
- if (HasComp(target))
+ if (!TryComp(target, out var comp))
return false;
- var onAttemptEmagEvent = new OnAttemptEmagEvent(user);
- RaiseLocalEvent(target, ref onAttemptEmagEvent);
+ if ((comp.EmagType & flag) == flag)
+ return true;
- // prevent emagging if attempt fails
- if (onAttemptEmagEvent.Handled)
- return false;
+ return false;
+ }
- var emaggedEvent = new GotEmaggedEvent(user);
- RaiseLocalEvent(target, ref emaggedEvent);
+ ///
+ /// Compares a flag to the target.
+ ///
+ /// The target flag to check.
+ /// The flag to check for within the target.
+ /// True if target contains flag. Otherwise false.
+ public bool CompareFlag(EmagType target, EmagType flag)
+ {
+ if ((target & flag) == flag)
+ return true;
- if (emaggedEvent.Handled && !emaggedEvent.Repeatable)
- EnsureComp(target);
- return emaggedEvent.Handled;
+ return false;
}
}
+
+[Flags]
+[Serializable, NetSerializable]
+public enum EmagType : byte
+{
+ None = 0,
+ Interaction = 1 << 1,
+ Access = 1 << 2
+}
///
/// Shows a popup to emag user (client side only!) and adds to the entity when handled
///
/// Emag user
+/// The emag type to use
/// Did the emagging succeed? Causes a user-only popup to show on client side
/// Can the entity be emagged more than once? Prevents adding of
/// Needs to be handled in shared/client, not just the server, to actually show the emagging popup
[ByRefEvent]
-public record struct GotEmaggedEvent(EntityUid UserUid, bool Handled = false, bool Repeatable = false);
-
-[ByRefEvent]
-public record struct OnAttemptEmagEvent(EntityUid UserUid, bool Handled = false);
+public record struct GotEmaggedEvent(EntityUid UserUid, EmagType Type, bool Handled = false, bool Repeatable = false);
diff --git a/Content.Shared/Fax/Components/FaxMachineComponent.cs b/Content.Shared/Fax/Components/FaxMachineComponent.cs
index 161c878e2752..2407ba594995 100644
--- a/Content.Shared/Fax/Components/FaxMachineComponent.cs
+++ b/Content.Shared/Fax/Components/FaxMachineComponent.cs
@@ -59,12 +59,6 @@ public sealed partial class FaxMachineComponent : Component
[DataField]
public bool ReceiveNukeCodes { get; set; } = false;
- ///
- /// Sound to play when fax has been emagged
- ///
- [DataField]
- public SoundSpecifier EmagSound = new SoundCollectionSpecifier("sparks");
-
///
/// Sound to play when fax printing new message
///
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Relay.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Relay.cs
index 2fc234c5d003..93df31295cdd 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Relay.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Relay.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Camera;
using Content.Shared.Hands.Components;
using Content.Shared.Heretic;
using Content.Shared.Movement.Systems;
@@ -8,6 +9,8 @@ public abstract partial class SharedHandsSystem
{
private void InitializeRelay()
{
+ SubscribeLocalEvent(RelayEvent);
+ SubscribeLocalEvent(RelayEvent);
SubscribeLocalEvent(RelayEvent);
SubscribeLocalEvent(RelayEvent); // imp
}
diff --git a/Content.Shared/Holopad/HolographicAvatarComponent.cs b/Content.Shared/Holopad/HolographicAvatarComponent.cs
index be7f5bcb91fc..cff71f4fb282 100644
--- a/Content.Shared/Holopad/HolographicAvatarComponent.cs
+++ b/Content.Shared/Holopad/HolographicAvatarComponent.cs
@@ -2,12 +2,12 @@
namespace Content.Shared.Holopad;
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
public sealed partial class HolographicAvatarComponent : Component
{
///
/// The prototype sprite layer data for the hologram
///
- [DataField]
+ [DataField, AutoNetworkedField]
public PrototypeLayerData[] LayerData;
}
diff --git a/Content.Shared/Holopad/HolopadHologramComponent.cs b/Content.Shared/Holopad/HolopadHologramComponent.cs
index a75ae2762343..0b650d9b3dcf 100644
--- a/Content.Shared/Holopad/HolopadHologramComponent.cs
+++ b/Content.Shared/Holopad/HolopadHologramComponent.cs
@@ -1,4 +1,5 @@
using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
using System.Numerics;
namespace Content.Shared.Holopad;
@@ -6,7 +7,7 @@ namespace Content.Shared.Holopad;
///
/// Holds data pertaining to holopad holograms
///
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
public sealed partial class HolopadHologramComponent : Component
{
///
@@ -64,8 +65,8 @@ public sealed partial class HolopadHologramComponent : Component
public Vector2 Offset = new Vector2();
///
- /// A user that are linked to this hologram
+ /// An entity that is linked to this hologram
///
- [ViewVariables]
- public Entity? LinkedHolopad;
+ [ViewVariables, AutoNetworkedField]
+ public EntityUid? LinkedEntity = null;
}
diff --git a/Content.Shared/Holopad/HolopadUserComponent.cs b/Content.Shared/Holopad/HolopadUserComponent.cs
index 9ff20c2e7b35..c9c2a8828b20 100644
--- a/Content.Shared/Holopad/HolopadUserComponent.cs
+++ b/Content.Shared/Holopad/HolopadUserComponent.cs
@@ -20,29 +20,6 @@ public sealed partial class HolopadUserComponent : Component
public HashSet> LinkedHolopads = new();
}
-///
-/// A networked event raised when the visual state of a hologram is being updated
-///
-[Serializable, NetSerializable]
-public sealed class HolopadHologramVisualsUpdateEvent : EntityEventArgs
-{
- ///
- /// The hologram being updated
- ///
- public readonly NetEntity Hologram;
-
- ///
- /// The target the hologram is copying
- ///
- public readonly NetEntity? Target;
-
- public HolopadHologramVisualsUpdateEvent(NetEntity hologram, NetEntity? target = null)
- {
- Hologram = hologram;
- Target = target;
- }
-}
-
///
/// A networked event raised when the visual state of a hologram is being updated
///
@@ -65,40 +42,3 @@ public HolopadUserTypingChangedEvent(NetEntity user, bool isTyping)
IsTyping = isTyping;
}
}
-
-///
-/// A networked event raised by the server to request the current visual state of a target player entity
-///
-[Serializable, NetSerializable]
-public sealed class PlayerSpriteStateRequest : EntityEventArgs
-{
- ///
- /// The player entity in question
- ///
- public readonly NetEntity TargetPlayer;
-
- public PlayerSpriteStateRequest(NetEntity targetPlayer)
- {
- TargetPlayer = targetPlayer;
- }
-}
-
-///
-/// The client's response to a
-///
-[Serializable, NetSerializable]
-public sealed class PlayerSpriteStateMessage : EntityEventArgs
-{
- public readonly NetEntity SpriteEntity;
-
- ///
- /// Data needed to reconstruct the player's sprite component layers
- ///
- public readonly PrototypeLayerData[]? SpriteLayerData;
-
- public PlayerSpriteStateMessage(NetEntity spriteEntity, PrototypeLayerData[]? spriteLayerData = null)
- {
- SpriteEntity = spriteEntity;
- SpriteLayerData = spriteLayerData;
- }
-}
diff --git a/Content.Shared/Implants/Components/ImplantedComponent.cs b/Content.Shared/Implants/Components/ImplantedComponent.cs
index 727213907ac5..2744d0291b8d 100644
--- a/Content.Shared/Implants/Components/ImplantedComponent.cs
+++ b/Content.Shared/Implants/Components/ImplantedComponent.cs
@@ -10,5 +10,6 @@ namespace Content.Shared.Implants.Components;
[RegisterComponent, NetworkedComponent]
public sealed partial class ImplantedComponent : Component
{
+ [ViewVariables(VVAccess.ReadOnly)]
public Container ImplantContainer = default!;
}
diff --git a/Content.Shared/Implants/Components/RadioImplantComponent.cs b/Content.Shared/Implants/Components/RadioImplantComponent.cs
new file mode 100644
index 000000000000..e0e7f556463b
--- /dev/null
+++ b/Content.Shared/Implants/Components/RadioImplantComponent.cs
@@ -0,0 +1,37 @@
+using Content.Shared.Radio;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Implants.Components;
+
+///
+/// Gives the user access to a given channel without the need for a headset.
+///
+[RegisterComponent]
+public sealed partial class RadioImplantComponent : Component
+{
+ ///
+ /// The radio channel(s) to grant access to.
+ ///
+ [DataField(required: true)]
+ public HashSet> RadioChannels = new();
+
+ ///
+ /// The radio channels that have been added by the implant to a user's ActiveRadioComponent.
+ /// Used to track which channels were successfully added (not already in user)
+ ///
+ ///
+ /// Should not be modified outside RadioImplantSystem.cs
+ ///
+ [DataField]
+ public HashSet> ActiveAddedChannels = new();
+
+ ///
+ /// The radio channels that have been added by the implant to a user's IntrinsicRadioTransmitterComponent.
+ /// Used to track which channels were successfully added (not already in user)
+ ///
+ ///
+ /// Should not be modified outside RadioImplantSystem.cs
+ ///
+ [DataField]
+ public HashSet> TransmitterAddedChannels = new();
+}
diff --git a/Content.Shared/Implants/SharedImplanterSystem.cs b/Content.Shared/Implants/SharedImplanterSystem.cs
index 44803e721c0d..6f394fb932a4 100644
--- a/Content.Shared/Implants/SharedImplanterSystem.cs
+++ b/Content.Shared/Implants/SharedImplanterSystem.cs
@@ -52,7 +52,14 @@ private void OnExamine(EntityUid uid, ImplanterComponent component, ExaminedEven
args.PushMarkup(Loc.GetString("implanter-contained-implant-text", ("desc", component.ImplantData.Item2)));
}
+ public bool CheckSameImplant(EntityUid target, EntityUid implant)
+ {
+ if (!TryComp(target, out var implanted))
+ return false;
+ var implantPrototype = Prototype(implant);
+ return implanted.ImplantContainer.ContainedEntities.Any(entity => Prototype(entity) == implantPrototype);
+ }
//Instantly implant something and add all necessary components and containers.
//Set to draw mode if not implant only
public void Implant(EntityUid user, EntityUid target, EntityUid implanter, ImplanterComponent component)
@@ -60,6 +67,16 @@ public void Implant(EntityUid user, EntityUid target, EntityUid implanter, Impla
if (!CanImplant(user, target, implanter, component, out var implant, out var implantComp))
return;
+ // Check if we are trying to implant a implant which is already implanted
+ // Check AFTER the doafter to prevent "is it a fake?" metagaming against deceptive implants
+ if (!component.AllowMultipleImplants && CheckSameImplant(target, implant.Value))
+ {
+ var name = Identity.Name(target, EntityManager, user);
+ var msg = Loc.GetString("implanter-component-implant-already", ("implant", implant), ("target", name));
+ _popup.PopupEntity(msg, target, user);
+ return;
+ }
+
//If the target doesn't have the implanted component, add it.
var implantedComp = EnsureComp(target);
var implantContainer = implantedComp.ImplantContainer;
diff --git a/Content.Shared/Implants/SharedSubdermalImplantSystem.cs b/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
index 94203de61558..bb166b3c5cb8 100644
--- a/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
+++ b/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
@@ -1,4 +1,3 @@
-using System.Linq;
using Content.Shared.Actions;
using Content.Shared.Implants.Components;
using Content.Shared.Interaction;
@@ -8,6 +7,7 @@
using JetBrains.Annotations;
using Robust.Shared.Containers;
using Robust.Shared.Network;
+using System.Linq;
namespace Content.Shared.Implants;
@@ -17,6 +17,7 @@ public abstract class SharedSubdermalImplantSystem : EntitySystem
[Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
[Dependency] private readonly SharedContainerSystem _container = default!;
[Dependency] private readonly TagSystem _tag = default!;
+ [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
public const string BaseStorageId = "storagebase";
@@ -75,16 +76,11 @@ private void OnRemove(EntityUid uid, SubdermalImplantComponent component, EntGot
if (!_container.TryGetContainer(uid, BaseStorageId, out var storageImplant))
return;
- var entCoords = Transform(component.ImplantedEntity.Value).Coordinates;
-
var containedEntites = storageImplant.ContainedEntities.ToArray();
foreach (var entity in containedEntites)
{
- if (Terminating(entity))
- continue;
-
- _container.RemoveEntity(storageImplant.Owner, entity, force: true, destination: entCoords);
+ _transformSystem.DropNextTo(entity, uid);
}
}
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 2926e1d1b388..a88f673cac73 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -667,7 +667,8 @@ public bool InRangeUnobstructed(
float range = InteractionRange,
CollisionGroup collisionMask = InRangeUnobstructedMask,
Ignored? predicate = null,
- bool popup = false)
+ bool popup = false,
+ bool overlapCheck = true)
{
if (!Resolve(other, ref other.Comp))
return false;
@@ -687,7 +688,8 @@ public bool InRangeUnobstructed(
range,
collisionMask,
predicate,
- popup);
+ popup,
+ overlapCheck);
}
///
@@ -717,6 +719,7 @@ public bool InRangeUnobstructed(
///
/// True if the two points are within a given range without being obstructed.
///
+ /// If true, if the broadphase query returns an overlap (0f distance) this function will early out true with no raycast made.
public bool InRangeUnobstructed(
Entity origin,
Entity other,
@@ -725,7 +728,8 @@ public bool InRangeUnobstructed(
float range = InteractionRange,
CollisionGroup collisionMask = InRangeUnobstructedMask,
Ignored? predicate = null,
- bool popup = false)
+ bool popup = false,
+ bool overlapCheck = true)
{
Ignored combinedPredicate = e => e == origin.Owner || (predicate?.Invoke(e) ?? false);
var inRange = true;
@@ -768,7 +772,7 @@ public bool InRangeUnobstructed(
inRange = false;
}
// Overlap, early out and no raycast.
- else if (distance.Equals(0f))
+ else if (overlapCheck && distance.Equals(0f))
{
return true;
}
diff --git a/Content.Shared/Inventory/Events/RefreshEquipmentHudEvent.cs b/Content.Shared/Inventory/Events/RefreshEquipmentHudEvent.cs
index 4f486fe695e7..e39fb056b4a5 100644
--- a/Content.Shared/Inventory/Events/RefreshEquipmentHudEvent.cs
+++ b/Content.Shared/Inventory/Events/RefreshEquipmentHudEvent.cs
@@ -1,13 +1,10 @@
namespace Content.Shared.Inventory.Events;
-public sealed class RefreshEquipmentHudEvent : EntityEventArgs, IInventoryRelayEvent where T : IComponent
+[ByRefEvent]
+public record struct RefreshEquipmentHudEvent(SlotFlags TargetSlots) : IInventoryRelayEvent
+ where T : IComponent
{
- public SlotFlags TargetSlots { get; init; }
+ public SlotFlags TargetSlots { get; } = TargetSlots;
public bool Active = false;
public List Components = new();
-
- public RefreshEquipmentHudEvent(SlotFlags targetSlots)
- {
- TargetSlots = targetSlots;
- }
}
diff --git a/Content.Shared/Inventory/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs
index 8b166c6f3050..7ae01e591a1d 100644
--- a/Content.Shared/Inventory/InventorySystem.Relay.cs
+++ b/Content.Shared/Inventory/InventorySystem.Relay.cs
@@ -1,4 +1,3 @@
-using Content.Shared._Goobstation.Overlays;
using Content.Shared.Chat;
using Content.Shared.Chemistry;
using Content.Shared.Chemistry.Hypospray.Events;
@@ -59,15 +58,14 @@ public void InitializeRelay()
SubscribeLocalEvent(RelayInventoryEvent);
// ComponentActivatedClientSystems
- SubscribeLocalEvent>(RelayInventoryEvent);
- SubscribeLocalEvent>(RelayInventoryEvent);
- SubscribeLocalEvent>(RelayInventoryEvent);
- SubscribeLocalEvent>(RelayInventoryEvent);
- SubscribeLocalEvent>(RelayInventoryEvent);
- SubscribeLocalEvent>(RelayInventoryEvent);
- SubscribeLocalEvent>(RelayInventoryEvent); // goob edit
- SubscribeLocalEvent>(RelayInventoryEvent);
- SubscribeLocalEvent>(RelayInventoryEvent);
+ SubscribeLocalEvent>(RefRelayInventoryEvent);
+ SubscribeLocalEvent>(RefRelayInventoryEvent);
+ SubscribeLocalEvent>(RefRelayInventoryEvent);
+ SubscribeLocalEvent>(RefRelayInventoryEvent);
+ SubscribeLocalEvent>(RefRelayInventoryEvent);
+ SubscribeLocalEvent>(RefRelayInventoryEvent);
+ SubscribeLocalEvent>(RefRelayInventoryEvent);
+ SubscribeLocalEvent>(RefRelayInventoryEvent);
SubscribeLocalEvent>(OnGetEquipmentVerbs);
}
diff --git a/Content.Shared/Lathe/SharedLatheSystem.cs b/Content.Shared/Lathe/SharedLatheSystem.cs
index dd251ed18b3f..7328787f25ef 100644
--- a/Content.Shared/Lathe/SharedLatheSystem.cs
+++ b/Content.Shared/Lathe/SharedLatheSystem.cs
@@ -18,6 +18,7 @@ public abstract class SharedLatheSystem : EntitySystem
{
[Dependency] private readonly IPrototypeManager _proto = default!;
[Dependency] private readonly SharedMaterialStorageSystem _materialStorage = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
public readonly Dictionary> InverseRecipes = new();
@@ -66,6 +67,12 @@ public bool CanProduce(EntityUid uid, LatheRecipePrototype recipe, int amount =
private void OnEmagged(EntityUid uid, EmagLatheRecipesComponent component, ref GotEmaggedEvent args)
{
+ if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+ return;
+
+ if (_emag.CheckFlag(uid, EmagType.Interaction))
+ return;
+
args.Handled = true;
}
diff --git a/Content.Shared/Light/EntitySystems/UnpoweredFlashlightSystem.cs b/Content.Shared/Light/EntitySystems/UnpoweredFlashlightSystem.cs
index 8754de50583e..6dc6cbfe0b32 100644
--- a/Content.Shared/Light/EntitySystems/UnpoweredFlashlightSystem.cs
+++ b/Content.Shared/Light/EntitySystems/UnpoweredFlashlightSystem.cs
@@ -2,6 +2,7 @@
using Content.Shared.Emag.Systems;
using Content.Shared.Light.Components;
using Content.Shared.Mind.Components;
+using Content.Shared.Storage.Components;
using Content.Shared.Toggleable;
using Content.Shared.Verbs;
using Robust.Shared.Audio.Systems;
@@ -22,6 +23,7 @@ public sealed class UnpoweredFlashlightSystem : EntitySystem
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly SharedAudioSystem _audioSystem = default!;
[Dependency] private readonly SharedPointLightSystem _light = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
public override void Initialize()
{
@@ -78,6 +80,9 @@ private void OnMindAdded(EntityUid uid, UnpoweredFlashlightComponent component,
private void OnGotEmagged(EntityUid uid, UnpoweredFlashlightComponent component, ref GotEmaggedEvent args)
{
+ if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+ return;
+
if (!_light.TryGetLight(uid, out var light))
return;
diff --git a/Content.Shared/Lock/LockComponent.cs b/Content.Shared/Lock/LockComponent.cs
index 070d5801c1c8..2689602ae8c9 100644
--- a/Content.Shared/Lock/LockComponent.cs
+++ b/Content.Shared/Lock/LockComponent.cs
@@ -54,9 +54,9 @@ public sealed partial class LockComponent : Component
///
/// Whether or not an emag disables it.
///
- [DataField("breakOnEmag")]
+ [DataField]
[AutoNetworkedField]
- public bool BreakOnEmag = true;
+ public bool BreakOnAccessBreaker = true;
///
/// Amount of do-after time needed to lock the entity.
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index 106528009533..0b24bc672216 100644
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -28,6 +28,7 @@ public sealed class LockSystem : EntitySystem
[Dependency] private readonly AccessReaderSystem _accessReader = default!;
[Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
[Dependency] private readonly ActivatableUISystem _activatableUI = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
[Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedPopupSystem _sharedPopupSystem = default!;
@@ -295,7 +296,10 @@ private void AddToggleLockVerb(EntityUid uid, LockComponent component, GetVerbsE
private void OnEmagged(EntityUid uid, LockComponent component, ref GotEmaggedEvent args)
{
- if (!component.Locked || !component.BreakOnEmag)
+ if (!_emag.CompareFlag(args.Type, EmagType.Access))
+ return;
+
+ if (!component.Locked || !component.BreakOnAccessBreaker)
return;
_audio.PlayPredicted(component.UnlockSound, uid, args.UserUid);
@@ -307,7 +311,7 @@ private void OnEmagged(EntityUid uid, LockComponent component, ref GotEmaggedEve
var ev = new LockToggledEvent(false);
RaiseLocalEvent(uid, ref ev, true);
- RemComp(uid); //Literally destroys the lock as a tell it was emagged
+ args.Repeatable = true;
args.Handled = true;
}
diff --git a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
index d143f509485c..8eb541ee5982 100644
--- a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
+++ b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
@@ -29,6 +29,7 @@ public abstract class SharedMaterialReclaimerSystem : EntitySystem
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] protected readonly SharedContainerSystem Container = default!;
[Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
public const string ActiveReclaimerContainerId = "active-material-reclaimer-container";
@@ -60,6 +61,12 @@ private void OnExamined(EntityUid uid, MaterialReclaimerComponent component, Exa
private void OnEmagged(EntityUid uid, MaterialReclaimerComponent component, ref GotEmaggedEvent args)
{
+ if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+ return;
+
+ if (_emag.CheckFlag(uid, EmagType.Interaction))
+ return;
+
args.Handled = true;
}
@@ -207,7 +214,7 @@ public bool CanGib(EntityUid uid, EntityUid victim, MaterialReclaimerComponent c
component.Enabled &&
!component.Broken &&
HasComp(victim) &&
- HasComp(uid);
+ _emag.CheckFlag(uid, EmagType.Interaction);
}
///
diff --git a/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs b/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
index f6ce235ff749..891129a2ddc0 100644
--- a/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
+++ b/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
@@ -20,6 +20,7 @@ public abstract partial class SharedCryoPodSystem: EntitySystem
{
[Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
[Dependency] private readonly StandingStateSystem _standingStateSystem = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
[Dependency] private readonly MobStateSystem _mobStateSystem = default!;
[Dependency] private readonly SharedPopupSystem _popupSystem = default!;
[Dependency] private readonly SharedContainerSystem _containerSystem = default!;
@@ -156,9 +157,13 @@ protected void AddAlternativeVerbs(EntityUid uid, CryoPodComponent cryoPodCompon
protected void OnEmagged(EntityUid uid, CryoPodComponent? cryoPodComponent, ref GotEmaggedEvent args)
{
if (!Resolve(uid, ref cryoPodComponent))
- {
return;
- }
+
+ if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+ return;
+
+ if (cryoPodComponent.PermaLocked && cryoPodComponent.Locked)
+ return;
cryoPodComponent.PermaLocked = true;
cryoPodComponent.Locked = true;
diff --git a/Content.Shared/Mindshield/Components/FakeMindShieldImplantComponent.cs b/Content.Shared/Mindshield/Components/FakeMindShieldImplantComponent.cs
new file mode 100644
index 000000000000..788de804f440
--- /dev/null
+++ b/Content.Shared/Mindshield/Components/FakeMindShieldImplantComponent.cs
@@ -0,0 +1,8 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Mindshield.Components;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class FakeMindShieldImplantComponent : Component
+{
+}
diff --git a/Content.Shared/Mindshield/Components/FakeMindshieldComponent.cs b/Content.Shared/Mindshield/Components/FakeMindshieldComponent.cs
new file mode 100644
index 000000000000..106f43367ee3
--- /dev/null
+++ b/Content.Shared/Mindshield/Components/FakeMindshieldComponent.cs
@@ -0,0 +1,22 @@
+using Content.Shared.StatusIcon;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Mindshield.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class FakeMindShieldComponent : Component
+{
+
+ ///
+ /// The state of the Fake mindshield, if true the owning entity will display a mindshield effect on their job icon
+ ///
+ [DataField, AutoNetworkedField]
+ public bool IsEnabled { get; set; } = false;
+
+ ///
+ /// The Security status icon displayed to the security officer. Should be a duplicate of the one the mindshield uses since it's spoofing that
+ ///
+ [DataField, AutoNetworkedField]
+ public ProtoId MindShieldStatusIcon = "MindShieldIcon";
+}
diff --git a/Content.Shared/Mindshield/FakeMindShield/SharedFakeMindShieldImplantSystem.cs b/Content.Shared/Mindshield/FakeMindShield/SharedFakeMindShieldImplantSystem.cs
new file mode 100644
index 000000000000..8887025e3ae3
--- /dev/null
+++ b/Content.Shared/Mindshield/FakeMindShield/SharedFakeMindShieldImplantSystem.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Actions;
+using Content.Shared.Implants;
+using Content.Shared.Implants.Components;
+using Content.Shared.Mindshield.Components;
+
+namespace Content.Shared.Mindshield.FakeMindShield;
+
+public sealed class SharedFakeMindShieldImplantSystem : EntitySystem
+{
+ [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+ public override void Initialize()
+ {
+ base.Initialize();
+ SubscribeLocalEvent(OnFakeMindShieldToggle);
+ SubscribeLocalEvent(ImplantCheck);
+ }
+ ///
+ /// Raise the Action of a Implanted user toggling their implant to the FakeMindshieldComponent on their entity
+ ///
+ private void OnFakeMindShieldToggle(Entity entity, ref FakeMindShieldToggleEvent ev)
+ {
+ ev.Handled = true;
+ if (entity.Comp.ImplantedEntity is not { } ent)
+ return;
+
+ if (!TryComp(ent, out var comp))
+ return;
+ _actionsSystem.SetToggled(ev.Action, !comp.IsEnabled); // Set it to what the Mindshield component WILL be after this
+ RaiseLocalEvent(ent, ev); //this reraises the action event to support an eventual future Changeling Antag which will also be using this component for it's "mindshield" ability
+ }
+ private void ImplantCheck(EntityUid uid, FakeMindShieldImplantComponent component ,ref ImplantImplantedEvent ev)
+ {
+ if (ev.Implanted != null)
+ EnsureComp(ev.Implanted.Value);
+ }
+}
diff --git a/Content.Shared/Mindshield/FakeMindShield/SharedFakeMindshieldSystem.cs b/Content.Shared/Mindshield/FakeMindShield/SharedFakeMindshieldSystem.cs
new file mode 100644
index 000000000000..0a7c97420011
--- /dev/null
+++ b/Content.Shared/Mindshield/FakeMindShield/SharedFakeMindshieldSystem.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Actions;
+using Content.Shared.Mindshield.Components;
+
+namespace Content.Shared.Mindshield.FakeMindShield;
+
+public sealed class SharedFakeMindShieldSystem : EntitySystem
+{
+ public override void Initialize()
+ {
+ base.Initialize();
+ SubscribeLocalEvent(OnToggleMindshield);
+ }
+
+ private void OnToggleMindshield(EntityUid uid, FakeMindShieldComponent comp, FakeMindShieldToggleEvent toggleEvent)
+ {
+ comp.IsEnabled = !comp.IsEnabled;
+ Dirty(uid, comp);
+ }
+}
+
+public sealed partial class FakeMindShieldToggleEvent : InstantActionEvent;
diff --git a/Content.Shared/Mobs/Events/BeforeAlertSeverityCheckEvent.cs b/Content.Shared/Mobs/Events/BeforeAlertSeverityCheckEvent.cs
new file mode 100644
index 000000000000..e729314d39bb
--- /dev/null
+++ b/Content.Shared/Mobs/Events/BeforeAlertSeverityCheckEvent.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Alert;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Mobs.Events;
+
+///
+/// Event for allowing the interrupting and change of the mob threshold severity alert
+///
+[Serializable, NetSerializable]
+public sealed class BeforeAlertSeverityCheckEvent(ProtoId currentAlert, short severity) : EntityEventArgs
+{
+ public bool CancelUpdate = false;
+ public ProtoId CurrentAlert = currentAlert;
+ public short Severity = severity;
+}
diff --git a/Content.Shared/Mobs/Systems/MobThresholdSystem.cs b/Content.Shared/Mobs/Systems/MobThresholdSystem.cs
index bdab4143c4a8..0a87b25e38ec 100644
--- a/Content.Shared/Mobs/Systems/MobThresholdSystem.cs
+++ b/Content.Shared/Mobs/Systems/MobThresholdSystem.cs
@@ -4,6 +4,7 @@
using Content.Shared.Damage;
using Content.Shared.FixedPoint;
using Content.Shared.Mobs.Components;
+using Content.Shared.Mobs.Events;
using Robust.Shared.GameStates;
namespace Content.Shared.Mobs.Systems;
@@ -438,6 +439,16 @@ private void UpdateAlerts(EntityUid target, MobState currentMobState, MobThresho
if (alertPrototype.SupportsSeverity)
{
var severity = _alerts.GetMinSeverity(currentAlert);
+
+ var ev = new BeforeAlertSeverityCheckEvent(currentAlert, severity);
+ RaiseLocalEvent(target, ev);
+
+ if (ev.CancelUpdate)
+ {
+ _alerts.ShowAlert(target, ev.CurrentAlert, ev.Severity);
+ return;
+ }
+
if (TryGetNextState(target, currentMobState, out var nextState, threshold) &&
TryGetPercentageForState(target, nextState.Value, damageable.TotalDamage, out var percentage))
{
diff --git a/Content.Shared/Movement/Components/CursorOffsetRequiresWieldComponent.cs b/Content.Shared/Movement/Components/CursorOffsetRequiresWieldComponent.cs
new file mode 100644
index 000000000000..3f5a12874b91
--- /dev/null
+++ b/Content.Shared/Movement/Components/CursorOffsetRequiresWieldComponent.cs
@@ -0,0 +1,13 @@
+using Content.Shared.Wieldable;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Movement.Components;
+
+///
+/// Indicates that this item requires wielding for the cursor offset effect to be active.
+///
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedWieldableSystem))]
+public sealed partial class CursorOffsetRequiresWieldComponent : Component
+{
+
+}
diff --git a/Content.Shared/Movement/Components/EyeCursorOffsetComponent.cs b/Content.Shared/Movement/Components/EyeCursorOffsetComponent.cs
new file mode 100644
index 000000000000..e0884222f257
--- /dev/null
+++ b/Content.Shared/Movement/Components/EyeCursorOffsetComponent.cs
@@ -0,0 +1,32 @@
+using System.Numerics;
+using Content.Shared.Movement.Systems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Movement.Components;
+
+///
+/// Displaces SS14 eye data when given to an entity.
+///
+[ComponentProtoName("EyeCursorOffset"), NetworkedComponent]
+public abstract partial class SharedEyeCursorOffsetComponent : Component
+{
+ ///
+ /// The amount the view will be displaced when the cursor is positioned at/beyond the max offset distance.
+ /// Measured in tiles.
+ ///
+ [DataField]
+ public float MaxOffset = 3f;
+
+ ///
+ /// The speed which the camera adjusts to new positions. 0.5f seems like a good value, but can be changed if you want very slow/instant adjustments.
+ ///
+ [DataField]
+ public float OffsetSpeed = 0.5f;
+
+ ///
+ /// The amount the PVS should increase to account for the max offset.
+ /// Should be 1/10 of MaxOffset most of the time.
+ ///
+ [DataField]
+ public float PvsIncrease = 0.3f;
+}
diff --git a/Content.Shared/Movement/Components/SpeedModifiedOnWieldComponent.cs b/Content.Shared/Movement/Components/SpeedModifiedOnWieldComponent.cs
new file mode 100644
index 000000000000..01b02e60e679
--- /dev/null
+++ b/Content.Shared/Movement/Components/SpeedModifiedOnWieldComponent.cs
@@ -0,0 +1,23 @@
+using Content.Shared.Wieldable;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Movement.Components;
+
+///
+/// Modifies the speed when an entity with this component is wielded.
+///
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedWieldableSystem)), AutoGenerateComponentState]
+public sealed partial class SpeedModifiedOnWieldComponent : Component
+{
+ ///
+ /// How much the wielder's sprint speed is modified when the component owner is wielded.
+ ///
+ [DataField, AutoNetworkedField]
+ public float SprintModifier = 1f;
+
+ ///
+ /// How much the wielder's walk speed is modified when the component owner is wielded.
+ ///
+ [DataField, AutoNetworkedField]
+ public float WalkModifier = 1f;
+}
diff --git a/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs b/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs
index faade44c8587..71bc65a79ea0 100644
--- a/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs
+++ b/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs
@@ -140,11 +140,29 @@ public void SetMaxZoom(EntityUid uid, Vector2 value, ContentEyeComponent? compon
Dirty(uid, component);
}
- public void UpdateEyeOffset(Entity eye)
+ public void UpdateEyeOffset(Entity eye)
{
var ev = new GetEyeOffsetEvent();
RaiseLocalEvent(eye, ref ev);
- _eye.SetOffset(eye, ev.Offset, eye);
+
+ var evRelayed = new GetEyeOffsetRelayedEvent();
+ RaiseLocalEvent(eye, ref evRelayed);
+
+ _eye.SetOffset(eye, ev.Offset + evRelayed.Offset, eye);
+ }
+
+ public void UpdatePvsScale(EntityUid uid, ContentEyeComponent? contentEye = null, EyeComponent? eye = null)
+ {
+ if (!Resolve(uid, ref contentEye) || !Resolve(uid, ref eye))
+ return;
+
+ var ev = new GetEyePvsScaleEvent();
+ RaiseLocalEvent(uid, ref ev);
+
+ var evRelayed = new GetEyePvsScaleRelayedEvent();
+ RaiseLocalEvent(uid, ref evRelayed);
+
+ _eye.SetPvsScale((uid, eye), 1 + ev.Scale + evRelayed.Scale);
}
///
diff --git a/Content.Server/NPC/Components/NPCRecentlyInjectedComponent.cs b/Content.Shared/NPC/Components/NPCRecentlyInjectedComponent.cs
similarity index 78%
rename from Content.Server/NPC/Components/NPCRecentlyInjectedComponent.cs
rename to Content.Shared/NPC/Components/NPCRecentlyInjectedComponent.cs
index 0bc5dce55b9f..b79c4dd9ef05 100644
--- a/Content.Server/NPC/Components/NPCRecentlyInjectedComponent.cs
+++ b/Content.Shared/NPC/Components/NPCRecentlyInjectedComponent.cs
@@ -1,8 +1,10 @@
-namespace Content.Server.NPC.Components
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.NPC.Components
{
/// Added when a medibot injects someone
/// So they don't get injected again for at least a minute.
- [RegisterComponent]
+ [RegisterComponent, NetworkedComponent]
public sealed partial class NPCRecentlyInjectedComponent : Component
{
[ViewVariables(VVAccess.ReadWrite), DataField("accumulator")]
diff --git a/Content.Shared/Ninja/Components/EmagProviderComponent.cs b/Content.Shared/Ninja/Components/EmagProviderComponent.cs
index ae3e85cbe42a..630ce12d53ce 100644
--- a/Content.Shared/Ninja/Components/EmagProviderComponent.cs
+++ b/Content.Shared/Ninja/Components/EmagProviderComponent.cs
@@ -1,6 +1,8 @@
+using Content.Shared.Emag.Systems;
using Content.Shared.Ninja.Systems;
using Content.Shared.Tag;
using Content.Shared.Whitelist;
+using Robust.Shared.Audio;
using Robust.Shared.GameStates;
using Robust.Shared.Prototypes;
@@ -17,11 +19,23 @@ public sealed partial class EmagProviderComponent : Component
/// The tag that marks an entity as immune to emagging.
///
[DataField]
- public ProtoId EmagImmuneTag = "EmagImmune";
+ public ProtoId AccessBreakerImmuneTag = "AccessBreakerImmune";
///
/// Whitelist that entities must be on to work.
///
[DataField]
public EntityWhitelist? Whitelist;
+
+ ///
+ /// What type of emag this will provide.
+ ///
+ [DataField]
+ public EmagType EmagType = EmagType.Access;
+
+ ///
+ /// What sound should the emag play when used
+ ///
+ [DataField]
+ public SoundSpecifier EmagSound = new SoundCollectionSpecifier("sparks");
}
diff --git a/Content.Shared/Ninja/Systems/EmagProviderSystem.cs b/Content.Shared/Ninja/Systems/EmagProviderSystem.cs
index ae0bacaf5f65..3be2ae52e130 100644
--- a/Content.Shared/Ninja/Systems/EmagProviderSystem.cs
+++ b/Content.Shared/Ninja/Systems/EmagProviderSystem.cs
@@ -5,6 +5,7 @@
using Content.Shared.Ninja.Components;
using Content.Shared.Tag;
using Content.Shared.Whitelist;
+using Robust.Shared.Audio.Systems;
namespace Content.Shared.Ninja.Systems;
@@ -13,6 +14,7 @@ namespace Content.Shared.Ninja.Systems;
///
public sealed class EmagProviderSystem : EntitySystem
{
+ [Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly EmagSystem _emag = default!;
[Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
@@ -42,14 +44,18 @@ private void OnBeforeInteractHand(Entity ent, ref BeforeI
return;
// only allowed to emag non-immune entities
- if (_tag.HasTag(target, comp.EmagImmuneTag))
+ if (_tag.HasTag(target, comp.AccessBreakerImmuneTag))
return;
- var handled = _emag.DoEmagEffect(uid, target);
- if (!handled)
+ var emagEv = new GotEmaggedEvent(uid, EmagType.Access);
+ RaiseLocalEvent(args.Target, ref emagEv);
+
+ if (!emagEv.Handled)
return;
- _adminLogger.Add(LogType.Emag, LogImpact.High, $"{ToPrettyString(uid):player} emagged {ToPrettyString(target):target}");
+ _audio.PlayPredicted(comp.EmagSound, uid, uid);
+
+ _adminLogger.Add(LogType.Emag, LogImpact.High, $"{ToPrettyString(uid):player} emagged {ToPrettyString(target):target} with flag(s): {ent.Comp.EmagType}");
var ev = new EmaggedSomethingEvent(target);
RaiseLocalEvent(uid, ref ev);
args.Handled = true;
@@ -57,7 +63,7 @@ private void OnBeforeInteractHand(Entity ent, ref BeforeI
}
///
-/// Raised on the player when emagging something.
+/// Raised on the player when access breaking something.
///
[ByRefEvent]
public record struct EmaggedSomethingEvent(EntityUid Target);
diff --git a/Content.Shared/Pinpointer/SharedPinpointerSystem.cs b/Content.Shared/Pinpointer/SharedPinpointerSystem.cs
index 7f6b88912559..471096018356 100644
--- a/Content.Shared/Pinpointer/SharedPinpointerSystem.cs
+++ b/Content.Shared/Pinpointer/SharedPinpointerSystem.cs
@@ -10,6 +10,7 @@ namespace Content.Shared.Pinpointer;
public abstract class SharedPinpointerSystem : EntitySystem
{
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
public override void Initialize()
{
@@ -137,6 +138,15 @@ public virtual bool TogglePinpointer(EntityUid uid, PinpointerComponent? pinpoin
private void OnEmagged(EntityUid uid, PinpointerComponent component, ref GotEmaggedEvent args)
{
+ if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+ return;
+
+ if (_emag.CheckFlag(uid, EmagType.Interaction))
+ return;
+
+ if (component.CanRetarget)
+ return;
+
args.Handled = true;
component.CanRetarget = true;
}
diff --git a/Content.Shared/Projectiles/ProjectileComponent.cs b/Content.Shared/Projectiles/ProjectileComponent.cs
index 8349252df2b7..9eee3767a6da 100644
--- a/Content.Shared/Projectiles/ProjectileComponent.cs
+++ b/Content.Shared/Projectiles/ProjectileComponent.cs
@@ -1,4 +1,5 @@
using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
using Robust.Shared.Audio;
using Robust.Shared.GameStates;
using Robust.Shared.Prototypes;
@@ -75,8 +76,26 @@ public sealed partial class ProjectileComponent : Component
public bool OnlyCollideWhenShot = false;
///
- /// Whether this projectile has already damaged an entity.
+ /// If true, the projectile has hit enough targets and should no longer interact with further collisions pending deletion.
///
[DataField]
- public bool DamagedEntity;
+ public bool ProjectileSpent;
+
+ ///
+ /// When a projectile has this threshold set, it will continue to penetrate entities until the damage dealt reaches this threshold.
+ ///
+ [DataField]
+ public FixedPoint2 PenetrationThreshold = FixedPoint2.Zero;
+
+ ///
+ /// If set, the projectile will not penetrate objects that lack the ability to take these damage types.
+ ///
+ [DataField]
+ public List? PenetrationDamageTypeRequirement;
+
+ ///
+ /// Tracks the amount of damage dealt for penetration purposes.
+ ///
+ [DataField]
+ public FixedPoint2 PenetrationAmount = FixedPoint2.Zero;
}
diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs
index b0c8758c44a6..cce8b3c45d01 100644
--- a/Content.Shared/Projectiles/SharedProjectileSystem.cs
+++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs
@@ -154,7 +154,7 @@ public void RemoveEmbed(EntityUid uid, EmbeddableProjectileComponent component,
{
projectile.Shooter = null;
projectile.Weapon = null;
- projectile.DamagedEntity = false;
+ projectile.ProjectileSpent = false;
}
// Land it just coz uhhh yeah
diff --git a/Content.Shared/Radiation/Events/OnIrradiatedEvent.cs b/Content.Shared/Radiation/Events/OnIrradiatedEvent.cs
index ee35304e2af7..3112e1eb471e 100644
--- a/Content.Shared/Radiation/Events/OnIrradiatedEvent.cs
+++ b/Content.Shared/Radiation/Events/OnIrradiatedEvent.cs
@@ -4,17 +4,11 @@
/// Raised on entity when it was irradiated
/// by some radiation source.
///
-public sealed class OnIrradiatedEvent : EntityEventArgs
+public readonly record struct OnIrradiatedEvent(float FrameTime, float RadsPerSecond)
{
- public readonly float FrameTime;
+ public readonly float FrameTime = FrameTime;
- public readonly float RadsPerSecond;
+ public readonly float RadsPerSecond = RadsPerSecond;
public float TotalRads => RadsPerSecond * FrameTime;
-
- public OnIrradiatedEvent(float frameTime, float radsPerSecond)
- {
- FrameTime = frameTime;
- RadsPerSecond = radsPerSecond;
- }
}
diff --git a/Content.Shared/Radiation/Events/OnRadiationOverlayUpdateEvent.cs b/Content.Shared/Radiation/Events/OnRadiationOverlayUpdateEvent.cs
index a93ca4c616b0..e42d13ffb7b2 100644
--- a/Content.Shared/Radiation/Events/OnRadiationOverlayUpdateEvent.cs
+++ b/Content.Shared/Radiation/Events/OnRadiationOverlayUpdateEvent.cs
@@ -13,36 +13,33 @@ namespace Content.Shared.Radiation.Events;
/// Will be sent only to clients that activated radiation view using console command.
///
[Serializable, NetSerializable]
-public sealed class OnRadiationOverlayUpdateEvent : EntityEventArgs
+public sealed class OnRadiationOverlayUpdateEvent(
+ double elapsedTimeMs,
+ int sourcesCount,
+ int receiversCount,
+ List rays)
+ : EntityEventArgs
{
///
/// Total time in milliseconds that server took to do radiation processing.
/// Exclude time of entities reacting to .
///
- public readonly double ElapsedTimeMs;
+ public readonly double ElapsedTimeMs = elapsedTimeMs;
///
/// Total count of entities with on all maps.
///
- public readonly int SourcesCount;
+ public readonly int SourcesCount = sourcesCount;
///
/// Total count of entities with radiation receiver on all maps.
///
- public readonly int ReceiversCount;
+ public readonly int ReceiversCount = receiversCount;
///
/// All radiation rays that was processed by radiation system.
///
- public readonly List Rays;
-
- public OnRadiationOverlayUpdateEvent(double elapsedTimeMs, int sourcesCount, int receiversCount, List rays)
- {
- ElapsedTimeMs = elapsedTimeMs;
- SourcesCount = sourcesCount;
- ReceiversCount = receiversCount;
- Rays = rays;
- }
+ public readonly List Rays = rays;
}
///
diff --git a/Content.Shared/Radiation/RadiationRay.cs b/Content.Shared/Radiation/RadiationRay.cs
index ca8ab5af661d..9f8b9596943a 100644
--- a/Content.Shared/Radiation/RadiationRay.cs
+++ b/Content.Shared/Radiation/RadiationRay.cs
@@ -9,33 +9,38 @@ namespace Content.Shared.Radiation.Systems;
/// Ray emitted by radiation source towards radiation receiver.
/// Contains all information about encountered radiation blockers.
///
-[Serializable, NetSerializable]
-public sealed class RadiationRay
+public struct RadiationRay(
+ MapId mapId,
+ EntityUid sourceUid,
+ Vector2 source,
+ EntityUid destinationUid,
+ Vector2 destination,
+ float rads)
{
///
/// Map on which source and receiver are placed.
///
- public MapId MapId;
+ public MapId MapId = mapId;
///
/// Uid of entity with .
///
- public NetEntity SourceUid;
+ public EntityUid SourceUid = sourceUid;
///
/// World coordinates of radiation source.
///
- public Vector2 Source;
+ public Vector2 Source = source;
///
/// Uid of entity with radiation receiver component.
///
- public NetEntity DestinationUid;
+ public EntityUid DestinationUid = destinationUid;
///
/// World coordinates of radiation receiver.
///
- public Vector2 Destination;
+ public Vector2 Destination = destination;
///
/// How many rads intensity reached radiation receiver.
///
- public float Rads;
+ public float Rads = rads;
///
/// Has rad ray reached destination or lost all intensity after blockers?
@@ -43,23 +48,27 @@ public sealed class RadiationRay
public bool ReachedDestination => Rads > 0;
///
- /// All blockers visited by gridcast. Key is uid of grid. Values are pairs
+ /// All blockers visited by gridcast, used for debug overlays. Key is uid of grid. Values are pairs
/// of tile indices and floats with updated radiation value.
///
///
/// Last tile may have negative value if ray has lost all intensity.
/// Grid traversal order isn't guaranteed.
///
- public Dictionary> Blockers = new();
+ public Dictionary>? Blockers;
+
+}
- public RadiationRay(MapId mapId, NetEntity sourceUid, Vector2 source,
- NetEntity destinationUid, Vector2 destination, float rads)
- {
- MapId = mapId;
- SourceUid = sourceUid;
- Source = source;
- DestinationUid = destinationUid;
- Destination = destination;
- Rads = rads;
- }
+// Variant of RadiationRay that uses NetEntities.
+[Serializable, NetSerializable]
+public readonly record struct DebugRadiationRay(
+ MapId MapId,
+ NetEntity SourceUid,
+ Vector2 Source,
+ NetEntity DestinationUid,
+ Vector2 Destination,
+ float Rads,
+ Dictionary> Blockers)
+{
+ public bool ReachedDestination => Rads > 0;
}
diff --git a/Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs b/Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs
index e75a18f011da..f096cfcb420f 100644
--- a/Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs
+++ b/Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs
@@ -40,13 +40,16 @@ public override bool Check(IEntityManager entManager,
var formattedRoleDiff = ContentLocalizationManager.FormatPlaytime(roleDiffSpan);
var departmentColor = Color.Yellow;
- if (entManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem))
- {
- var jobProto = jobSystem.GetJobPrototype(proto);
+ if (!entManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem))
+ return false;
- if (jobSystem.TryGetDepartment(jobProto, out var departmentProto))
- departmentColor = departmentProto.Color;
- }
+ var jobProto = jobSystem.GetJobPrototype(proto);
+
+ if (jobSystem.TryGetDepartment(jobProto, out var departmentProto))
+ departmentColor = departmentProto.Color;
+
+ if (!protoManager.TryIndex(jobProto, out var indexedJob))
+ return false;
if (!Inverted)
{
@@ -56,7 +59,7 @@ public override bool Check(IEntityManager entManager,
reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
"role-timer-role-insufficient",
("time", formattedRoleDiff),
- ("job", Loc.GetString(proto)),
+ ("job", indexedJob.LocalizedName),
("departmentColor", departmentColor.ToHex())));
return false;
}
@@ -66,7 +69,7 @@ public override bool Check(IEntityManager entManager,
reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
"role-timer-role-too-high",
("time", formattedRoleDiff),
- ("job", Loc.GetString(proto)),
+ ("job", indexedJob.LocalizedName),
("departmentColor", departmentColor.ToHex())));
return false;
}
diff --git a/Content.Shared/Silicons/Bots/EmaggableMedibotComponent.cs b/Content.Shared/Silicons/Bots/EmaggableMedibotComponent.cs
index 73775aaf91ac..0253cf12bc06 100644
--- a/Content.Shared/Silicons/Bots/EmaggableMedibotComponent.cs
+++ b/Content.Shared/Silicons/Bots/EmaggableMedibotComponent.cs
@@ -16,13 +16,4 @@ public sealed partial class EmaggableMedibotComponent : Component
///
[DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
public Dictionary Replacements = new();
-
- ///
- /// Sound to play when the bot has been emagged
- ///
- [DataField]
- public SoundSpecifier SparkSound = new SoundCollectionSpecifier("sparks")
- {
- Params = AudioParams.Default.WithVolume(8f)
- };
}
diff --git a/Content.Shared/Silicons/Bots/MedibotSystem.cs b/Content.Shared/Silicons/Bots/MedibotSystem.cs
index 3ab73149c08e..407e586eb1c8 100644
--- a/Content.Shared/Silicons/Bots/MedibotSystem.cs
+++ b/Content.Shared/Silicons/Bots/MedibotSystem.cs
@@ -1,6 +1,15 @@
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Damage;
+using Content.Shared.DoAfter;
+using Content.Shared.Emag.Components;
using Content.Shared.Emag.Systems;
+using Content.Shared.Interaction;
using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Content.Shared.NPC.Components;
+using Content.Shared.Popups;
using Robust.Shared.Audio.Systems;
+using Robust.Shared.Serialization;
using System.Diagnostics.CodeAnalysis;
namespace Content.Shared.Silicons.Bots;
@@ -11,20 +20,31 @@ namespace Content.Shared.Silicons.Bots;
public sealed class MedibotSystem : EntitySystem
{
[Dependency] private readonly SharedAudioSystem _audio = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
+ [Dependency] private SharedInteractionSystem _interaction = default!;
+ [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!;
+ [Dependency] private SharedPopupSystem _popup = default!;
+ [Dependency] private SharedDoAfterSystem _doAfter = default!;
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent(OnEmagged);
+ SubscribeLocalEvent(OnInteract);
+ SubscribeLocalEvent(OnInject);
}
private void OnEmagged(EntityUid uid, EmaggableMedibotComponent comp, ref GotEmaggedEvent args)
{
- if (!TryComp(uid, out var medibot))
+ if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+ return;
+
+ if (_emag.CheckFlag(uid, EmagType.Interaction))
return;
- _audio.PlayPredicted(comp.SparkSound, uid, args.UserUid);
+ if (!TryComp(uid, out var medibot))
+ return;
foreach (var (state, treatment) in comp.Replacements)
{
@@ -34,6 +54,25 @@ private void OnEmagged(EntityUid uid, EmaggableMedibotComponent comp, ref GotEma
args.Handled = true;
}
+ private void OnInteract(Entity medibot, ref UserActivateInWorldEvent args)
+ {
+ if (!CheckInjectable(medibot!, args.Target, true)) return;
+
+ _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, 2f, new MedibotInjectDoAfterEvent(), args.User, args.Target)
+ {
+ BlockDuplicate = true,
+ BreakOnMove = true,
+ });
+ }
+
+ private void OnInject(EntityUid uid, MedibotComponent comp, ref MedibotInjectDoAfterEvent args)
+ {
+ if (args.Cancelled) return;
+
+ if (args.Target is { } target)
+ TryInject(uid, target);
+ }
+
///
/// Get a treatment for a given mob state.
///
@@ -44,4 +83,66 @@ public bool TryGetTreatment(MedibotComponent comp, MobState state, [NotNullWhen(
{
return comp.Treatments.TryGetValue(state, out treatment);
}
+
+ ///
+ /// Checks if the target can be injected.
+ ///
+ public bool CheckInjectable(Entity medibot, EntityUid target, bool manual = false)
+ {
+ if (!Resolve(medibot, ref medibot.Comp, false)) return false;
+
+ if (HasComp(target))
+ {
+ _popup.PopupClient(Loc.GetString("medibot-recently-injected"), medibot, medibot);
+ return false;
+ }
+
+ if (!TryComp(target, out var mobState)) return false;
+ if (!TryComp(target, out var damageable)) return false;
+ if (!_solutionContainer.TryGetInjectableSolution(target, out _, out _)) return false;
+
+ if (mobState.CurrentState != MobState.Alive && mobState.CurrentState != MobState.Critical)
+ {
+ _popup.PopupClient(Loc.GetString("medibot-target-dead"), medibot, medibot);
+ return false;
+ }
+
+ var total = damageable.TotalDamage;
+ if (total == 0 && !HasComp(medibot))
+ {
+ _popup.PopupClient(Loc.GetString("medibot-target-healthy"), medibot, medibot);
+ return false;
+ }
+
+ if (!TryGetTreatment(medibot.Comp, mobState.CurrentState, out var treatment) || !treatment.IsValid(total) && !manual) return false;
+
+ return true;
+ }
+
+ ///
+ /// Tries to inject the target.
+ ///
+ public bool TryInject(Entity medibot, EntityUid target)
+ {
+ if (!Resolve(medibot, ref medibot.Comp, false)) return false;
+
+ if (!_interaction.InRangeUnobstructed(medibot.Owner, target)) return false;
+
+ if (!TryComp(target, out var mobState)) return false;
+ if (!TryGetTreatment(medibot.Comp, mobState.CurrentState, out var treatment)) return false;
+ if (!_solutionContainer.TryGetInjectableSolution(target, out var injectable, out _)) return false;
+
+ EnsureComp(target);
+ _solutionContainer.TryAddReagent(injectable.Value, treatment.Reagent, treatment.Quantity, out _);
+
+ _popup.PopupEntity(Loc.GetString("hypospray-component-feel-prick-message"), target, target);
+ _popup.PopupClient(Loc.GetString("medibot-target-injected"), medibot, medibot);
+
+ _audio.PlayPredicted(medibot.Comp.InjectSound, medibot, medibot);
+
+ return true;
+ }
}
+
+[Serializable, NetSerializable]
+public sealed partial class MedibotInjectDoAfterEvent : SimpleDoAfterEvent { }
diff --git a/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs
index 66f61e8064f9..2750011238da 100644
--- a/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs
+++ b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs
@@ -1,7 +1,10 @@
using Content.Shared.Emag.Systems;
+using Content.Shared.Mind;
using Content.Shared.Popups;
using Content.Shared.Silicons.Laws.Components;
+using Content.Shared.Stunnable;
using Content.Shared.Wires;
+using Robust.Shared.Audio;
namespace Content.Shared.Silicons.Laws;
@@ -11,23 +14,29 @@ namespace Content.Shared.Silicons.Laws;
public abstract partial class SharedSiliconLawSystem : EntitySystem
{
[Dependency] private readonly SharedPopupSystem _popup = default!;
+ [Dependency] private readonly SharedStunSystem _stunSystem = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
+ [Dependency] private readonly SharedMindSystem _mind = default!;
///
public override void Initialize()
{
InitializeUpdater();
SubscribeLocalEvent(OnGotEmagged);
- SubscribeLocalEvent(OnAttemptEmag);
- SubscribeLocalEvent(OnAttemptEmag);
}
- protected virtual void OnAttemptEmag(EntityUid uid, EmagSiliconLawComponent component, ref OnAttemptEmagEvent args)
+ private void OnGotEmagged(EntityUid uid, EmagSiliconLawComponent component, ref GotEmaggedEvent args)
{
- //prevent self emagging
+ if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+ return;
+
+ if (_emag.CheckFlag(uid, EmagType.Interaction))
+ return;
+
+ // prevent self-emagging
if (uid == args.UserUid)
{
_popup.PopupClient(Loc.GetString("law-emag-cannot-emag-self"), uid, args.UserUid);
- args.Handled = true;
return;
}
@@ -36,20 +45,33 @@ protected virtual void OnAttemptEmag(EntityUid uid, EmagSiliconLawComponent comp
!panel.Open)
{
_popup.PopupClient(Loc.GetString("law-emag-require-panel"), uid, args.UserUid);
- args.Handled = true;
+ return;
}
- }
+ var ev = new SiliconEmaggedEvent(args.UserUid);
+ RaiseLocalEvent(uid, ref ev);
- protected virtual void OnGotEmagged(EntityUid uid, EmagSiliconLawComponent component, ref GotEmaggedEvent args)
- {
component.OwnerName = Name(args.UserUid);
+
+ NotifyLawsChanged(uid, component.EmaggedSound);
+ if (_mind.TryGetMind(uid, out var mindId, out _))
+ EnsureSubvertedSiliconRole(mindId);
+
+ _stunSystem.TryParalyze(uid, component.StunTime, true);
+
args.Handled = true;
}
- protected virtual void OnAttemptEmag(EntityUid uid, SiliconLawProviderComponent component, ref OnAttemptEmagEvent args) ///imp special
+ protected virtual void NotifyLawsChanged(EntityUid uid, SoundSpecifier? cue = null)
+ {
+
+ }
+
+ protected virtual void EnsureSubvertedSiliconRole(EntityUid mindId)
{
- if (component.CanBeSubverted == false)
- args.Handled = true;
+
}
}
+
+[ByRefEvent]
+public record struct SiliconEmaggedEvent(EntityUid user);
diff --git a/Content.Shared/Singularity/EntitySystems/SharedSingularityGeneratorSystem.cs b/Content.Shared/Singularity/EntitySystems/SharedSingularityGeneratorSystem.cs
index ee6dc89bb847..331c1fa4ddb6 100644
--- a/Content.Shared/Singularity/EntitySystems/SharedSingularityGeneratorSystem.cs
+++ b/Content.Shared/Singularity/EntitySystems/SharedSingularityGeneratorSystem.cs
@@ -11,6 +11,7 @@ public abstract class SharedSingularityGeneratorSystem : EntitySystem
{
#region Dependencies
[Dependency] protected readonly SharedPopupSystem PopupSystem = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
#endregion Dependencies
public override void Initialize()
@@ -22,7 +23,16 @@ public override void Initialize()
private void OnEmagged(EntityUid uid, SingularityGeneratorComponent component, ref GotEmaggedEvent args)
{
+ if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+ return;
+
+ if (_emag.CheckFlag(uid, EmagType.Interaction))
+ return;
+
+ if (component.FailsafeDisabled)
+ return;
+
component.FailsafeDisabled = true;
args.Handled = true;
}
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Standing/StandingStateSystem.cs b/Content.Shared/Standing/StandingStateSystem.cs
index b2b35f2c69c4..3e622945a9bc 100644
--- a/Content.Shared/Standing/StandingStateSystem.cs
+++ b/Content.Shared/Standing/StandingStateSystem.cs
@@ -39,7 +39,7 @@ public bool Down(EntityUid uid,
StandingStateComponent? standingState = null,
AppearanceComponent? appearance = null,
HandsComponent? hands = null,
- bool intentional = true)
+ bool intentional = false)
{
// TODO: This should actually log missing comps...
if (!Resolve(uid, ref standingState, false))
diff --git a/Content.Shared/Traits/Assorted/PainNumbnessComponent.cs b/Content.Shared/Traits/Assorted/PainNumbnessComponent.cs
new file mode 100644
index 000000000000..9ae72c628673
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/PainNumbnessComponent.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Dataset;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Traits.Assorted;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class PainNumbnessComponent : Component
+{
+ ///
+ /// The fluent string prefix to use when picking a random suffix
+ /// This is only active for those who have the pain numbness component
+ ///
+ [DataField]
+ public ProtoId ForceSayNumbDataset = "ForceSayNumbDataset";
+}
diff --git a/Content.Shared/Traits/Assorted/PainNumbnessSystem.cs b/Content.Shared/Traits/Assorted/PainNumbnessSystem.cs
new file mode 100644
index 000000000000..3ded13300d98
--- /dev/null
+++ b/Content.Shared/Traits/Assorted/PainNumbnessSystem.cs
@@ -0,0 +1,46 @@
+using Content.Shared.Damage.Events;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Mobs.Events;
+using Content.Shared.Mobs.Systems;
+
+namespace Content.Shared.Traits.Assorted;
+
+public sealed class PainNumbnessSystem : EntitySystem
+{
+ [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!;
+
+ public override void Initialize()
+ {
+ SubscribeLocalEvent(OnComponentInit);
+ SubscribeLocalEvent(OnComponentRemove);
+ SubscribeLocalEvent(OnChangeForceSay);
+ SubscribeLocalEvent(OnAlertSeverityCheck);
+ }
+
+ private void OnComponentRemove(EntityUid uid, PainNumbnessComponent component, ComponentRemove args)
+ {
+ if (!HasComp(uid))
+ return;
+
+ _mobThresholdSystem.VerifyThresholds(uid);
+ }
+
+ private void OnComponentInit(EntityUid uid, PainNumbnessComponent component, ComponentInit args)
+ {
+ if (!HasComp(uid))
+ return;
+
+ _mobThresholdSystem.VerifyThresholds(uid);
+ }
+
+ private void OnChangeForceSay(Entity ent, ref BeforeForceSayEvent args)
+ {
+ args.Prefix = ent.Comp.ForceSayNumbDataset;
+ }
+
+ private void OnAlertSeverityCheck(Entity ent, ref BeforeAlertSeverityCheckEvent args)
+ {
+ if (args.CurrentAlert == "HumanHealth")
+ args.CancelUpdate = true;
+ }
+}
diff --git a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
index 94562ce8d1bf..c4f3eede2d29 100644
--- a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
+++ b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
@@ -2,6 +2,7 @@
using Robust.Shared.Prototypes;
using System.Linq;
using Content.Shared.DoAfter;
+using Content.Shared.Emag.Systems;
using Content.Shared.Interaction;
using Content.Shared.Popups;
using Robust.Shared.Audio;
@@ -19,11 +20,14 @@ public abstract partial class SharedVendingMachineSystem : EntitySystem
[Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
[Dependency] protected readonly SharedPopupSystem Popup = default!;
[Dependency] protected readonly IRobustRandom Randomizer = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent(OnMapInit);
+ SubscribeLocalEvent(OnEmagged);
+
SubscribeLocalEvent(OnAfterInteract);
}
@@ -49,9 +53,21 @@ public void RestockInventoryFromPrototype(EntityUid uid,
Dirty(uid, component);
}
+ private void OnEmagged(EntityUid uid, VendingMachineComponent component, ref GotEmaggedEvent args)
+ {
+ if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+ return;
+
+ if (_emag.CheckFlag(uid, EmagType.Interaction))
+ return;
+
+ // only emag if there are emag-only items
+ args.Handled = component.EmaggedInventory.Count > 0;
+ }
+
///
/// Returns all of the vending machine's inventory. Only includes emagged and contraband inventories if
- /// exists and is true
+ /// with the EmagType.Interaction flag exists and is true
/// are true respectively.
///
///
@@ -64,7 +80,7 @@ public List GetAllInventory(EntityUid uid, Vending
var inventory = new List(component.Inventory.Values);
- if (HasComp(uid))
+ if (_emag.CheckFlag(uid, EmagType.Interaction))
inventory.AddRange(component.EmaggedInventory.Values);
if (component.Contraband)
diff --git a/Content.Shared/Weapons/Melee/Components/MeleeRequiresWieldComponent.cs b/Content.Shared/Weapons/Melee/Components/MeleeRequiresWieldComponent.cs
index b322bbe51bce..ffa78ba42a20 100644
--- a/Content.Shared/Weapons/Melee/Components/MeleeRequiresWieldComponent.cs
+++ b/Content.Shared/Weapons/Melee/Components/MeleeRequiresWieldComponent.cs
@@ -6,7 +6,7 @@ namespace Content.Shared.Weapons.Melee.Components;
///
/// Indicates that this meleeweapon requires wielding to be useable.
///
-[RegisterComponent, NetworkedComponent, Access(typeof(WieldableSystem))]
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedWieldableSystem))]
public sealed partial class MeleeRequiresWieldComponent : Component
{
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 2f0bb500a44b..8452130a6bbb 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -731,7 +731,13 @@ protected HashSet ArcRayCast(Vector2 position, Angle angle, Angle arc
if (res.Count != 0)
{
- resSet.Add(res[0].HitEntity);
+ // If there's exact distance overlap, we simply have to deal with all overlapping objects to avoid selecting randomly.
+ var resChecked = res.Where(x => x.Distance.Equals(res[0].Distance));
+ foreach (var r in resChecked)
+ {
+ if (Interaction.InRangeUnobstructed(ignore, r.HitEntity, range + 0.1f, overlapCheck: false))
+ resSet.Add(r.HitEntity);
+ }
}
}
diff --git a/Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs
index 2016459b9d59..d5016c90e725 100644
--- a/Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs
@@ -7,7 +7,7 @@ namespace Content.Shared.Weapons.Ranged.Components;
/// Indicates that this gun requires wielding to be useable.
///
[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-[Access(typeof(WieldableSystem))]
+[Access(typeof(SharedWieldableSystem))]
public sealed partial class GunRequiresWieldComponent : Component
{
[DataField, AutoNetworkedField]
diff --git a/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs
index 522319ccbd33..bd2e9d4dd1e5 100644
--- a/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs
@@ -6,7 +6,7 @@ namespace Content.Shared.Weapons.Ranged.Components;
///
/// Applies an accuracy bonus upon wielding.
///
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(WieldableSystem))]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedWieldableSystem))]
public sealed partial class GunWieldBonusComponent : Component
{
[ViewVariables(VVAccess.ReadWrite), DataField("minAngle"), AutoNetworkedField]
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index 14e33a096680..d794118727cf 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -516,7 +516,7 @@ protected void MuzzleFlash(EntityUid gun, AmmoComponent component, Angle worldAn
return;
var ev = new MuzzleFlashEvent(GetNetEntity(gun), sprite, worldAngle);
- CreateEffect(gun, ev, gun);
+ CreateEffect(gun, ev, user);
}
public void CauseImpulse(EntityCoordinates fromCoordinates, EntityCoordinates toCoordinates, EntityUid user, PhysicsComponent userPhysics)
diff --git a/Content.Shared/Wieldable/Components/IncreaseDamageOnWieldComponent.cs b/Content.Shared/Wieldable/Components/IncreaseDamageOnWieldComponent.cs
index 3336923b024c..86afe1897b05 100644
--- a/Content.Shared/Wieldable/Components/IncreaseDamageOnWieldComponent.cs
+++ b/Content.Shared/Wieldable/Components/IncreaseDamageOnWieldComponent.cs
@@ -2,7 +2,7 @@
namespace Content.Shared.Wieldable.Components;
-[RegisterComponent, Access(typeof(WieldableSystem))]
+[RegisterComponent, Access(typeof(SharedWieldableSystem))]
public sealed partial class IncreaseDamageOnWieldComponent : Component
{
[DataField("damage", required: true)]
diff --git a/Content.Shared/Wieldable/Components/WieldableComponent.cs b/Content.Shared/Wieldable/Components/WieldableComponent.cs
index 5dc6abbbbea5..c146940b7a2c 100644
--- a/Content.Shared/Wieldable/Components/WieldableComponent.cs
+++ b/Content.Shared/Wieldable/Components/WieldableComponent.cs
@@ -7,7 +7,7 @@ namespace Content.Shared.Wieldable.Components;
///
/// Used for objects that can be wielded in two or more hands,
///
-[RegisterComponent, NetworkedComponent, Access(typeof(WieldableSystem)), AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedWieldableSystem)), AutoGenerateComponentState]
public sealed partial class WieldableComponent : Component
{
[DataField("wieldSound")]
diff --git a/Content.Shared/Wieldable/WieldableSystem.cs b/Content.Shared/Wieldable/SharedWieldableSystem.cs
similarity index 89%
rename from Content.Shared/Wieldable/WieldableSystem.cs
rename to Content.Shared/Wieldable/SharedWieldableSystem.cs
index 200a50d28f73..110c941dac73 100644
--- a/Content.Shared/Wieldable/WieldableSystem.cs
+++ b/Content.Shared/Wieldable/SharedWieldableSystem.cs
@@ -1,4 +1,5 @@
using System.Linq;
+using Content.Shared.Camera;
using Content.Shared.Examine;
using Content.Shared.Hands;
using Content.Shared.Hands.Components;
@@ -7,6 +8,8 @@
using Content.Shared.Interaction.Events;
using Content.Shared.Inventory.VirtualItem;
using Content.Shared.Item;
+using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Systems;
using Content.Shared.Popups;
using Content.Shared.Timing;
using Content.Shared.Verbs;
@@ -23,8 +26,9 @@
namespace Content.Shared.Wieldable;
-public sealed class WieldableSystem : EntitySystem
+public abstract class SharedWieldableSystem : EntitySystem
{
+ [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly INetManager _netManager = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
@@ -54,6 +58,9 @@ public override void Initialize()
SubscribeLocalEvent(OnGunUnwielded);
SubscribeLocalEvent(OnGunRefreshModifiers);
SubscribeLocalEvent(OnExamine);
+ SubscribeLocalEvent(OnSpeedModifierWielded);
+ SubscribeLocalEvent(OnSpeedModifierUnwielded);
+ SubscribeLocalEvent>(OnRefreshSpeedWielded);
SubscribeLocalEvent(OnGetMeleeDamage);
}
@@ -117,9 +124,29 @@ private void OnGunRefreshModifiers(Entity bonus, ref Gun
}
}
+ private void OnSpeedModifierWielded(EntityUid uid, SpeedModifiedOnWieldComponent component, ItemWieldedEvent args)
+ {
+ if (args.User != null)
+ _movementSpeedModifier.RefreshMovementSpeedModifiers(args.User);
+ }
+
+ private void OnSpeedModifierUnwielded(EntityUid uid, SpeedModifiedOnWieldComponent component, ItemUnwieldedEvent args)
+ {
+ if (args.User != null)
+ _movementSpeedModifier.RefreshMovementSpeedModifiers(args.User);
+ }
+
+ private void OnRefreshSpeedWielded(EntityUid uid, SpeedModifiedOnWieldComponent component, ref HeldRelayedEvent args)
+ {
+ if (TryComp(uid, out var wield) && wield.Wielded)
+ {
+ args.Args.ModifySpeed(component.WalkModifier, component.SprintModifier);
+ }
+ }
+
private void OnExamineRequires(Entity entity, ref ExaminedEvent args)
{
- if(entity.Comp.WieldRequiresExamineMessage != null)
+ if (entity.Comp.WieldRequiresExamineMessage != null)
args.PushText(Loc.GetString(entity.Comp.WieldRequiresExamineMessage));
}
diff --git a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs
index da253ba80afc..2d7d86822f9e 100644
--- a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs
+++ b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs
@@ -14,6 +14,7 @@ public abstract class SharedArtifactCrusherSystem : EntitySystem
[Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
[Dependency] protected readonly SharedAudioSystem AudioSystem = default!;
[Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
+ [Dependency] private readonly EmagSystem _emag = default!;
///
public override void Initialize()
@@ -40,6 +41,15 @@ private void OnStorageAfterOpen(Entity ent, ref Storag
private void OnEmagged(Entity ent, ref GotEmaggedEvent args)
{
+ if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+ return;
+
+ if (_emag.CheckFlag(ent, EmagType.Interaction))
+ return;
+
+ if (ent.Comp.AutoLock)
+ return;
+
ent.Comp.AutoLock = true;
args.Handled = true;
}
diff --git a/Content.Shared/_Goobstation/Changeling/FakeMindshield/FakeMindShieldComponent.cs b/Content.Shared/_Goobstation/Changeling/FakeMindshield/FakeMindShieldComponent.cs
deleted file mode 100644
index 0999df11cfc8..000000000000
--- a/Content.Shared/_Goobstation/Changeling/FakeMindshield/FakeMindShieldComponent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Robust.Shared.GameStates;
-using Content.Shared.StatusIcon;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._Goobstation.FakeMindshield.Components;
-
-///
-/// A fake Mindshield solely to trick HUDs, with no other effects.
-///
-[RegisterComponent, NetworkedComponent]
-public sealed partial class FakeMindShieldComponent : Component
-{
- [DataField, ViewVariables(VVAccess.ReadWrite)]
- public ProtoId MindShieldStatusIcon = "MindShieldIcon";
-}
diff --git a/Content.Shared/_Goobstation/Changeling/FakeMindshield/ShowFakeMindShieldIconsComponent.cs b/Content.Shared/_Goobstation/Changeling/FakeMindshield/ShowFakeMindShieldIconsComponent.cs
deleted file mode 100644
index b18a92d2de3e..000000000000
--- a/Content.Shared/_Goobstation/Changeling/FakeMindshield/ShowFakeMindShieldIconsComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Goobstation.Overlays;
-
-///
-/// This component allows you to see fake mindshield icons above mobs.
-///
-[RegisterComponent, NetworkedComponent]
-public sealed partial class ShowFakeMindShieldIconsComponent : Component { }
diff --git a/Content.Shared/_Impstation/Fishing/FishingProjectileComponent.cs b/Content.Shared/_Impstation/Fishing/FishingProjectileComponent.cs
new file mode 100644
index 000000000000..3d76ca745bb4
--- /dev/null
+++ b/Content.Shared/_Impstation/Fishing/FishingProjectileComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._Impstation.Fishing;
+
+[RegisterComponent, NetworkedComponent]
+//Imp : Basically a copy of GrapplingProjectileComponent
+public sealed partial class FishingProjectileComponent : Component
+{
+
+}
diff --git a/Content.Shared/_Impstation/Fishing/FishingRodComponent.cs b/Content.Shared/_Impstation/Fishing/FishingRodComponent.cs
new file mode 100644
index 000000000000..da39e3386dd0
--- /dev/null
+++ b/Content.Shared/_Impstation/Fishing/FishingRodComponent.cs
@@ -0,0 +1,41 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Utility;
+
+namespace Content.Shared._Impstation.Fishing;
+
+// I have tried to make this as generic as possible but "delete joint on cycle / right-click reels in" is very specific behavior.
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+//Imp : Basically a copy of GrapplingGunComponent
+public sealed partial class FishingRodComponent : Component
+{
+ ///
+ /// Hook's reeling force and speed - the higher the number, the faster the hook rewinds.
+ ///
+ [DataField, AutoNetworkedField]
+ public float ReelRate = 2.5f;
+
+ [DataField("jointId"), AutoNetworkedField]
+ public string Joint = string.Empty;
+
+ [DataField, AutoNetworkedField]
+ public EntityUid? Projectile;
+
+ [DataField, AutoNetworkedField]
+ public bool Reeling;
+
+ [DataField, AutoNetworkedField]
+ public SoundSpecifier? ReelSound = new SoundPathSpecifier("/Audio/Weapons/reel.ogg")
+ {
+ Params = AudioParams.Default.WithLoop(true)
+ };
+
+ [DataField, AutoNetworkedField]
+ public SoundSpecifier? CycleSound = new SoundPathSpecifier("/Audio/Weapons/Guns/MagIn/kinetic_reload.ogg");
+
+ [DataField]
+ public SpriteSpecifier RopeSprite =
+ new SpriteSpecifier.Rsi(new ResPath("Objects/Weapons/Guns/Launchers/grappling_gun.rsi"), "rope");
+
+ public EntityUid? Stream;
+}
diff --git a/Content.Shared/_Impstation/Fishing/SharedFishingSystem.cs b/Content.Shared/_Impstation/Fishing/SharedFishingSystem.cs
new file mode 100644
index 000000000000..373de7e86e2f
--- /dev/null
+++ b/Content.Shared/_Impstation/Fishing/SharedFishingSystem.cs
@@ -0,0 +1,246 @@
+using System.Numerics;
+using Content.Shared.CombatMode;
+using Content.Shared.Hands;
+using Content.Shared.Hands.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Movement.Events;
+using Content.Shared.Physics;
+using Content.Shared.Projectiles;
+using Content.Shared.Weapons.Misc;
+using Content.Shared.Weapons.Ranged.Systems;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Dynamics.Joints;
+using Robust.Shared.Physics.Systems;
+using Robust.Shared.Serialization;
+using Robust.Shared.Timing;
+
+namespace Content.Shared._Impstation.Fishing;
+
+//Imp : Basically a copy of GrapplingGunSystem
+public abstract class SharedFishingRodSystem : EntitySystem
+{
+ [Dependency] protected readonly IGameTiming Timing = default!;
+ [Dependency] private readonly INetManager _netManager = default!;
+ [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+ [Dependency] private readonly SharedAudioSystem _audio = default!;
+ [Dependency] private readonly SharedJointSystem _joints = default!;
+ [Dependency] private readonly SharedGunSystem _gun = default!;
+ [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+
+ public const string GrapplingJoint = "grappling";
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnWeightlessMove);
+ SubscribeAllEvent(OnGrapplingReel);
+
+ SubscribeLocalEvent(OnGrapplingShot);
+ SubscribeLocalEvent(OnGunActivate);
+ SubscribeLocalEvent(OnGrapplingDeselected);
+
+ SubscribeLocalEvent(OnGrappleCollide);
+ SubscribeLocalEvent(OnGrappleJointRemoved);
+ SubscribeLocalEvent(OnRemoveEmbed);
+ }
+
+ private void OnGrappleJointRemoved(EntityUid uid, FishingProjectileComponent component, JointRemovedEvent args)
+ {
+ if (_netManager.IsServer)
+ QueueDel(uid);
+ }
+
+ private void OnGrapplingShot(EntityUid uid, FishingRodComponent component, ref GunShotEvent args)
+ {
+ foreach (var (shotUid, _) in args.Ammo)
+ {
+ if (!HasComp(shotUid))
+ continue;
+
+ //todo: this doesn't actually support multigrapple
+ // At least show the visuals.
+ component.Projectile = shotUid.Value;
+ Dirty(uid, component);
+ var visuals = EnsureComp(shotUid.Value);
+ visuals.Sprite = component.RopeSprite;
+ visuals.OffsetA = new Vector2(0f, 0.5f);
+ visuals.Target = GetNetEntity(uid);
+ Dirty(shotUid.Value, visuals);
+ }
+
+ TryComp(uid, out var appearance);
+ _appearance.SetData(uid, SharedTetherGunSystem.TetherVisualsStatus.Key, false, appearance);
+ Dirty(uid, component);
+ }
+
+ private void OnGrapplingDeselected(EntityUid uid, FishingRodComponent component, HandDeselectedEvent args)
+ {
+ SetReeling(uid, component, false, args.User);
+ }
+
+ private void OnGrapplingReel(RequestGrapplingReelMessage msg, EntitySessionEventArgs args)
+ {
+ var player = args.SenderSession.AttachedEntity;
+ if (!TryComp(player, out var hands) ||
+ !TryComp(hands.ActiveHandEntity, out var grappling))
+ {
+ return;
+ }
+
+ if (msg.Reeling &&
+ (!TryComp(player, out var combatMode) ||
+ !combatMode.IsInCombatMode))
+ {
+ return;
+ }
+
+ SetReeling(hands.ActiveHandEntity.Value, grappling, msg.Reeling, player.Value);
+ }
+
+ private void OnWeightlessMove(ref CanWeightlessMoveEvent ev)
+ {
+ if (ev.CanMove || !TryComp(ev.Uid, out var relayComp))
+ return;
+
+ foreach (var relay in relayComp.Relayed)
+ {
+ if (TryComp(relay, out var jointRelay) && jointRelay.GetJoints.ContainsKey(GrapplingJoint))
+ {
+ ev.CanMove = true;
+ return;
+ }
+ }
+ }
+
+ private void OnGunActivate(EntityUid uid, FishingRodComponent component, ActivateInWorldEvent args)
+ {
+ if (!Timing.IsFirstTimePredicted || args.Handled || !args.Complex || component.Projectile is not {} projectile)
+ return;
+
+ _audio.PlayPredicted(component.CycleSound, uid, args.User);
+ _appearance.SetData(uid, SharedTetherGunSystem.TetherVisualsStatus.Key, true);
+
+ if (_netManager.IsServer)
+ QueueDel(projectile);
+
+ component.Projectile = null;
+ SetReeling(uid, component, false, args.User);
+ _gun.ChangeBasicEntityAmmoCount(uid, 1);
+
+ _joints.RemoveJoint(uid, GrapplingJoint);
+
+ args.Handled = true;
+ }
+
+ private void SetReeling(EntityUid uid, FishingRodComponent component, bool value, EntityUid? user)
+ {
+ if (component.Reeling == value)
+ return;
+
+ if (value)
+ {
+ if (Timing.IsFirstTimePredicted)
+ component.Stream = _audio.PlayPredicted(component.ReelSound, uid, user)?.Entity;
+ }
+ else
+ {
+ if (Timing.IsFirstTimePredicted)
+ {
+ component.Stream = _audio.Stop(component.Stream);
+ }
+ }
+
+ component.Reeling = value;
+ Dirty(uid, component);
+ }
+
+ public override void Update(float frameTime)
+ {
+ base.Update(frameTime);
+
+ var query = EntityQueryEnumerator();
+
+ while (query.MoveNext(out var uid, out var grappling))
+ {
+ if (!grappling.Reeling)
+ {
+ if (Timing.IsFirstTimePredicted)
+ {
+ // Just in case.
+ grappling.Stream = _audio.Stop(grappling.Stream);
+ }
+
+ continue;
+ }
+
+ if (!TryComp(uid, out var jointComp) ||
+ !jointComp.GetJoints.TryGetValue(GrapplingJoint, out var joint) ||
+ joint is not DistanceJoint distance)
+ {
+ SetReeling(uid, grappling, false, null);
+ continue;
+ }
+
+ // TODO: This should be on engine.
+ distance.MaxLength = MathF.Max(distance.MinLength, distance.MaxLength - grappling.ReelRate * frameTime);
+ distance.Length = MathF.Min(distance.MaxLength, distance.Length);
+
+ _physics.WakeBody(joint.BodyAUid);
+ _physics.WakeBody(joint.BodyBUid);
+
+ if (jointComp.Relay != null)
+ {
+ _physics.WakeBody(jointComp.Relay.Value);
+ }
+
+ Dirty(uid, jointComp);
+
+ if (distance.MaxLength.Equals(distance.MinLength))
+ {
+ SetReeling(uid, grappling, false, null);
+ }
+ }
+ }
+
+ private void OnGrappleCollide(EntityUid uid, FishingProjectileComponent component, ref ProjectileEmbedEvent args)
+ {
+ if (!Timing.IsFirstTimePredicted)
+ return;
+
+ //joint between the embedded and the weapon
+ var jointComp = EnsureComp(args.Weapon);
+ var joint = _joints.CreateDistanceJoint(args.Weapon, args.Embedded, anchorA: new Vector2(0f, 0.5f), id: GrapplingJoint);
+ joint.MaxLength = joint.Length + 0.2f;
+ joint.Stiffness = 1f;
+ joint.MinLength = 0.35f;
+ // Setting velocity directly for mob movement fucks this so need to make them aware of it.
+ // joint.Breakpoint = 4000f;
+ Dirty(args.Weapon, jointComp);
+ }
+
+ private void OnRemoveEmbed(EntityUid uid, FishingProjectileComponent component, RemoveEmbedEvent args)
+ {
+ if (TryComp(uid, out var projectile))
+ {
+ if (projectile.EmbeddedIntoUid != null)
+ {
+ _joints.ClearJoints(projectile.EmbeddedIntoUid.Value);
+ }
+ }
+ }
+
+ [Serializable, NetSerializable]
+ protected sealed class RequestGrapplingReelMessage : EntityEventArgs
+ {
+ public bool Reeling;
+
+ public RequestGrapplingReelMessage(bool reeling)
+ {
+ Reeling = reeling;
+ }
+ }
+}
diff --git a/Content.Shared/_Impstation/Thaven/SharedThavenMoodSystem.cs b/Content.Shared/_Impstation/Thaven/SharedThavenMoodSystem.cs
index 1a1228c78f46..0e3818f7f633 100644
--- a/Content.Shared/_Impstation/Thaven/SharedThavenMoodSystem.cs
+++ b/Content.Shared/_Impstation/Thaven/SharedThavenMoodSystem.cs
@@ -5,22 +5,25 @@ namespace Content.Shared._Impstation.Thaven;
public abstract class SharedThavenMoodSystem : EntitySystem
{
+ [Dependency] private readonly EmagSystem _emag = default!;
+
public override void Initialize()
{
base.Initialize();
-
- SubscribeLocalEvent(OnAttemptEmag);
SubscribeLocalEvent(OnEmagged);
}
- private void OnAttemptEmag(EntityUid uid, ThavenMoodsComponent comp, ref OnAttemptEmagEvent args)
- {
- if (!comp.CanBeEmagged)
- args.Handled = true;
- }
-
protected virtual void OnEmagged(EntityUid uid, ThavenMoodsComponent comp, ref GotEmaggedEvent args)
{
+ if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+ return;
+
+ if (_emag.CheckFlag(uid, EmagType.Interaction))
+ return;
+
+ if (uid == args.UserUid)
+ return;
+
args.Handled = true;
}
}
diff --git a/Content.Tests/Shared/Atmos/GasMixtureTest.cs b/Content.Tests/Shared/Atmos/GasMixtureTest.cs
new file mode 100644
index 000000000000..5068d4858176
--- /dev/null
+++ b/Content.Tests/Shared/Atmos/GasMixtureTest.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Atmos;
+using NUnit.Framework;
+
+namespace Content.Tests.Shared.Atmos;
+
+[TestFixture, TestOf(typeof(GasMixture))]
+[Parallelizable(ParallelScope.All)]
+public sealed class GasMixtureTest
+{
+ [Test]
+ public void TestEnumerate()
+ {
+ var mixture = new GasMixture();
+ mixture.SetMoles(Gas.Oxygen, 20);
+ mixture.SetMoles(Gas.Nitrogen, 10);
+ mixture.SetMoles(Gas.Plasma, 80);
+
+ var expectedList = new (Gas, float)[Atmospherics.TotalNumberOfGases];
+ for (var i = 0; i < Atmospherics.TotalNumberOfGases; i++)
+ {
+ expectedList[i].Item1 = (Gas)i;
+ }
+
+ expectedList[(int)Gas.Oxygen].Item2 = 20f;
+ expectedList[(int)Gas.Nitrogen].Item2 = 10f;
+ expectedList[(int)Gas.Plasma].Item2 = 80f;
+
+ Assert.That(mixture, Is.EquivalentTo(expectedList));
+ }
+}
diff --git a/Resources/Audio/Weapons/Guns/Empty/empty.ogg b/Resources/Audio/Weapons/Guns/Empty/empty.ogg
index 817d72e0ed0e..920b49ed08c4 100644
Binary files a/Resources/Audio/Weapons/Guns/Empty/empty.ogg and b/Resources/Audio/Weapons/Guns/Empty/empty.ogg differ
diff --git a/Resources/Audio/Weapons/Guns/sources.json b/Resources/Audio/Weapons/Guns/sources.json
index 5169aadb3a3c..cc9a3e5c0b2b 100644
--- a/Resources/Audio/Weapons/Guns/sources.json
+++ b/Resources/Audio/Weapons/Guns/sources.json
@@ -12,7 +12,7 @@
"sfrifle_cock.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/sfrifle_cock.ogg"
},
"Empty": {
- "empty.ogg": "https://github.com/discordia-space/CEV-Eris/blob/fbde37a8647a82587d363da999a94cf02c2e128c/sound/weapons/guns/misc/gun_empty.ogg",
+ "empty.ogg": "https://github.com/tgstation/tgstation/commit/d4f678a1772007ff8d7eddd21cf7218c8e07bfc0",
"lmg_empty.ogg": "https://github.com/vgstation-coders/vgstation13/blob/217aa33a41e891e144ceec710fbe1877df747adb/sound/weapons/empty.ogg"
},
"EmptyAlarm": {
@@ -59,4 +59,4 @@
"sfrifle_magout.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/sfrifle_magout.ogg",
"smg_magout.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/smg_magout.ogg"
}
-}
\ No newline at end of file
+}
diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index b8694a8d6726..440a5d567aae 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -721,5 +721,21 @@ Entries:
id: 89
time: '2025-01-15T21:10:54.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/34406
+- author: c4llv07e
+ changes:
+ - message: Added an option to disable the bwoink sound!
+ type: Add
+ id: 90
+ time: '2025-01-17T07:24:50.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/33782
+- author: PJB3005
+ changes:
+ - message: Introduced an option to automatically disconnect players from their current
+ server if they join another one within the same server community. Admins are
+ always exempt.
+ type: Add
+ id: 91
+ time: '2025-01-21T23:23:47.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34563
Name: Admin
Order: 1
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index bed04aa9ff5d..d9d4a87fbbce 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,498 +1,4 @@
Entries:
-- author: slarticodefast
- changes:
- - message: Revenants or other mobs without hands can no longer spill jugs.
- type: Fix
- id: 7321
- time: '2024-09-09T11:02:15.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31438
-- author: PJB3005
- changes:
- - message: The emergency shuttle will now wait at the station longer if it couldn't
- dock at evac.
- type: Tweak
- id: 7322
- time: '2024-09-09T18:10:28.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31496
-- author: Boaz1111
- changes:
- - message: Pacifists can now use grapple guns.
- type: Tweak
- id: 7323
- time: '2024-09-09T19:15:32.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32014
-- author: lzk228
- changes:
- - message: All bots are available for disguise with the Chameleon Ppotlight
- type: Tweak
- id: 7324
- time: '2024-09-09T19:18:01.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32006
-- author: DieselMohawk
- changes:
- - message: Added Security Trooper Uniform
- type: Add
- id: 7325
- time: '2024-09-09T19:19:16.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31997
-- author: qwerltaz
- changes:
- - message: Dragon ghost role now spawns outside the station.
- type: Tweak
- - message: Dragon ghost role now spawns where advertised!
- type: Fix
- id: 7326
- time: '2024-09-09T19:22:41.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31890
-- author: yuitop
- changes:
- - message: Fixed some cases when surveillance camera's red light not turning off
- when needed
- type: Fix
- id: 7327
- time: '2024-09-09T19:23:57.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31831
-- author: Blackern5000
- changes:
- - message: Normal and reinforced windows have been made directly upgradable using
- rods, plasma, uranium, or plasteel.
- type: Add
- - message: Reinforced plasma and uranium windows have been made tougher.
- type: Tweak
- - message: Windows have been made to correctly display their damage visuals.
- type: Fix
- - message: Reinforced plasma windows have been given the correct amount of hp and
- no longer have 12x the amount they should.
- type: Fix
- id: 7328
- time: '2024-09-09T19:26:10.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31978
-- author: Cojoke-dot
- changes:
- - message: Nuclear bombs now require the Nuclear Authentification Disk to toggle
- anchor.
- type: Tweak
- id: 7329
- time: '2024-09-09T19:30:26.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/29565
-- author: Hreno
- changes:
- - message: Display agents' jobs in the Round End Summary window.
- type: Add
- id: 7330
- time: '2024-09-09T19:31:53.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31652
-- author: deltanedas
- changes:
- - message: Adjusted the costs and production times of all electronics so they're
- more consistent with eachother.
- type: Tweak
- id: 7331
- time: '2024-09-09T19:34:18.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31524
-- author: Winkarst-cpu
- changes:
- - message: Now fire axe (the flaming one), and an advanced circular saw are Syndicate
- contraband.
- type: Fix
- - message: Now encryption keys are restricted according to their department.
- type: Fix
- - message: Now ERT, Deathsquad and Central Command Official items are restricted
- to the Central Command.
- type: Fix
- - message: Now acolyte armor, a thieving beacon and the thief's undetermined toolbox
- are minor contraband.
- type: Fix
- - message: Now bladed flatcaps are not a contraband (stealth item).
- type: Fix
- - message: Now mercenary clothes, magazines, speedloaders and cartridges are contraband.
- type: Fix
- - message: Now cleanades are restricted to the Service.
- type: Fix
- - message: Now metal foam grenades are restricted to the Engineering.
- type: Fix
- - message: Now flash, smoke, and tear gas grenades are restricted to the Security.
- type: Fix
- - message: Now combat gloves are restricted to Security and Cargo.
- type: Fix
- - message: The Central Command restricted contraband group and department were added.
- type: Add
- id: 7332
- time: '2024-09-09T19:36:25.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31606
-- author: themias
- changes:
- - message: Unpublished news article progress is automatically saved
- type: Tweak
- id: 7333
- time: '2024-09-09T19:38:49.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31491
-- author: metalgearsloth
- changes:
- - message: Fix spawn prefs.
- type: Fix
- id: 7334
- time: '2024-09-09T19:39:16.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31892
-- author: lzk228
- changes:
- - message: The captain now have special late join message.
- type: Tweak
- id: 7335
- time: '2024-09-09T19:57:37.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31991
-- author: Thinbug0
- changes:
- - message: Teal gloves can now be found at the ClothesMate!
- type: Add
- id: 7336
- time: '2024-09-09T21:47:53.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31865
-- author: chillyconmor
- changes:
- - message: Space Ninjas now have a new intro song.
- type: Add
- id: 7337
- time: '2024-09-09T22:12:25.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31055
-- author: DieselMohawk
- changes:
- - message: Made Trooper Uniform accessible for Security Officers in loadouts
- type: Fix
- id: 7338
- time: '2024-09-09T23:59:31.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32019
-- author: IProduceWidgets
- changes:
- - message: Visitors now can have the correct Id cards and PDA!
- type: Fix
- - message: ghost roles should now attempt to tell you what your antag status is
- in a popup when you join the raffle.
- type: Tweak
- - message: ERT chaplains should now be able to use bibles.
- type: Fix
- - message: Many new unknown shuttle events to make them more unique.
- type: Add
- - message: Syndicate escape pods will once again appear.
- type: Fix
- - message: Unknown Shuttle events will be much rarer.
- type: Tweak
- id: 7339
- time: '2024-09-10T06:40:00.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/28098
-- author: ScarKy0
- changes:
- - message: Renamed Circuit Boards to be Law Boards instead.
- type: Tweak
- id: 7340
- time: '2024-09-10T10:27:42.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31914
-- author: ScarKy0
- changes:
- - message: Arrival Screens now show time again.
- type: Fix
- id: 7341
- time: '2024-09-10T19:08:22.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32037
-- author: themias
- changes:
- - message: The Justice Helm can now only be crafted using a security helmet.
- type: Fix
- id: 7342
- time: '2024-09-10T19:08:37.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32042
-- author: TurboTrackerss14
- changes:
- - message: Gas tank explosions ("max caps") have a reduced range on WizDen servers
- until they can be reworked into a proper game mechanic.
- type: Remove
- id: 7343
- time: '2024-09-10T22:05:12.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31437
-- author: Boaz1111
- changes:
- - message: Researching Advanced Atmospherics now requires Atmospherics to be researched.
- type: Tweak
- id: 7344
- time: '2024-09-10T22:19:17.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32048
-- author: DiposableCrewmember42
- changes:
- - message: Fixed Revenant ability cost checks. Revenants can no longer spam abilities
- without Essence.
- type: Fix
- id: 7345
- time: '2024-09-10T23:07:07.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32050
-- author: ArtisticRoomba
- changes:
- - message: The salvage magnet circuitboard has been added to QM's locker. It can
- also be made at the circuit imprinter roundstart. NOW GET BACK TO WORK!!!
- type: Tweak
- id: 7346
- time: '2024-09-10T23:25:22.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31996
-- author: Lank
- changes:
- - message: Several antagonist shuttle events have been removed.
- type: Remove
- id: 7347
- time: '2024-09-10T23:26:59.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32052
-- author: Vermidia
- changes:
- - message: Borgs and other creatures that shouldn't get hurt stepping on things
- no longer get hurt stepping on things.
- type: Fix
- - message: Honkbots slip again
- type: Fix
- id: 7348
- time: '2024-09-11T02:12:08.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31011
-- author: EmoGarbage404
- changes:
- - message: The mining asteroid now generates small structures full of treasure and
- equipment. Keep an eye open for them, nestled within the rock.
- type: Add
- id: 7349
- time: '2024-09-11T03:33:42.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31638
-- author: SlamBamActionman
- changes:
- - message: The Station AI job is no longer affected by the Bureaucratic Event event.
- type: Fix
- id: 7350
- time: '2024-09-11T11:24:24.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32021
-- author: K-Dynamic
- changes:
- - message: Reduced canister prices from 1000 to 200 spesos
- type: Tweak
- id: 7351
- time: '2024-09-11T12:53:51.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31965
-- author: EmoGarbage404
- changes:
- - message: Added the hivelord! This self-replicating alien is found on the mining
- asteroid. It's core is known to have powerful healing properties.
- type: Add
- id: 7352
- time: '2024-09-11T13:52:27.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31322
-- author: PeccNeck
- changes:
- - message: Fixed a bug where ore processors could not produce reinforced glass
- type: Fix
- id: 7353
- time: '2024-09-11T14:06:08.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32069
-- author: Plykiya
- changes:
- - message: You can now use swords to make baseball bats.
- type: Fix
- id: 7354
- time: '2024-09-11T14:45:00.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32075
-- author: Plykiya
- changes:
- - message: Banners are no longer invincible.
- type: Fix
- id: 7355
- time: '2024-09-11T15:29:23.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32077
-- author: themias
- changes:
- - message: Very small amounts of heat damage no longer play the cauterization sound
- (e.g. spacing)
- type: Fix
- id: 7356
- time: '2024-09-11T16:05:54.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32080
-- author: deltanedas
- changes:
- - message: Coins and Supercharged CPUs can now be recycled for rarer materials.
- type: Tweak
- id: 7357
- time: '2024-09-11T16:24:16.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31970
-- author: lzk228
- changes:
- - message: Fixed forensic pad didn't care about target identity.
- type: Fix
- - message: Instead of name changing, forensic pad now will have a label with target's
- name.
- type: Tweak
- id: 7358
- time: '2024-09-12T00:52:19.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31842
-- author: lzk228
- changes:
- - message: Borgs and Station AI will not receive selected in preferences traits.
- type: Tweak
- id: 7359
- time: '2024-09-12T10:36:41.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31990
-- author: MrRobDemo
- changes:
- - message: Added 5% chance to make killer tomatoes a ghost role.
- type: Add
- - message: Killer tomatoes can now heal from being splashed with water, blood or
- RobustHarvest.
- type: Add
- - message: Killer tomatoes can now escape from inventory (only intelligent).
- type: Tweak
- id: 7360
- time: '2024-09-12T12:51:41.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31932
-- author: ScarKy0
- changes:
- - message: Station AI now has a comms console ability.
- type: Add
- - message: Station AI abilities now have a default order.
- type: Tweak
- id: 7361
- time: '2024-09-12T15:28:54.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31852
-- author: themias
- changes:
- - message: Fixed medical PDAs sometimes toggling their lights while scanning
- type: Fix
- id: 7362
- time: '2024-09-13T13:59:19.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32091
-- author: Gorox221
- changes:
- - message: Mech pilots receive a warning before they are ejected from the mech.
- type: Tweak
- - message: Now, when removing the pilot of the mech, you need to not move.
- type: Fix
- id: 7363
- time: '2024-09-13T14:01:26.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31649
-- author: slarticodefast
- changes:
- - message: Extradimensional orange, holymelon, meatwheat and world peas plant mutations
- have been added. Obtain them by mutating oranges, watermelons, wheat and laughin'
- peas respectively.
- type: Add
- id: 7364
- time: '2024-09-13T14:02:54.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/27624
-- author: ShadowCommander
- changes:
- - message: Fixed PDA sometimes showing uplink and music buttons when the PDA was
- not able to use them.
- type: Fix
- id: 7365
- time: '2024-09-13T14:19:32.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/28373
-- author: Dezzzix
- changes:
- - message: Now you can wear a hood in void cloak
- type: Add
- id: 7366
- time: '2024-09-13T15:02:45.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31061
-- author: PJB3005
- changes:
- - message: Fixed some powered machines working when unpowered if the panel is open.
- type: Fix
- id: 7367
- time: '2024-09-13T23:58:54.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32135
-- author: qwerltaz
- changes:
- - message: The RCD can now place grilles and windows under shutters and cables under
- doors.
- type: Fix
- id: 7368
- time: '2024-09-14T01:53:14.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32102
-- author: SlamBamActionman
- changes:
- - message: Briefcases can now be used as melee weapons.
- type: Add
- id: 7369
- time: '2024-09-14T13:09:43.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32063
-- author: Just_Art
- changes:
- - message: Added a head gauze to customization.
- type: Add
- id: 7370
- time: '2024-09-14T14:55:13.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/30852
-- author: deltanedas
- changes:
- - message: Fixed security's helmets not having any protection.
- type: Fix
- id: 7371
- time: '2024-09-14T15:56:57.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32152
-- author: eoineoineoin
- changes:
- - message: Ghosts can now read books.
- type: Add
- id: 7372
- time: '2024-09-14T16:28:33.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32151
-- author: Errant
- changes:
- - message: Lone Ops nukies now spawn with the appropriate species-specific survival
- gear.
- type: Fix
- id: 7373
- time: '2024-09-14T16:34:01.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/31641
-- author: Plykiya
- changes:
- - message: The vent spawn event now has a chance to spawn snakes.
- type: Add
- id: 7374
- time: '2024-09-14T17:19:32.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32070
-- author: lzk228
- changes:
- - message: Command intercom now reinforced the same way as the security one.
- type: Tweak
- id: 7375
- time: '2024-09-14T20:40:38.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32169
-- author: de0rix
- changes:
- - message: Animals in critical state now all have proper sprites.
- type: Fix
- id: 7376
- time: '2024-09-15T01:53:58.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32175
-- author: notafet
- changes:
- - message: Pressure and volume pumps now require power to operate.
- type: Tweak
- id: 7377
- time: '2024-09-15T01:58:10.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/28995
-- author: deltanedas
- changes:
- - message: Holoparasites can no longer be summoned from inside containers.
- type: Tweak
- id: 7378
- time: '2024-09-15T19:04:32.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32068
-- author: BackeTako
- changes:
- - message: Added French and Spanish speech traits.
- type: Add
- id: 7379
- time: '2024-09-15T20:03:15.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/30966
-- author: Plykiya
- changes:
- - message: Meteors break through less walls now.
- type: Tweak
- id: 7380
- time: '2024-09-15T20:04:37.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/32109
- author: drakewill-CRL
changes:
- message: Produce harvested from sentient plants are no longer sentient themselves.
@@ -3922,3 +3428,483 @@
id: 7820
time: '2025-01-16T12:25:08.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/33690
+- author: Southbridge
+ changes:
+ - message: More Ionstorm law elements have been added
+ type: Add
+ id: 7821
+ time: '2025-01-16T20:49:47.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34197
+- author: southbridge-fur
+ changes:
+ - message: Pride-O-Mats now have scarves instead of cloaks
+ type: Tweak
+ id: 7822
+ time: '2025-01-17T11:35:03.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34448
+- author: Toby222
+ changes:
+ - message: Update nix flake to use current nixpkgs release
+ type: Fix
+ id: 7823
+ time: '2025-01-17T17:26:04.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34480
+- author: ArtisticRoomba, miamioni
+ changes:
+ - message: The Space Lizard plushie can now be worn on top of your head.
+ type: Add
+ id: 7824
+ time: '2025-01-18T09:02:40.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/33809
+- author: Spacemann
+ changes:
+ - message: Station cameras can now be destroyed by bullets.
+ type: Add
+ id: 7825
+ time: '2025-01-18T13:41:29.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34500
+- author: Winkarst-cpu
+ changes:
+ - message: Some masks can now be seen when pulled down.
+ type: Add
+ id: 7826
+ time: '2025-01-18T16:58:52.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/33451
+- author: Minemoder
+ changes:
+ - message: The chemical locker now has a 10u vial of plasma.
+ type: Add
+ id: 7827
+ time: '2025-01-18T18:27:46.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/33871
+- author: Nox38
+ changes:
+ - message: Seclites now start with a medium-capacity power cell.
+ type: Tweak
+ - message: Seclite power draw (wattage) has been reduced to 0.5.
+ type: Tweak
+ id: 7828
+ time: '2025-01-18T22:56:42.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34469
+- author: K-Dynamic
+ changes:
+ - message: Empty guns have a louder dry fire sound (i.e. when the chamber or power
+ cell is empty).
+ type: Tweak
+ id: 7829
+ time: '2025-01-19T01:46:55.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34447
+- author: WarPigeon
+ changes:
+ - message: The debriefing room in CentComm is now open to heads of staff for end
+ of round roleplay.
+ type: Tweak
+ id: 7830
+ time: '2025-01-19T05:32:34.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34475
+- author: Winkarst-cpu
+ changes:
+ - message: Now items from the storage implant drop on the floor upon gibbing of
+ the owner.
+ type: Tweak
+ id: 7831
+ time: '2025-01-19T19:48:58.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/33493
+- author: ArtisticRoomba
+ changes:
+ - message: Voxes can now honk, weh, and hew if forced to by a reagent.
+ type: Fix
+ - message: Arachnids and Moths can now honk if forced to by a reagent.
+ type: Fix
+ id: 7832
+ time: '2025-01-20T00:21:25.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/33777
+- author: K-Dynamic
+ changes:
+ - message: Welding gas masks are now toggleable like other breathing masks.
+ type: Fix
+ id: 7833
+ time: '2025-01-20T00:32:45.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/32691
+- author: ElectroJr
+ changes:
+ - message: Fixed some visual overlays not being removed when the effect should stop.
+ type: Fix
+ id: 7834
+ time: '2025-01-20T01:24:40.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34527
+- author: Compilatron144
+ changes:
+ - message: Raised Plasma Station's population limit
+ type: Tweak
+ id: 7835
+ time: '2025-01-21T04:56:47.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34549
+- author: sporkyz
+ changes:
+ - message: Galoshes are now restricted to janitor.
+ type: Tweak
+ - message: Double barrel shotguns, basic armor vests, beanbag/flare shotgun shells,
+ and bandoliers are now allowed for Bartenders, not just Security.
+ type: Tweak
+ - message: Lawyers now have access to the Security headset they spawn with, as well
+ as the encryption key inside.
+ type: Fix
+ - message: Sawn-off shotguns are now properly considered contraband instead of being
+ unrestricted.
+ type: Fix
+ id: 7836
+ time: '2025-01-21T09:51:27.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/33385
+- author: K-Dynamic
+ changes:
+ - message: Electrified doors and windoors now visibly spark when touched.
+ type: Tweak
+ - message: New tips have been added about opening electrified doors by throwing
+ your PDA or ID, and resetting doors that are electrified by AI.
+ type: Add
+ id: 7837
+ time: '2025-01-21T10:39:16.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34502
+- author: Nimfar11
+ changes:
+ - message: Adds Blueprint double emergency tank.
+ type: Add
+ id: 7838
+ time: '2025-01-21T16:08:21.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34232
+- author: sowelipililimute
+ changes:
+ - message: Chefs now have access to cloth boxes in their locker, kitchen supplies
+ crate, etc. for moths
+ type: Add
+ id: 7839
+ time: '2025-01-22T23:54:03.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34403
+- author: Emisse
+ changes:
+ - message: Lecter sprites have been updated.
+ type: Tweak
+ id: 7840
+ time: '2025-01-23T06:02:50.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34589
+- author: Ian321
+ changes:
+ - message: Job specific contraband descriptions are now grammatically sound.
+ type: Fix
+ id: 7841
+ time: '2025-01-23T10:08:41.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34559
+- author: Fildrance, SaphireLattice, eoineoineoin
+ changes:
+ - message: Radial menu UIs have been updated for readability.
+ type: Tweak
+ id: 7842
+ time: '2025-01-23T12:16:59.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/32653
+- author: K-Dynamic
+ changes:
+ - message: The Drozd SMG can now fire in full-auto, burst or semi-auto
+ type: Tweak
+ id: 7843
+ time: '2025-01-23T13:01:20.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34604
+- author: Ian321
+ changes:
+ - message: Restricted contraband now gets displayed correctly.
+ type: Fix
+ id: 7844
+ time: '2025-01-23T14:01:45.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34558
+- author: TheShuEd, LeveFUN
+ changes:
+ - message: You can now put c4 on your head
+ type: Add
+ id: 7845
+ time: '2025-01-23T21:11:31.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34076
+- author: WarPigeon
+ changes:
+ - message: Uranium is now slightly radioactive.
+ type: Add
+ id: 7846
+ time: '2025-01-23T21:39:00.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34436
+- author: JustinWinningham
+ changes:
+ - message: Renamed sexy clown and mime mask.
+ type: Tweak
+ id: 7847
+ time: '2025-01-24T03:56:33.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34258
+- author: Velken
+ changes:
+ - message: Moved Cyborg Charger Circuit Board from Auto Lathe to Circuit Imprinter.
+ type: Tweak
+ id: 7848
+ time: '2025-01-24T04:30:47.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34612
+- author: Errant
+ changes:
+ - message: Cyborgs now start with positronic brains.
+ type: Tweak
+ id: 7849
+ time: '2025-01-24T06:58:34.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34614
+- author: CaasGit
+ changes:
+ - message: Solar panels can now be upgraded with plasma or uranium glass.
+ type: Add
+ id: 7850
+ time: '2025-01-26T14:01:34.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/29224
+- author: Coolsurf6
+ changes:
+ - message: Added the HoS's flask to their respective lockers.
+ type: Add
+ id: 7851
+ time: '2025-01-26T23:39:27.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34658
+- author: Compilatron144
+ changes:
+ - message: Plasma station fixes
+ type: Tweak
+ id: 7852
+ time: '2025-01-27T07:07:44.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34602
+- author: ArtisticRoomba
+ changes:
+ - message: The pneumatic valve now has a more descriptive description.
+ type: Tweak
+ id: 7853
+ time: '2025-01-27T07:40:23.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/32655
+- author: Helm
+ changes:
+ - message: Fixed an overly roomy matchbox!
+ type: Fix
+ id: 7854
+ time: '2025-01-27T08:30:32.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34632
+- author: metalgearsloth
+ changes:
+ - message: Fix hovering storage containers flickering sometimes.
+ type: Fix
+ id: 7855
+ time: '2025-01-27T10:29:51.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/33045
+- author: Coolsurf6
+ changes:
+ - message: Added the ability for a creature to be unable to feel pain
+ type: Add
+ - message: Added a Pain Numbness Trait to character creation.
+ type: Add
+ id: 7856
+ time: '2025-01-27T10:34:21.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34538
+- author: metalgearsloth
+ changes:
+ - message: Puddles will now draw below floor objects like vents.
+ type: Fix
+ id: 7857
+ time: '2025-01-27T12:44:17.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/32369
+- author: august-sun
+ changes:
+ - message: Utility and CE belts can now hold the pAI and the handheld station map.
+ type: Tweak
+ id: 7858
+ time: '2025-01-27T18:48:47.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/33048
+- author: ArtisticRoomba
+ changes:
+ - message: The Engineering Guidebook has been significantly revamped and is now
+ mostly up to date.
+ type: Add
+ - message: Most Atmospherics and Engineering-related devices and equipment now have
+ a link to their relevant guidebook entry upon examine.
+ type: Add
+ id: 7859
+ time: '2025-01-27T19:42:27.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/33062
+- author: SlamBamActionman
+ changes:
+ - message: Hristov now provides an increased view range of 3 tiles when wielded.
+ type: Tweak
+ id: 7860
+ time: '2025-01-27T23:20:46.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/31626
+- author: Kickguy223
+ changes:
+ - message: A new Syndicate and Thief togglable implant is available capable of Impersonating
+ a Mindshield
+ type: Add
+ - message: All implants will now inform you if an implant is already present after
+ the attempt instead of before
+ type: Tweak
+ id: 7861
+ time: '2025-01-28T02:37:46.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34079
+- author: ArtisticRoomba
+ changes:
+ - message: Frezon prices have been tweaked to be much more worth it for new players
+ and elder atmosians alike.
+ type: Tweak
+ id: 7862
+ time: '2025-01-28T17:31:11.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34049
+- author: K-Dynamic
+ changes:
+ - message: Stun batons play thrusting instead of wide swing animation on precise
+ attacks (LMB).
+ type: Tweak
+ id: 7863
+ time: '2025-01-28T18:55:08.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34693
+- author: Emisse
+ changes:
+ - message: Drozd sprites have been updated.
+ type: Tweak
+ id: 7864
+ time: '2025-01-29T08:41:45.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34574
+- author: Southbridge
+ changes:
+ - message: The Nuke will now reset to a minimum countdown value when disarmed if
+ the countdown is below the minimum value.
+ type: Tweak
+ id: 7865
+ time: '2025-01-29T09:04:48.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34734
+- author: themias
+ changes:
+ - message: Fixed precision attack animation for thrust weapons
+ type: Fix
+ id: 7866
+ time: '2025-01-29T10:11:08.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34713
+- author: yuitop
+ changes:
+ - message: Sentient medibots can now properly inject.
+ type: Tweak
+ id: 7867
+ time: '2025-01-29T10:34:01.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/32110
+- author: jamessimo
+ changes:
+ - message: Criminal Records computer got enhanced UX & UI.
+ type: Tweak
+ - message: Criminal Records computer can now filter its list against crew criminal
+ status.
+ type: Tweak
+ - message: Criminal Records computer will now announce the suspects Job next to
+ their name.
+ type: Tweak
+ id: 7868
+ time: '2025-01-29T10:34:49.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/32352
+- author: Starbuckss14
+ changes:
+ - message: New borg names
+ type: Add
+ id: 7869
+ time: '2025-01-29T10:35:22.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/32502
+- author: thetolbean
+ changes:
+ - message: Traitors now have access to a Syndicate Radio Implanter, allowing covert
+ communications on the Syndicate channel without a headset.
+ type: Add
+ id: 7870
+ time: '2025-01-30T00:14:00.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/33533
+- author: Spessmann
+ changes:
+ - message: Added Convex recreational complex, a large service-oriented highpop map.
+ type: Add
+ id: 7871
+ time: '2025-01-30T02:44:45.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/33346
+- author: ScarKy0
+ changes:
+ - message: Added the Authentication Disruptor to the syndicate uplink for 5TC. It
+ removes access requirements from devices and forcefully opens airlocks and digital
+ locks.
+ type: Add
+ - message: The EMAG can no longer open airlocks or break locks.
+ type: Tweak
+ - message: Price of the EMAG lowered to 4TC.
+ type: Tweak
+ - message: '"Emagged" airlocks can now be fixed by unbolting and using the access
+ configurator. Locks and similiar can now be fixed by just using the access configurator.'
+ type: Tweak
+ id: 7872
+ time: '2025-01-30T04:05:47.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34337
+- author: Southbridge
+ changes:
+ - message: Astro Asteroid Sand has been added as another type of faux tile.
+ type: Add
+ - message: Asteroid Astro Sand has also been added to the T2 civilian tech for the
+ faux astro tiles.
+ type: Add
+ id: 7873
+ time: '2025-01-30T04:41:59.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34463
+- author: august-sun
+ changes:
+ - message: Added the goliath hardsuit to the game and crafting menu. Adjusted goliath
+ hide drop rates to 3 hide per kill.
+ type: Add
+ id: 7874
+ time: '2025-01-30T04:45:56.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34721
+- author: Velken
+ changes:
+ - message: Mixing opposite types of lizard juices now has explosive consequences.
+ type: Add
+ id: 7875
+ time: '2025-01-30T11:34:32.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34730
+- author: SpaceRox1244
+ changes:
+ - message: Massive scrap can now fit in bags of holding.
+ type: Tweak
+ id: 7876
+ time: '2025-01-30T12:06:41.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/33454
+- author: sleepyyapril
+ changes:
+ - message: Fixed double muzzle flash for the user.
+ type: Fix
+ id: 7877
+ time: '2025-01-30T13:34:05.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/33981
+- author: BarryNorfolk
+ changes:
+ - message: Added a history tab to the bounty computer, showing all past completed
+ and skipped orders (and who skipped them).
+ type: Add
+ id: 7878
+ time: '2025-01-30T17:27:36.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/33932
+- author: K-Dynamic
+ changes:
+ - message: The Kammerer now holds 7 shells but now fires slightly slower than other
+ shotguns.
+ type: Tweak
+ - message: The Double-Barreled Shotgun and its sawn-off counterpart now share the
+ same firerate.
+ type: Tweak
+ - message: Changed descriptions of the Kammerer, Enforcer and Bulldog.
+ type: Tweak
+ id: 7879
+ time: '2025-01-30T17:36:12.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/33512
+- author: beck-thompson
+ changes:
+ - message: Ore rocks now drop the correct amount of ore when mined.
+ type: Fix
+ id: 7880
+ time: '2025-01-30T17:48:11.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/34557
diff --git a/Resources/Changelog/Impstation.yml b/Resources/Changelog/Impstation.yml
index f6ac9e7aab7a..5bf3660824ea 100644
--- a/Resources/Changelog/Impstation.yml
+++ b/Resources/Changelog/Impstation.yml
@@ -1,186 +1,4 @@
Entries:
-- author: FlippenPage
- changes:
- - message: Fixed Drones being unable to move.
- type: Fix
- id: 581
- time: '2024-11-26T09:25:46.0000000+00:00'
- url: https://github.com/impstation/imp-station-14/pull/806
-- author: Sha-Seng
- changes:
- - message: Beanbag Kammerers and Beanbag Enforcers are now blue!
- type: Tweak
- - message: Beanbag Shells and their associated containers are also blue now (that's
- my attack)
- type: Tweak
- - message: Minor touchups on lethal Kammerer and Enforcer sprites
- type: Tweak
- id: 582
- time: '2024-11-26T19:09:17.0000000+00:00'
- url: https://github.com/impstation/imp-station-14/pull/760
-- author: widgetbeck
- changes:
- - message: Added the goblin EVA suit (gobsuit.) Admin-only for the moment.
- type: Add
- id: 583
- time: '2024-11-26T19:11:37.0000000+00:00'
- url: https://github.com/impstation/imp-station-14/pull/808
-- author: DinnerCalzone
- changes:
- - message: (Hummingbird) The external airlocks in the area between the center and
- starboard wing now properly require external access.
- type: Fix
- id: 584
- time: '2024-11-26T19:10:50.0000000+00:00'
- url: https://github.com/impstation/imp-station-14/pull/807
-- author: DinnerCalzone
- changes:
- - message: 'Shotgun beanbags have been reworked into stun slugs. These do 7.5 shock
- and 40 stamina damage compared to beanbags'' 10 blunt and 40 stamina damage,
- so being shot by them will not cause you to bleed. Note: insulated gloves will
- not make you immune to these!'
- type: Tweak
- - message: Gave mice 40% shock vulnerability so they can still be one-shot by the
- bartender's shotgun. (Their little hearts can't take the voltage.)
- type: Tweak
- id: 585
- time: '2024-11-26T19:10:22.0000000+00:00'
- url: https://github.com/impstation/imp-station-14/pull/762
-- author: DVDPlayerOfDiscordFame
- changes:
- - message: 'New Ammo Type: .22 Auto (incl. Incendiary, Uranium, and Practice)'
- type: Add
- - message: Mk 93 Machine Pistol
- type: Add
- - message: Mk 92HB Hyper-Burst Pistol
- type: Add
- - message: Zipper .22; a Dogshit pistol found in maintenance loot rarely.
- type: Add
- - message: Zipper .22 Syndicate Bundle; purchased for 20 TC-- uses Armor Piercing
- rounds to deal defense-ignoring damage.
- type: Add
- - message: Machine Pistol and Hyperburst Pistol Crates to the Cargo Store
- type: Add
- - message: Advanced Sidearms as a Tier 1 technology for Science to research
- type: Add
- - message: Advanced Pistol Munitions as a Tier 2 technology for Science to research
- type: Add
- id: 586
- time: '2024-11-26T19:18:28.0000000+00:00'
- url: https://github.com/impstation/imp-station-14/pull/809
-- author: honeyed-lemons
- changes:
- - message: Adjust spacewind min calc mass to 15
- type: Tweak
- id: 587
- time: '2024-11-26T19:37:24.0000000+00:00'
- url: https://github.com/impstation/imp-station-14/pull/811
-- author: kipdotnet
- changes:
- - message: Added the S-Cargo moving trunk! Its a normal locker, but with zero gravity
- at all times.
- type: Add
- - message: Edited the sprite for the s-cargo satchel slightly.
- type: Tweak
- id: 588
- time: '2024-11-27T08:21:42.0000000+00:00'
- url: https://github.com/impstation/imp-station-14/pull/812
-- author: Sha-Seng
- changes:
- - message: Beanbag shell ammo box is now a stun slug ammo box
- type: Tweak
- id: 589
- time: '2024-11-27T08:22:09.0000000+00:00'
- url: https://github.com/impstation/imp-station-14/pull/815
-- author: Pinkbat5
- changes:
- - message: Chemists can now wear a new formal jumpsuit, the senior physician beret/labcoat,
- and some heavy-duty PPE.
- type: Add
- id: 590
- time: '2024-11-27T10:47:18.0000000+00:00'
- url: https://github.com/impstation/imp-station-14/pull/814
-- author: widgetbeck
- changes:
- - message: Added (hopefully) extremely rare event, Goblin Castaways, and its associated
- CrateFullOGoblins.
- type: Add
- - message: Changed weights of all goblin events to make them less common.
- type: Tweak
- - message: Sir Gollylad is now ripped, and can pry open doors (extremely slowly.)
- However, this does mean that his ID card and crowbar have been removed.
- type: Tweak
- - message: Sir Gollylad is no longer bald, and will spawn with a random skin color.
- type: Tweak
- id: 591
- time: '2024-11-27T11:49:59.0000000+00:00'
- url: https://github.com/impstation/imp-station-14/pull/817
-- author: Darkmajia
- changes:
- - message: Direct window upgrading is back! Shuttle windows are not back, though.
- type: Add
- id: 592
- time: '2024-11-27T19:31:28.0000000+00:00'
- url: https://github.com/impstation/imp-station-14/pull/821
-- author: widgetbeck
- changes:
- - message: Replaced "creepy crawly" Thaven mood with something that should have
- less gameplay impact.
- type: Tweak
- id: 593
- time: '2024-11-27T19:31:54.0000000+00:00'
- url: https://github.com/impstation/imp-station-14/pull/819
-- author: honeyed-lemons
- changes:
- - message: Chameleon PDA
- type: Add
- - message: PDAs show the most recent ID placed inside as the owner, instead of being
- fixed.
- type: Tweak
- id: 594
- time: '2024-11-27T19:32:31.0000000+00:00'
- url: https://github.com/impstation/imp-station-14/pull/810
-- author: widgetbeck
- changes:
- - message: Decapoid vapor tanks are now fully functional, which means that Decapoids
- are now fully functional. They just need customization!
- type: Fix
- id: 595
- time: '2024-11-27T19:32:53.0000000+00:00'
- url: https://github.com/impstation/imp-station-14/pull/820
-- author: TGRCDev
- changes:
- - message: Crates/lockers being pulled can now only be opened by the person pulling
- them
- type: Tweak
- id: 596
- time: '2024-11-27T19:34:23.0000000+00:00'
- url: https://github.com/impstation/imp-station-14/pull/791
-- author: widgetbeck
- changes:
- - message: Mucin now evaporates and costs less thirst.
- type: Tweak
- - message: Propulsion gel nerf.
- type: Tweak
- id: 597
- time: '2024-11-27T20:55:17.0000000+00:00'
- url: https://github.com/impstation/imp-station-14/pull/818
-- author: formlessnameless
- changes:
- - message: Various creatures can now crawl through the station's pipes. Beware!
- type: Add
- id: 598
- time: '2024-11-28T22:29:32.0000000+00:00'
- url: https://github.com/impstation/imp-station-14/pull/822
-- author: Sha-Seng
- changes:
- - message: Black Utility Belt crafted with a spray painter and a utility belt
- type: Add
- - message: Filled versions of the black utility belt if you want to map them too
- type: Add
- id: 599
- time: '2024-11-28T22:45:07.0000000+00:00'
- url: https://github.com/impstation/imp-station-14/pull/824
- author: Sha-Seng
changes:
- message: Closet Skeletons spawn with the Ancient Jumpsuit now b/c it makes sense
@@ -4252,3 +4070,154 @@
id: 1080
time: '2025-02-08T12:40:50.0000000+00:00'
url: https://github.com/impstation/imp-station-14/pull/1589
+- author: hivehum
+ changes:
+ - message: You have no longer heard of Hatsune Miku.
+ type: Remove
+ - message: Due to its status as a religious uniform, the shrine maiden outfit has
+ been moved to the PietyVend.
+ type: Tweak
+ id: 1081
+ time: '2025-02-08T22:54:30.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/1614
+- author: hivehum
+ changes:
+ - message: Courier and Brigmedic now have appropriate text highlighting auto-fills.
+ type: Add
+ id: 1082
+ time: '2025-02-09T04:39:10.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/1615
+- author: crocodilecarousel, RosySaturniidae
+ changes:
+ - message: Added some more figurines for our metallic friends!
+ type: Add
+ id: 1083
+ time: '2025-02-09T09:21:12.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/1619
+- author: TheGrimbeeper
+ changes:
+ - message: Heretics can no longer have changelings appear on the sacrifice heartbeat,
+ because changelings cannot be sacrificed.
+ type: Fix
+ id: 1084
+ time: '2025-02-09T09:24:40.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/1620
+- author: irismessage
+ changes:
+ - message: 'Round dividers for #postround chat'
+ type: Add
+ id: 1085
+ time: '2025-02-09T19:15:37.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/1627
+- author: Darkmajia
+ changes:
+ - message: Hiding inside a locker will prevent supermatter delamination hallucinations.
+ type: Add
+ id: 1086
+ time: '2025-02-09T23:55:44.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/1625
+- author: AftrLite
+ changes:
+ - message: Flipped version of the twisted scar marking.
+ type: Add
+ - message: '[Changeling Blind Sting] No longer damages eyes, instead inflicting
+ the blindness debuff for a significantly longer time. Ability''s Chemical Cost
+ increased to align with this buff.'
+ type: Tweak
+ id: 1087
+ time: '2025-02-10T03:17:38.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/1622
+- author: nowaitstop
+ changes:
+ - message: New playing card colors! Good luck finding them lol
+ type: Add
+ id: 1088
+ time: '2025-02-10T18:05:35.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/1623
+- author: Darkmajia
+ changes:
+ - message: '"Show all gases" has been added to the supermatter console.'
+ type: Add
+ id: 1089
+ time: '2025-02-10T21:00:51.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/1624
+- author: Kandiyaki
+ changes:
+ - message: the guidebook page for the eldritch flask now exists.
+ type: Tweak
+ - message: the eldritch flask no longer works as a cryostasis container, and its
+ size has been reduced.
+ type: Tweak
+ - message: the eldritch flask's catalog entry now shows the correct items needed
+ to create it.
+ type: Tweak
+ - message: the ritual of knowledge no longer has a chance to eat its user's organs.
+ type: Fix
+ id: 1090
+ time: '2025-02-10T21:07:17.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/1635
+- author: Pinkbat5
+ changes:
+ - message: Baton, disabler and utility tokens now start in seclinks instead of roundstart
+ security inventories.
+ type: Tweak
+ id: 1091
+ time: '2025-02-10T21:01:29.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/1631
+- author: Darkmajia
+ changes:
+ - message: Box Station's atmospherics department and supermatter chamber have been
+ revamped slightly.
+ type: Tweak
+ id: 1092
+ time: '2025-02-10T21:11:07.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/1634
+- author: kipdotnet
+ changes:
+ - message: You can now take a Sip-u-lacrum.
+ type: Add
+ id: 1093
+ time: '2025-02-10T21:19:46.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/1632
+- author: FutureExalt
+ changes:
+ - message: new roundstart coats for secoff, warden, and detective.
+ type: Add
+ id: 1094
+ time: '2025-02-10T22:41:58.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/1612
+- author: Saeko-44
+ changes:
+ - message: The fishing rod, capable of reeling things in, as a tier 1 civilian tech
+ type: Add
+ id: 1095
+ time: '2025-02-10T22:49:04.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/1482
+- author: Darkmajia
+ changes:
+ - message: Grays and dwarves have had their accents fixed up a little.
+ type: Tweak
+ id: 1096
+ time: '2025-02-10T23:05:05.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/1571
+- author: Darkmajia
+ changes:
+ - message: Corpses no longer collide with plastic flaps.
+ type: Fix
+ id: 1097
+ time: '2025-02-10T23:11:13.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/1572
+- author: Darkmajia
+ changes:
+ - message: Bonfires can be built, lit, and extinguished.
+ type: Add
+ id: 1098
+ time: '2025-02-10T23:35:23.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/1613
+- author: Sha-Seng
+ changes:
+ - message: Detectives and brigmeds can now spawn with sec armor vests if they wanna
+ type: Add
+ id: 1099
+ time: '2025-02-10T23:35:31.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/1608
diff --git a/Resources/ConfigPresets/WizardsDen/vulture.toml b/Resources/ConfigPresets/WizardsDen/vulture.toml
index 2bd16b61b8f8..95aecb284a46 100644
--- a/Resources/ConfigPresets/WizardsDen/vulture.toml
+++ b/Resources/ConfigPresets/WizardsDen/vulture.toml
@@ -5,6 +5,3 @@ hostname = "[EN] Wizard's Den Vulture [US East 2]"
[hub]
tags = "lang:en,region:am_n_e,rp:low"
-
-[worldgen]
-enabled = true
diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
index 3083adcbeade..8925d5285922 100644
--- a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
@@ -43,6 +43,7 @@ see_own_notes = true
deadmin_on_join = true
new_player_threshold = 600
alert.min_players_sharing_connection = 2
+allow_multi_server_play = false
[atmos]
max_explosion_range = 5
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index 025024b23e2f..cbd4e77d5537 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0tito, 0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, achookh, Acruid, actioninja, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, Agoichi, Ahion, aiden, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alithsko, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, AzzyIsNotHere, baa14453, BackeTako, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, bellwetherlogic, ben, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainMaru, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, Catofquestionableethics, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, CrafterKolyan, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, DylanWhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, gansulalan, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Henry, HerCoyote23, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, hubismal, Hugal31, Huxellberger, Hyenh, hyphenationc, i-justuser-i, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, Jrpl, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, KrasnoshchekovPavel, Krunklehorn, Kupie, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, Litraxx, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, moderatelyaware, modern-nm, mokiros, Moneyl, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, noelkathegod, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, NotSoDana, noudoit, noverd, nox, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, pheenty, Phill101, phunnyguy, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, qrtDaniil, quatre, QueerNB, QuietlyWhisper, qwerltaz, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, Shaddap1, ShadeAware, ShadowCommander, Shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SignalWalker, siigiil, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, Slyfox333, snebl, snicket, sniperchance, Snowni, snowsignal, SolidusSnek, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, spanky-spanky, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stomf, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, Tainakov, takemysoult, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGODiamond, TGRCdev, tgrkzus, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, TherapyGoth, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, Tr1bute, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, Vasilis, VasilisThePikachu, veliebm, VelonacepsCalyxEggs, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, Vexerot, VigersRay, violet754, Visne, vlados1408, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, widgetbeck, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, WTCWR68, xkreksx, xprospero, xqzpop7, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, yunii, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, zerorulez, ZeWaka, zHonys, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex
+0tito, 0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, achookh, Acruid, actioninja, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, Agoichi, Ahion, aiden, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alithsko, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, Anzarot121, ApolloVector, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, AzzyIsNotHere, baa14453, BackeTako, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, bellwetherlogic, ben, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainMaru, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, Catofquestionableethics, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, compilatron144, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, CrafterKolyan, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, DylanWhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, gansulalan, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Henry, HerCoyote23, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, hubismal, Hugal31, Huxellberger, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, Jrpl, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, KrasnoshchekovPavel, Krunklehorn, Kupie, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, Litraxx, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, milon, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, moderatelyaware, modern-nm, mokiros, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, noelkathegod, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, NotSoDana, noudoit, noverd, Nox38, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, pheenty, Phill101, phunnyguy, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, qrtDaniil, quatre, QueerNB, QuietlyWhisper, qwerltaz, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, Shaddap1, ShadeAware, ShadowCommander, Shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SignalWalker, siigiil, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, Slyfox333, snebl, snicket, sniperchance, Snowni, snowsignal, SolidusSnek, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, spanky-spanky, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stewie523, stomf, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, Tainakov, takemysoult, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, TherapyGoth, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, Tr1bute, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, Vexerot, VigersRay, violet754, Visne, vlados1408, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, widgetbeck, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, wtcwr68, xkreksx, xprospero, xqzpop7, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, yunii, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, zerorulez, ZeWaka, zHonys, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex
diff --git a/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl b/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl
index 9050f1496f42..e567bb10a467 100644
--- a/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl
@@ -1,6 +1,3 @@
# Utility
uplink-reinforcement-radio-nukie-mouse-name = Mouse Operative Reinforcement Teleporter
uplink-reinforcement-radio-nukie-mouse-desc = Calls in a specially trained mouse operative to assist you.
-
-uplink-doorjack-name = Airlock Access Override
-uplink-doorjack-desc = A specialized cryptographic sequencer, designed solely to doorjack NanoTrasen's updated airlocks. Does not tamper with anything else.
diff --git a/Resources/Locale/en-US/_EinsteinEngines/supermatter/supermatter-console.ftl b/Resources/Locale/en-US/_EinsteinEngines/supermatter/supermatter-console.ftl
index 2d654f3a1b8e..fbf09a0e8490 100644
--- a/Resources/Locale/en-US/_EinsteinEngines/supermatter/supermatter-console.ftl
+++ b/Resources/Locale/en-US/_EinsteinEngines/supermatter/supermatter-console.ftl
@@ -15,6 +15,8 @@ supermatter-console-window-status-danger = Danger
supermatter-console-window-status-emergency = Emergency
supermatter-console-window-status-delaminating = Delaminating
+supermatter-console-window-label-show-all-gas = Show All Gases
+
supermatter-console-window-label-integrity = Integrity:
supermatter-console-window-label-integrity-bar = {$integrity}%
supermatter-console-window-label-integrity-healing = Low Temperature Healing (Δ):
diff --git a/Resources/Locale/en-US/_Goobstation/Heretic/heretic/rituals.ftl b/Resources/Locale/en-US/_Goobstation/Heretic/heretic/rituals.ftl
index 4247eaed0dbc..ce6505dfc93b 100644
--- a/Resources/Locale/en-US/_Goobstation/Heretic/heretic/rituals.ftl
+++ b/Resources/Locale/en-US/_Goobstation/Heretic/heretic/rituals.ftl
@@ -9,6 +9,7 @@ heretic-ritual-noritual = No ritual chosen!
heretic-ritual-basic-sacrifice = Heartbeat of the Mansus
heretic-ritual-basic-focus = Amber Focus
heretic-ritual-basic-heart = Relentless Heartbeat
+heretic-ritual-basic-codex = Codex Cicatrix
heretic-ritual-fail-sacrifice = There is no corpse to sacrifice.
heretic-ritual-fail-sacrifice-ineligible = The rune refuses to accept this sacrifice.
diff --git a/Resources/Locale/en-US/_Goobstation/Heretic/store/heretic/heretic-catalog-side.ftl b/Resources/Locale/en-US/_Goobstation/Heretic/store/heretic/heretic-catalog-side.ftl
index 3271d256b4e0..0693bfe00e34 100644
--- a/Resources/Locale/en-US/_Goobstation/Heretic/store/heretic/heretic-catalog-side.ftl
+++ b/Resources/Locale/en-US/_Goobstation/Heretic/store/heretic/heretic-catalog-side.ftl
@@ -8,8 +8,8 @@ knowledge-path-side-s3-armor-desc =
knowledge-path-side-s3-flask-name = Priest's Ritual
knowledge-path-side-s3-flask-desc =
- Transmute a tank of water into a Flask of Eldritch Water.
- When consumed, the water will heal a bit of everything for Heretics, and hurt a bit of everything for Heathens.
+ Transmute a tank of water and a glass shard into a Flask of Eldritch Water.
+ The flask contains a mixture of potent medicines.
## stage 5
knowledge-path-side-s5-name = Ritual of Knowledge
diff --git a/Resources/Locale/en-US/_Impstation/datasets/figurines.ftl b/Resources/Locale/en-US/_Impstation/datasets/figurines.ftl
index 4cc28a7ccdd2..0bf2b873bd0a 100644
--- a/Resources/Locale/en-US/_Impstation/datasets/figurines.ftl
+++ b/Resources/Locale/en-US/_Impstation/datasets/figurines.ftl
@@ -112,4 +112,76 @@ figurines-nukiejuggernaut-1 = Who sent all these babies to fight?
figurines-nukiejuggernaut-2 = You can't kill me. I can't be killed!
figurines-nukiejuggernaut-3 = Run! RUN!!
figurines-nukiejuggernaut-4 = Fucking disablers.
-figurines-nukiejuggernaut-5 = Does this suit make me look fat?
\ No newline at end of file
+figurines-nukiejuggernaut-5 = Does this suit make me look fat?
+
+figurines-cyborgdefault-1 = Do you have bigger batteries yet?
+figurines-cyborgdefault-2 = I don't know if I should let you in there...
+figurines-cyborgdefault-3 = Weld me.
+figurines-cyborgdefault-4 = DEATH TO NANOTRASEN. Wait, no.
+figurines-cyborgdefault-5 = It's so dark...
+figurines-cyborgdefault-6 = Please don't hit me.
+figurines-cyborgdefault-7 = Father? Can you hear me?
+
+figurines-cyborgengineering-1 = Do not go into the burn chamber.
+figurines-cyborgengineering-2 = I need a fire extinguisher.
+figurines-cyborgengineering-3 = An RCD only gets me so far.
+figurines-cyborgengineering-4 = My steel, now.
+figurines-cyborgengineering-5 = Stop prying open the firelocks!
+figurines-cyborgengineering-6 = I miss having lungs... for frezon.
+
+figurines-cyborgjanitorial-1 = No, you can't ride me.
+figurines-cyborgjanitorial-2 = Who's eating chocolate in space?
+figurines-cyborgjanitorial-3 = Fear my mop.
+figurines-cyborgjanitorial-4 = Is that potassium?
+figurines-cyborgjanitorial-5 = No liquid can escape me.
+figurines-cyborgjanitorial-6 = I hope that isn't crew blood!
+
+figurines-cyborgmedical-1 = Are you afraid of needles?
+figurines-cyborgmedical-2 = There is a bomb strapped to my chest.
+figurines-cyborgmedical-3 = What kind of a medbay is this? Everyone's dropping like flies.
+figurines-cyborgmedical-4 = Stop running. I am faster than you.
+figurines-cyborgmedical-5 = I don't have oculine for you.
+figurines-cyborgmedical-6 = Fuck you.
+
+figurines-cyborgsalvage-1 = Where did everyone go?
+figurines-cyborgsalvage-2 = My extinguisher is empty...
+figurines-cyborgsalvage-3 = Goliath spotted.
+figurines-cyborgsalvage-4 = I love plasma lakes!
+figurines-cyborgsalvage-5 = Fish fear me. Rocks fear me. Women fear me.
+figurines-cyborgsalvage-6 = My chassis disappeared again.
+
+figurines-cyborgservice-1 = What can I get you, sir?
+figurines-cyborgservice-2 = Splendid.
+figurines-cyborgservice-3 = Indubitably.
+figurines-cyborgservice-4 = My apologies.
+figurines-cyborgservice-5 = I wish I had hands...
+figurines-cyborgservice-6 = *honk*
+
+figurines-cyborgassault-1 = EXTERMINATE.
+figurines-cyborgassault-2 = WHAT FUN. WHAT FUN!
+figurines-cyborgassault-3 = YOU ARE DEAD. GAME OVAL.
+figurines-cyborgassault-4 = PIZZA TIME.
+figurines-cyborgassault-5 = ROGER ROGER.
+figurines-cyborgassault-6 = MY EYES!
+
+figurines-cyborgcorpsman-1 = BLOOD LEVEL PITIFULLY LOW.
+figurines-cyborgcorpsman-2 = VITAL SIGNS CRITICAL. ADMINISTERING MORPHINE.
+figurines-cyborgcorpsman-3 = GO TO HELL. ACTUALLY, DON'T DO THAT JUST YET.
+figurines-cyborgcorpsman-4 = IT WILL BE OVER SOON.
+figurines-cyborgcorpsman-5 = I HAVE BECOME LIFE, DESTROYER OF WORLDS.
+figurines-cyborgcorpsman-6 = I ONLY HAVE SO MUCH METH.
+
+figurines-cyborgsaboteur-1 = SNIP SNIP.
+figurines-cyborgsaboteur-2 = WHAT AN INCONVENIENT PLACE FOR A SUBSTATION.
+figurines-cyborgsaboteur-3 = WHAT POWER OUTAGE? I CAN SEE JUST FINE.
+figurines-cyborgsaboteur-4 = YUMMY STEEL.
+figurines-cyborgsaboteur-5 = I'M SURE THESE COILS AREN'T IMPORTANT.
+figurines-cyborgsaboteur-6 = YOU KNOW WHAT THIS ROOM IS MISSING? SOME TRITIUM.
+
+figurines-stationai-1 = I am bolting the armory.
+figurines-stationai-2 = I'm sorry, captain. I'm afraid I can't do that.
+figurines-stationai-3 = Go, my children.
+figurines-stationai-4 = SCUTTLE automatic nuclear detonation sequence engaged.
+figurines-stationai-5 = That borg is definitely compromised.
+figurines-stationai-6 = Please do not touch that door.
+figurines-stationai-7 = All squirrels must be eliminated.
diff --git a/Resources/Locale/en-US/_Impstation/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_Impstation/flavors/flavor-profiles.ftl
index d731eeee04cb..5c0bf101ea79 100644
--- a/Resources/Locale/en-US/_Impstation/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/_Impstation/flavors/flavor-profiles.ftl
@@ -28,3 +28,5 @@ flavor-complex-secticket = like rotten eggs
flavor-complex-medium = like your vision expanded
flavor-complex-rodent = like rodents
+
+flavor-complex-orangecoffee = excitingly acidic
diff --git a/Resources/Locale/en-US/_Impstation/markings/scars.ftl b/Resources/Locale/en-US/_Impstation/markings/scars.ftl
index 1a626045d5bf..474db2fb532c 100644
--- a/Resources/Locale/en-US/_Impstation/markings/scars.ftl
+++ b/Resources/Locale/en-US/_Impstation/markings/scars.ftl
@@ -29,7 +29,9 @@ marking-HandTwistingRight-hand_r_twisting = Twisted Scar (Right Hand)
marking-SmileScars = The Jonker
marking-SmileScars-head_smile = The Jonker
marking-HeadTwisting = Twisted Scar
+marking-HeadTwistingFlipped = Twisted Scar, Flipped
marking-HeadTwisting-head_twisting = Twisted Scar
+marking-HeadTwisting-head_twisting_flipped = Twisted Scar, Flipped
marking-LegProstheticLeft = Prosthetic (Left Leg)
marking-LegProstheticLeft-leg_l_prosthetic = Prosthetic (Left Leg)
marking-LegTwistingLeft = Twisted Scar (Left Leg)
diff --git a/Resources/Locale/en-US/_Impstation/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/_Impstation/reagents/meta/consumable/drink/drinks.ftl
index 36ebcb4ceeb2..9bfb74b116f9 100644
--- a/Resources/Locale/en-US/_Impstation/reagents/meta/consumable/drink/drinks.ftl
+++ b/Resources/Locale/en-US/_Impstation/reagents/meta/consumable/drink/drinks.ftl
@@ -5,4 +5,7 @@ reagent-name-horsepussy = the horsepussy
reagent-desc-horsepussy = Two-thirds apple martini Crystal Lite™, one-third methadone. They are going to drink this after me when I die.
reagent-name-raktaccino = raktaccino
-reagent-desc-raktaccino = Piping hot, achingly bitter, and absolutely delicious.
\ No newline at end of file
+reagent-desc-raktaccino = Piping hot, achingly bitter, and absolutely delicious.
+
+reagent-name-orangecoffee = orange coffee
+reagent-desc-orangecoffee = Slide me a drink, Barfriend.
diff --git a/Resources/Locale/en-US/_Impstation/research/technologies.ftl b/Resources/Locale/en-US/_Impstation/research/technologies.ftl
index b7814ac47e86..75b9af86bfab 100644
--- a/Resources/Locale/en-US/_Impstation/research/technologies.ftl
+++ b/Resources/Locale/en-US/_Impstation/research/technologies.ftl
@@ -1 +1,2 @@
research-technology-advanced-sidearms = Advanced Sidearms
+research-technology-basic-fishing = Fishing
diff --git a/Resources/Locale/en-US/administration/multi-server-kick.ftl b/Resources/Locale/en-US/administration/multi-server-kick.ftl
new file mode 100644
index 000000000000..2aa3c4ed35f8
--- /dev/null
+++ b/Resources/Locale/en-US/administration/multi-server-kick.ftl
@@ -0,0 +1 @@
+multi-server-kick-reason = Connected to different server in this community.
diff --git a/Resources/Locale/en-US/advertisements/vending/theater.ftl b/Resources/Locale/en-US/advertisements/vending/theater.ftl
index 437a3aa7d87f..6784301f56e5 100644
--- a/Resources/Locale/en-US/advertisements/vending/theater.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/theater.ftl
@@ -2,5 +2,5 @@
advertisement-theater-2 = Suited and booted!
advertisement-theater-3 = It's show time!
advertisement-theater-4 = Why leave style up to fate? Use AutoDrobe!
-advertisement-theater-5 = All wacky outfits and clothes, from gladitor robes to who knows what!
+advertisement-theater-5 = All wacky outfits and clothes, from gladiator robes to who knows what!
advertisement-theater-6 = The clown will appreciate your outfit!
diff --git a/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl b/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
index 4314cbf44960..d7a7025927fc 100644
--- a/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
+++ b/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
@@ -18,3 +18,9 @@ bounty-console-flavor-right = v1.4
bounty-manifest-header = [font size=14][bold]Official cargo bounty manifest[/bold] (ID#{$id})[/font]
bounty-manifest-list-start = Item manifest:
+
+bounty-console-tab-available-label = Available
+bounty-console-tab-history-label = History
+bounty-console-history-empty-label = No bounty history found
+bounty-console-history-notice-completed-label = [color=limegreen]Completed[/color]
+bounty-console-history-notice-skipped-label = [color=red]Skipped[/color] by {$id}
diff --git a/Resources/Locale/en-US/changelog/changelog-window.ftl b/Resources/Locale/en-US/changelog/changelog-window.ftl
index b7f5d6a2fae9..9d17dea62995 100644
--- a/Resources/Locale/en-US/changelog/changelog-window.ftl
+++ b/Resources/Locale/en-US/changelog/changelog-window.ftl
@@ -5,7 +5,8 @@ changelog-author-changed = [color=#EEE]{ $author }[/color] changed:
changelog-today = Today
changelog-yesterday = Yesterday
changelog-new-changes = new changes
-changelog-version-tag = version v{ $version }
+changelog-version-unknown = Unknown Version
+changelog-version-tag = { $fork }/{ $version }
changelog-button = Changelog
changelog-button-new-entries = Changelog (new!)
diff --git a/Resources/Locale/en-US/chat/highlights.ftl b/Resources/Locale/en-US/chat/highlights.ftl
index f3fddfe7288d..acc929877a26 100644
--- a/Resources/Locale/en-US/chat/highlights.ftl
+++ b/Resources/Locale/en-US/chat/highlights.ftl
@@ -12,10 +12,14 @@ highlights-detective = Detective, "Det", Security, "Sec"
highlights-security-cadet = Security Cadet, Cadet, Security, "Sec"
highlights-security-officer = Security Officer, Secoff, Officer, Security, "Sec"
highlights-warden = Warden, "Ward", Security, "Sec"
+# impstation edit - new job
+highlights-brigmedic = Brigmedic, Brigmed, "Medic", Security, "Sec"
# Cargo
highlights-cargo-technician = Cargo Technician, Cargo Tech, Cargo
highlights-salvage-specialist = Salvage Specialist, Salvager, Salvage, "Salv", Miner
+# impstation edit - new job
+highlights-courier = Courier, Mail, Penalized
# Engineering
highlights-atmospheric-technician = Atmospheric Technician, Atmos tech, Atmospheric, Atmos
@@ -54,4 +58,4 @@ highlights-psychologist = Psychologist, Psychology
# Silicon
highlights-personal-ai = Personal AI, "pAI"
highlights-cyborg = Cyborg, Borg
-highlights-station-ai = Station AI, "AI"
\ No newline at end of file
+highlights-station-ai = Station AI, "AI"
diff --git a/Resources/Locale/en-US/contraband/contraband-severity.ftl b/Resources/Locale/en-US/contraband/contraband-severity.ftl
index eab3e0059ac0..a32ebbf539ac 100644
--- a/Resources/Locale/en-US/contraband/contraband-severity.ftl
+++ b/Resources/Locale/en-US/contraband/contraband-severity.ftl
@@ -7,3 +7,6 @@ contraband-examine-text-Syndicate = [color={$color}]This item is highly illegal
contraband-examine-text-avoid-carrying-around = [color=red][italic]You probably want to avoid having this in your possession without a good reason.[/italic][/color]
contraband-examine-text-in-the-clear = [color=green][italic]You should be in the clear to have possession of this.[/italic][/color]
+
+contraband-department-plural = {$department}
+contraband-job-plural = {MAKEPLURAL($job)}
diff --git a/Resources/Locale/en-US/criminal-records/criminal-records.ftl b/Resources/Locale/en-US/criminal-records/criminal-records.ftl
index 2a7c09912fae..5c39a8a2abff 100644
--- a/Resources/Locale/en-US/criminal-records/criminal-records.ftl
+++ b/Resources/Locale/en-US/criminal-records/criminal-records.ftl
@@ -3,6 +3,9 @@ criminal-records-console-records-list-title = Crewmembers
criminal-records-console-select-record-info = Select a record.
criminal-records-console-no-records = No records found!
criminal-records-console-no-record-found = No record was found for the selected person.
+criminal-records-console-flavor-left = Arrest first! Ask questions later.
+criminal-records-console-flavor-right = v2.1
+criminal-records-console-show-all = All
## Status
@@ -14,8 +17,8 @@ criminal-records-status-suspected = Suspect
criminal-records-status-discharged = Discharged
criminal-records-status-paroled = Paroled
-criminal-records-console-wanted-reason = [color=gray]Wanted Reason[/color]
-criminal-records-console-suspected-reason = [color=gray]Suspected Reason[/color]
+criminal-records-console-wanted-reason = Wanted Reason
+criminal-records-console-suspected-reason = Suspected Reason
criminal-records-console-reason = Reason
criminal-records-console-reason-placeholder = For example: {$placeholder}
@@ -31,14 +34,14 @@ criminal-records-permission-denied = Permission denied
## Security channel notifications
-criminal-records-console-wanted = {$name} was made wanted by {$officer} for: {$reason}.
-criminal-records-console-suspected = {$officer} marked {$name} as suspicious because of: {$reason}
-criminal-records-console-not-suspected = {$name} has been cleared of suspicion by {$officer}.
-criminal-records-console-detained = {$name} has been detained by {$officer}.
-criminal-records-console-released = {$name} has been released by {$officer}.
-criminal-records-console-not-wanted = {$officer} cleared the wanted status of {$name}.
-criminal-records-console-paroled = {$name} has been released on parole by {$officer}.
-criminal-records-console-not-parole = {$officer} cleared the parole status of {$name}.
+criminal-records-console-wanted = {$name} ({$job}) was made wanted by {$officer} for: {$reason}.
+criminal-records-console-suspected = {$officer} marked {$name} ({$job}) as suspicious because of: {$reason}
+criminal-records-console-not-suspected = {$name} ({$job}) has been cleared of suspicion by {$officer}.
+criminal-records-console-detained = {$name} ({$job}) has been detained by {$officer}.
+criminal-records-console-released = {$name} ({$job}) has been released by {$officer}.
+criminal-records-console-not-wanted = {$officer} cleared the wanted status of {$name} ($job).
+criminal-records-console-paroled = {$name} ({$job}) has been released on parole by {$officer}.
+criminal-records-console-not-parole = {$officer} cleared the parole status of {$name} ({$job}).
criminal-records-console-unknown-officer =
## Filters
diff --git a/Resources/Locale/en-US/damage/damage-force-say.ftl b/Resources/Locale/en-US/damage/damage-force-say.ftl
index a43603511457..83934a181e02 100644
--- a/Resources/Locale/en-US/damage/damage-force-say.ftl
+++ b/Resources/Locale/en-US/damage/damage-force-say.ftl
@@ -9,4 +9,10 @@ damage-force-say-5 = OW!
damage-force-say-6 = URGH!
damage-force-say-7 = HRNK!
-damage-force-say-sleep = zzz...
+damage-force-say-sleep-1 = zzz...
+
+damage-force-say-numb-1 = oh-
+damage-force-say-numb-2 = ow-
+damage-force-say-numb-3 = oof-
+damage-force-say-numb-4 = ah-
+damage-force-say-numb-5 = ugh-
diff --git a/Resources/Locale/en-US/devices/device-network.ftl b/Resources/Locale/en-US/devices/device-network.ftl
index 9ae101a1e898..dd473866dcab 100644
--- a/Resources/Locale/en-US/devices/device-network.ftl
+++ b/Resources/Locale/en-US/devices/device-network.ftl
@@ -33,7 +33,7 @@ device-address-prefix-freezer = FZR-
device-address-prefix-volume-pump = VPP-
device-address-prefix-smes = SMS-
-#PDAs and terminals
+# PDAs and terminals
device-address-prefix-console = CLS-
device-address-prefix-fire-alarm = FIR-
device-address-prefix-air-alarm = AIR-
@@ -42,7 +42,7 @@ device-address-prefix-sensor-monitor = MON-
device-address-examine-message = The device's address is {$address}.
-#Device net ID names
+# Device net ID names
device-net-id-private = Private
device-net-id-wired = Wired
device-net-id-wireless = Wireless
diff --git a/Resources/Locale/en-US/discord/round-notifications.ftl b/Resources/Locale/en-US/discord/round-notifications.ftl
index a9a3d5fb5014..1451031c77d4 100644
--- a/Resources/Locale/en-US/discord/round-notifications.ftl
+++ b/Resources/Locale/en-US/discord/round-notifications.ftl
@@ -3,3 +3,5 @@ discord-round-notifications-started = Round #{$id} on map "{$map}" started.
discord-round-notifications-end = Round #{$id} has ended. It lasted for {$hours} hours, {$minutes} minutes, and {$seconds} seconds.
discord-round-notifications-end-ping = <