Make DOOM work

I think I lost this work originally

.github/workflows/test-content.yml

@@ -38,4 +38,4 @@ jobs:
     - name: Content.Tests
       run: dotnet test --no-build Content.Tests/Content.Tests.csproj -v n
     - name: Content.IntegrationTests
-      run: COMPlus_gcServer=1 dotnet test --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -v n
+      run: dotnet test --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -v n

.gitmodules

@@ -13,6 +13,3 @@
 [submodule "ManagedHttpListener"]
 	path = ManagedHttpListener
 	url = https://github.com/space-wizards/ManagedHttpListener.git
-[submodule "Linguini"]
-	path = Linguini
-	url = https://github.com/space-wizards/Linguini

OpenToolkit.GraphicsLibraryFramework/GLFWNative.cs

@@ -23,12 +23,12 @@ namespace OpenToolkit.GraphicsLibraryFramework
                     return IntPtr.Zero;
                 }
 
-                if (OperatingSystem.IsLinux())
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
                 {
                     return NativeLibrary.Load("libglfw.so.3", assembly, path);
                 }
 
-                if (OperatingSystem.IsMacOS())
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
                 {
                     return NativeLibrary.Load("libglfw.3.dylib", assembly, path);
                 }

Resources/EngineCredits/Libraries.yml

@@ -23,48 +23,6 @@
     OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
     WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-- name: Box2D
-  license:
-    MIT License
-
-    Copyright (c) 2019 Erin Catto
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is 
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.
-
-- name: Bullet Physics SDK
-  license:
-    The files in this repository are licensed under the zlib license, except for the files under 'Extras' and examples/ThirdPartyLibs.
-
-    Bullet Continuous Collision Detection and Physics Library
-    http://bulletphysics.org
-
-    This software is provided 'as-is', without any express or implied warranty.
-    In no event will the authors be held liable for any damages arising from the use of this software.
-    Permission is granted to anyone to use this software for any purpose,
-    including commercial applications, and to alter it and redistribute it freely,
-    subject to the following restrictions:
-
-    1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. 
-    If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-    2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-    3. This notice may not be removed or altered from any source distribution. 
-
 - name: Castle Core
   license: |
     Copyright 2004-2016 Castle Project - http://www.castleproject.org/
@@ -359,43 +317,6 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 
-- name: Farseer Physics Engine
-  license:
-    Microsoft Permissive License (Ms-PL)
-
-    This license governs use of the accompanying software.
-    If you use the software, you accept this license.
-    If you do not accept the license, do not use the software.
-
-    1. Definitions
-    The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law.
-    A "contribution" is the original software, or any additions or changes to the software.
-    A "contributor" is any person that distributes its contribution under this license.
-    "Licensed patents" are a contributor's patent claims that read directly on its contribution.
-
-    2. Grant of Rights
-    (A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, 
-    each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, 
-    prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
-    (B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, 
-    each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to 
-    make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or 
-    derivative works of the contribution in the software.
-
-    3. Conditions and Limitations
-    (A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.
-    (B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, 
-    your patent license from such contributor to the software ends automatically.
-    (C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, 
-    and attribution notices that are present in the software.
-    (D) If you distribute any portion of the software in source code form, you may do so only under this license by 
-    including a complete copy of this license with your distribution. If you distribute any portion of the software in 
-    compiled or object code form, you may only do so under a license that complies with this license.
-    (E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, 
-    guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. 
-    To the extent permitted under your local laws, the contributors exclude the implied warranties of 
-    merchantability, fitness for a particular purpose and non-infringement.
-
 - name: Mono.Cecil
   license: |
     Copyright (c) 2008 - 2015 Jb Evain

Resources/Locale/en-US/console.ftl

@@ -0,0 +1 @@
+console-line-edit-placeholder = Command Here

Resources/Locale/en-US/custom-controls.ftl

@@ -1,7 +0,0 @@
-## EntitySpawnWindow
-
-entity-spawn-window-title = Entity Spawn Panel
-entity-spawn-window-search-bar-placeholder = search
-entity-spawn-window-clear-button = Clear
-entity-spawn-window-erase-button-text = Erase Mode
-entity-spawn-window-override-menu-tooltip = Override placement

Resources/Locale/en-US/tab-container.ftl

@@ -1 +0,0 @@
-tab-container-not-tab-title-provided = No title

Resources/Locale/en-US/view-variables.ftl

@@ -1,11 +0,0 @@
-## ViewVariablesInstanceEntity
-
-view-variable-instance-entity-server-components-add-component-button-placeholder = Add Component
-view-variable-instance-entity-client-variables-tab-title = Client Variables
-view-variable-instance-entity-client-components-tab-title = Client Components
-view-variable-instance-entity-server-variables-tab-title = Server Variables
-view-variable-instance-entity-server-components-tab-title = Server Components
-view-variable-instance-entity-client-components-search-bar-placeholder = Search
-view-variable-instance-entity-server-components-search-bar-placeholder = Search
-view-variable-instance-entity-add-window-server-components = Add Component [S]
-view-variable-instance-entity-add-window-client-components = Add Component [C]

Robust.Client.NameGenerator/XamlUiPartialClassGenerator.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Text;
 using Microsoft.CodeAnalysis;
@@ -148,10 +147,9 @@ namespace {nameSpace}
             foreach (var typeSymbol in symbols)
             {
                 var xamlFileName = $"{typeSymbol.Name}.xaml";
-                var xamlFileNameSep = $"{Path.DirectorySeparatorChar}{xamlFileName}";
-                var relevantXamlFiles = context.AdditionalFiles.Where(t => t.Path.EndsWith(xamlFileNameSep)).ToArray();
+                var relevantXamlFile = context.AdditionalFiles.FirstOrDefault(t => t.Path.EndsWith(xamlFileName));
 
-                if (relevantXamlFiles.Length == 0)
+                if (relevantXamlFile == null)
                 {
                     context.ReportDiagnostic(
                         Diagnostic.Create(
@@ -167,28 +165,13 @@ namespace {nameSpace}
                     continue;
                 }
 
-                if (relevantXamlFiles.Length > 1)
-                {
-                    context.ReportDiagnostic(
-                        Diagnostic.Create(
-                            new DiagnosticDescriptor(
-                                "RXN0002",
-                                $"Found multiple candidate XAML files for {typeSymbol}",
-                                $"Multiple files exist with name {xamlFileName}",
-                                "Usage",
-                                DiagnosticSeverity.Error,
-                                true),
-                            typeSymbol.Locations[0]));
-                    continue;
-                }
-
-                var txt = relevantXamlFiles[0].GetText()?.ToString();
+                var txt = relevantXamlFile.GetText()?.ToString();
                 if (txt == null)
                 {
                     context.ReportDiagnostic(
                         Diagnostic.Create(
                             new DiagnosticDescriptor(
-                                "RXN0004",
+                                "RXN0002",
                                 $"Unexpected empty Xaml-File was found at {xamlFileName}",
                                 "Expected Content due to a Class with the same name being annotated with [GenerateTypedNameReferences].",
                                 "Usage",
@@ -209,7 +192,7 @@ namespace {nameSpace}
                     context.ReportDiagnostic(
                         Diagnostic.Create(
                             new DiagnosticDescriptor(
-                                "RXN0003",
+                                "AXN0003",
                                 "Unhandled exception occured while generating typed Name references.",
                                 $"Unhandled exception occured while generating typed Name references: {e}",
                                 "Usage",

Robust.Client/Audio/Midi/MidiManager.cs

@@ -6,8 +6,6 @@ using System.Threading;
 using NFluidsynth;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
-using Robust.Shared;
-using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -63,7 +61,6 @@ namespace Robust.Client.Audio.Midi
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly IResourceManagerInternal _resourceManager = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
-        [Dependency] private readonly IConfigurationManager _cfgMan = default!;
 
         private SharedBroadPhaseSystem _broadPhaseSystem = default!;
 
@@ -97,7 +94,7 @@ namespace Robust.Client.Audio.Midi
                 if (MathHelper.CloseTo(_volume, value))
                     return;
 
-                _cfgMan.SetCVar(CVars.MidiVolume, value);
+                _volume = value;
                 _volumeDirty = true;
             }
         }
@@ -134,12 +131,6 @@ namespace Robust.Client.Audio.Midi
         {
             if (FluidsynthInitialized || _failedInitialize) return;
 
-            _cfgMan.OnValueChanged(CVars.MidiVolume, value =>
-            {
-                _volume = value;
-                _volumeDirty = true;
-            }, true);
-
             _midiSawmill = Logger.GetSawmill("midi");
             _sawmill = Logger.GetSawmill("midi.fluidsynth");
             _loggerDelegate = LoggerDelegate;
@@ -225,7 +216,7 @@ namespace Robust.Client.Audio.Midi
                 // Since the last loaded soundfont takes priority, we load the fallback soundfont before the soundfont.
                 renderer.LoadSoundfont(FallbackSoundfont);
 
-                if (OperatingSystem.IsLinux())
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
                 {
                     foreach (var filepath in LinuxSoundfonts)
                     {
@@ -243,12 +234,12 @@ namespace Robust.Client.Audio.Midi
                         break;
                     }
                 }
-                else if (OperatingSystem.IsMacOS())
+                else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
                 {
                     if (File.Exists(OsxSoundfont) && SoundFont.IsSoundFont(OsxSoundfont))
                         renderer.LoadSoundfont(OsxSoundfont, true);
                 }
-                else if (OperatingSystem.IsWindows())
+                else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 {
                     if (File.Exists(WindowsSoundfont) && SoundFont.IsSoundFont(WindowsSoundfont))
                         renderer.LoadSoundfont(WindowsSoundfont, true);

Robust.Client/Audio/Midi/MidiRenderer.cs

@@ -7,7 +7,6 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 using MidiEvent = NFluidsynth.MidiEvent;
@@ -204,9 +203,7 @@ namespace Robust.Client.Audio.Midi
         private const int SampleRate = 44100;
         private const int Buffers = SampleRate / 2205;
         private readonly object _playerStateLock = new();
-        private bool _debugEvents = false;
         private SequencerClientId _synthRegister;
-        private SequencerClientId _debugRegister;
         public IClydeBufferedAudioSource Source { get; set; }
         IClydeBufferedAudioSource IMidiRenderer.Source => Source;
 
@@ -316,7 +313,6 @@ namespace Robust.Client.Audio.Midi
             _soundFontLoader = soundFontLoader;
             _synth = new Synth(_settings);
             _sequencer = new Sequencer(false);
-            _debugRegister = _sequencer.RegisterClient("honk", DumpSequencerEvent);
             _synthRegister = _sequencer.RegisterFluidsynth(_synth);
 
             _synth.AddSoundFontLoader(soundFontLoader);
@@ -326,27 +322,6 @@ namespace Robust.Client.Audio.Midi
             Source.StartPlaying();
         }
 
-        private void DumpSequencerEvent(uint time, SequencerEvent @event)
-        {
-            // ReSharper disable once UseStringInterpolation
-            _midiSawmill.Debug(string.Format(
-                "{0:D8}: {1} chan:{2:D2} key:{3:D5} bank:{4:D2} ctrl:{5:D5} dur:{6:D5} pitch:{7:D5} prog:{8:D3} val:{9:D5} vel:{10:D5}",
-                time,
-                @event.Type.ToString().PadLeft(22),
-                @event.Channel,
-                @event.Key,
-                @event.Bank,
-                @event.Control,
-                @event.Duration,
-                @event.Pitch,
-                @event.Program,
-                @event.Value,
-                @event.Velocity));
-
-            @event.Dest = _synthRegister;
-            _sequencer.SendNow(@event);
-        }
-
         public bool OpenInput()
         {
             if (Disposed)
@@ -453,6 +428,9 @@ namespace Robust.Client.Audio.Midi
         {
             if (Disposed) return;
 
+            // SSE needs this.
+            DebugTools.Assert(length % 4 == 0, "Sample length must be multiple of 4");
+
             var buffersProcessed = Source.GetNumberOfBuffersProcessed();
             if(buffersProcessed == Buffers) _midiSawmill.Warning("MIDI buffer overflow!");
             if (buffersProcessed == 0) return;
@@ -467,16 +445,36 @@ namespace Robust.Client.Audio.Midi
                 Source.GetBuffersProcessed(buffers);
 
                 lock (_playerStateLock)
-                {
-                    // _sequencer.Process(10);
                     _synth?.WriteSampleFloat(length * buffers.Length, audio, 0, Mono ? 1 : 2,
                         audio, Mono ? length * buffers.Length : 1, Mono ? 1 : 2);
-                }
+
                 if (Mono) // Turn audio to mono
                 {
                     var l = length * buffers.Length;
 
-                    NumericsHelpers.Add(audio[..l], audio[l..]);
+                    if (Sse.IsSupported)
+                    {
+                        fixed (float* ptr = audio)
+                        {
+                            for (var j = 0; j < l; j += 4)
+                            {
+                                var k = j + l;
+
+                                var jV = Sse.LoadVector128(ptr + j);
+                                var kV = Sse.LoadVector128(ptr + k);
+
+                                Sse.Store(j + ptr, Sse.Add(jV, kV));
+                            }
+                        }
+                    }
+                    else
+                    {
+                        for (var j = 0; j < l; j++)
+                        {
+                            var k = j + l;
+                            audio[j] = ((audio[k] + audio[j]));
+                        }
+                    }
                 }
 
                 for (var i = 0; i < buffers.Length; i++)
@@ -534,16 +532,16 @@ namespace Robust.Client.Audio.Midi
                 lock(_playerStateLock)
                     switch (midiEvent.Type)
                     {
-                        // Note Off - 0x80
-                        case 128:
-                            _synth.NoteOff(midiEvent.Channel, midiEvent.Key);
-                            break;
-
-                        // Note On 0x90
+                        // Note On 0x80
                         case 144:
                             _synth.NoteOn(midiEvent.Channel, midiEvent.Key, midiEvent.Velocity);
                             break;
 
+                        // Note Off - 0x90
+                        case 128:
+                            _synth.NoteOff(midiEvent.Channel, midiEvent.Key);
+                            break;
+
                         // After Touch - 0xA
                         case 160:
                             _synth.KeyPressure(midiEvent.Channel, midiEvent.Key, midiEvent.Value);
@@ -578,12 +576,6 @@ namespace Robust.Client.Audio.Midi
                         case 81:
                         // System Messages - 0xF0
                         case 240:
-                            switch (midiEvent.Control)
-                            {
-                                case 11:
-                                    _synth.AllNotesOff(midiEvent.Channel);
-                                    break;
-                            }
                             return;
 
                         default:
@@ -605,7 +597,7 @@ namespace Robust.Client.Audio.Midi
             if (Disposed) return;
 
             var seqEv = (SequencerEvent) midiEvent;
-            seqEv.Dest = _debugEvents ? _debugRegister : _synthRegister;
+            seqEv.Dest = _synthRegister;
             _sequencer.SendAt(seqEv, time, absolute);
         }
 

Robust.Client/CommandLineArgs.cs

@@ -17,7 +17,6 @@ namespace Robust.Client
         public bool Launcher { get; }
         public string? Username { get; }
         public IReadOnlyCollection<(string key, string value)> CVars { get; }
-        public IReadOnlyCollection<(string key, string value)> LogLevels { get; }
 
         // Manual parser because C# has no good command line parsing libraries. Also dependencies bad.
         // Also I don't like spending 100ms parsing command line args. Do you?
@@ -32,7 +31,6 @@ namespace Robust.Client
             var launcher = false;
             string? username = null;
             var cvars = new List<(string, string)>();
-            var logLevels = new List<(string, string)>();
             var mountOptions = new MountOptions();
 
             using var enumerator = args.GetEnumerator();
@@ -126,26 +124,6 @@ namespace Robust.Client
 
                     mountOptions.DirMounts.Add(enumerator.Current);
                 }
-                else if (arg == "--loglevel")
-                {
-                    if (!enumerator.MoveNext())
-                    {
-                        C.WriteLine("Missing loglevel sawmill.");
-                        return false;
-                    }
-
-                    var loglevel = enumerator.Current;
-                    DebugTools.AssertNotNull(loglevel);
-                    var pos = loglevel.IndexOf('=');
-
-                    if (pos == -1)
-                    {
-                        C.WriteLine("Expected = in loglevel.");
-                        return false;
-                    }
-
-                    logLevels.Add((loglevel[..pos], loglevel[(pos + 1)..]));
-                }
                 else if (arg == "--help")
                 {
                     PrintHelp();
@@ -164,7 +142,6 @@ namespace Robust.Client
                 launcher,
                 username,
                 cvars,
-                logLevels,
                 connectAddress,
                 ss14Address,
                 mountOptions);
@@ -185,7 +162,6 @@ Options:
   --launcher          Run in launcher mode (no main menu, auto connect).
   --username          Override username.
   --cvar              Specifies an additional cvar overriding the config file. Syntax is <key>=<value>
-  --loglevel          Specifies an additional sawmill log level overriding the default values. Syntax is <key>=<value>
   --mount-dir         Resource directory to mount.
   --mount-zip         Resource zip to mount.
   --help              Display this help text and exit.
@@ -199,7 +175,6 @@ Options:
             bool launcher,
             string? username,
             IReadOnlyCollection<(string key, string value)> cVars,
-            IReadOnlyCollection<(string key, string value)> logLevels,
             string connectAddress, string? ss14Address,
             MountOptions mountOptions)
         {
@@ -209,7 +184,6 @@ Options:
             Launcher = launcher;
             Username = username;
             CVars = cVars;
-            LogLevels = logLevels;
             ConnectAddress = connectAddress;
             Ss14Address = ss14Address;
             MountOptions = mountOptions;

Robust.Client/Console/ClientConsoleHost.cs

@@ -36,7 +36,7 @@ namespace Robust.Client.Console
             Message = message;
         }
     }
-
+    
     /// <inheritdoc cref="IClientConsoleHost" />
     internal class ClientConsoleHost : ConsoleHost, IClientConsoleHost
     {
@@ -45,9 +45,9 @@ namespace Robust.Client.Console
         /// <inheritdoc />
         public void Initialize()
         {
-            NetManager.RegisterNetMessage<MsgConCmdReg>(HandleConCmdReg);
-            NetManager.RegisterNetMessage<MsgConCmdAck>(HandleConCmdAck);
-            NetManager.RegisterNetMessage<MsgConCmd>(ProcessCommand);
+            NetManager.RegisterNetMessage<MsgConCmdReg>(MsgConCmdReg.NAME, HandleConCmdReg);
+            NetManager.RegisterNetMessage<MsgConCmdAck>(MsgConCmdAck.NAME, HandleConCmdAck);
+            NetManager.RegisterNetMessage<MsgConCmd>(MsgConCmd.NAME, ProcessCommand);
 
             Reset();
             LogManager.RootSawmill.AddHandler(new DebugConsoleLogHandler(this));

Robust.Client/Console/Commands/Scripting.cs

@@ -1,5 +1,6 @@
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
+using Robust.Shared.Localization;
 
 namespace Robust.Client.Console.Commands
 {
@@ -40,7 +41,7 @@ namespace Robust.Client.Console.Commands
             var mgr = IoCManager.Resolve<IScriptClient>();
             if (!mgr.CanScript)
             {
-                shell.WriteError("You do not have server side scripting permission.");
+                shell.WriteError(Loc.GetString("You do not have server side scripting permission."));
                 return;
             }
 

Robust.Client/Console/ScriptClient.cs

@@ -17,11 +17,11 @@ namespace Robust.Client.Console
 
         public void Initialize()
         {
-            _netManager.RegisterNetMessage<MsgScriptStop>();
-            _netManager.RegisterNetMessage<MsgScriptEval>();
-            _netManager.RegisterNetMessage<MsgScriptStart>();
-            _netManager.RegisterNetMessage<MsgScriptResponse>(ReceiveScriptResponse);
-            _netManager.RegisterNetMessage<MsgScriptStartAck>(ReceiveScriptStartAckResponse);
+            _netManager.RegisterNetMessage<MsgScriptStop>(MsgScriptStop.NAME);
+            _netManager.RegisterNetMessage<MsgScriptEval>(MsgScriptEval.NAME);
+            _netManager.RegisterNetMessage<MsgScriptStart>(MsgScriptStart.NAME);
+            _netManager.RegisterNetMessage<MsgScriptResponse>(MsgScriptResponse.NAME, ReceiveScriptResponse);
+            _netManager.RegisterNetMessage<MsgScriptStartAck>(MsgScriptStartAck.NAME, ReceiveScriptStartAckResponse);
         }
 
         private void ReceiveScriptStartAckResponse(MsgScriptStartAck message)

Robust.Client/Console/ScriptConsoleClient.cs

@@ -1,4 +1,5 @@
 #if CLIENT_SCRIPTING
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
@@ -13,6 +14,7 @@ using Microsoft.CodeAnalysis.Text;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.ViewVariables;
 using Robust.Shared.IoC;
+using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Reflection;
 using Robust.Shared.Scripting;
@@ -41,14 +43,14 @@ namespace Robust.Client.Console
 
         public ScriptConsoleClient()
         {
-            Title = "Robust C# Interactive (CLIENT)";
+            Title = Loc.GetString("Robust C# Interactive (CLIENT)");
             ScriptInstanceShared.InitDummy();
 
             _globals = new ScriptGlobalsImpl(this);
 
             IoCManager.InjectDependencies(this);
 
-            OutputPanel.AddText("Robust C# interactive console (CLIENT).");
+            OutputPanel.AddText(Loc.GetString(@"Robust C# interactive console (CLIENT)."));
             OutputPanel.AddText(">");
         }
 

Robust.Client/Console/WatchWindow.cs

@@ -8,6 +8,8 @@ using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
+using Robust.Shared.Localization;
+using Robust.Shared.Maths;
 using Robust.Shared.Reflection;
 using Robust.Shared.Scripting;
 using Robust.Shared.Timing;
@@ -29,7 +31,7 @@ namespace Robust.Client.Console
 
             ScriptInstanceShared.InitDummy();
 
-            Title = "Watch Window";
+            Title = Loc.GetString("Watch Window");
 
             var mainVBox = new VBoxContainer
             {
@@ -47,11 +49,11 @@ namespace Robust.Client.Console
                             (_addWatchEdit = new HistoryLineEdit
                             {
                                 HorizontalExpand = true,
-                                PlaceHolder = "Add watch (C# interactive)"
+                                PlaceHolder = Loc.GetString("Add watch (C# interactive)")
                             }),
                             (_addWatchButton = new Button
                             {
-                                Text = "Add"
+                                Text = Loc.GetString("Add")
                             })
                         }
                     }
@@ -116,7 +118,7 @@ namespace Robust.Client.Console
                         }),
                         (delButton = new Button
                         {
-                            Text = "Remove"
+                            Text = Loc.GetString("Remove")
                         }),
                     }
                 });
@@ -176,7 +178,7 @@ namespace Robust.Client.Console
                             ClipText = true,
                             HorizontalExpand = true
                         },
-                        (delButton = new Button {Text = "Remove"})
+                        (delButton = new Button {Text = Loc.GetString("Remove")})
                     }
                 });
 

Robust.Client/Debugging/DebugDrawing.cs

@@ -23,7 +23,7 @@ namespace Robust.Client.Debugging
         [Dependency] private readonly IOverlayManager _overlayManager = default!;
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly IEntityLookup _lookup = default!;
+        [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IInputManager _inputManager = default!;
 
@@ -70,7 +70,7 @@ namespace Robust.Client.Debugging
 
                 if (value && !_overlayManager.HasOverlay<EntityPositionOverlay>())
                 {
-                    _overlayManager.AddOverlay(new EntityPositionOverlay(_lookup, _eyeManager));
+                    _overlayManager.AddOverlay(new EntityPositionOverlay(_entityManager, _eyeManager));
                 }
                 else
                 {
@@ -130,17 +130,17 @@ namespace Robust.Client.Debugging
                 {
                     if (body != _hoverBodies[0])
                     {
-                        screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), "------");
+                        DrawString(screenHandle, _font, drawPos + new Vector2(0, row * lineHeight), "------");
                         row++;
                     }
 
-                    screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Ent: {body.Owner}");
+                    DrawString(screenHandle, _font, drawPos + new Vector2(0, row * lineHeight), $"Ent: {body.Owner}");
                     row++;
-                    screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Layer: {Convert.ToString(body.CollisionLayer, 2)}");
+                    DrawString(screenHandle, _font, drawPos + new Vector2(0, row * lineHeight), $"Layer: {Convert.ToString(body.CollisionLayer, 2)}");
                     row++;
-                    screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Mask: {Convert.ToString(body.CollisionMask, 2)}");
+                    DrawString(screenHandle, _font, drawPos + new Vector2(0, row * lineHeight), $"Mask: {Convert.ToString(body.CollisionMask, 2)}");
                     row++;
-                    screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Enabled: {body.CanCollide}, Hard: {body.Hard}, Anchored: {(body).BodyType == BodyType.Static}");
+                    DrawString(screenHandle, _font, drawPos + new Vector2(0, row * lineHeight), $"Enabled: {body.CanCollide}, Hard: {body.Hard}, Anchored: {(body).BodyType == BodyType.Static}");
                     row++;
                 }
 
@@ -171,7 +171,7 @@ namespace Robust.Client.Debugging
                     // all entities have a TransformComponent
                     var transform = physBody.Owner.Transform;
 
-                    var worldBox = physBody.GetWorldAABB();
+                    var worldBox = physBody.GetWorldAABB(_mapManager);
                     if (worldBox.IsEmpty()) continue;
 
                     foreach (var fixture in physBody.Fixtures)
@@ -199,6 +199,17 @@ namespace Robust.Client.Debugging
                 }
             }
 
+            private static void DrawString(DrawingHandleScreen handle, Font font, Vector2 pos, string str)
+            {
+                var baseLine = new Vector2(pos.X, font.GetAscent(1) + pos.Y);
+
+                foreach (var rune in str.EnumerateRunes())
+                {
+                    var advance = font.DrawChar(handle, rune, baseLine, 1, Color.White);
+                    baseLine += new Vector2(advance, 0);
+                }
+            }
+
             private class PhysDrawingAdapter : DebugDrawingHandle
             {
                 private readonly DrawingHandleWorld _handle;
@@ -259,14 +270,14 @@ namespace Robust.Client.Debugging
 
         private sealed class EntityPositionOverlay : Overlay
         {
-            private readonly IEntityLookup _lookup;
+            private readonly IEntityManager _entityManager;
             private readonly IEyeManager _eyeManager;
 
             public override OverlaySpace Space => OverlaySpace.WorldSpace;
 
-            public EntityPositionOverlay(IEntityLookup lookup, IEyeManager eyeManager)
+            public EntityPositionOverlay(IEntityManager entityManager, IEyeManager eyeManager)
             {
-                _lookup = lookup;
+                _entityManager = entityManager;
                 _eyeManager = eyeManager;
             }
 
@@ -275,17 +286,18 @@ namespace Robust.Client.Debugging
                 const float stubLength = 0.25f;
 
                 var worldHandle = (DrawingHandleWorld) args.DrawingHandle;
-                var viewport = _eyeManager.GetWorldViewport();
-
-                foreach (var entity in _lookup.GetEntitiesIntersecting(_eyeManager.CurrentMap, viewport))
+                foreach (var entity in _entityManager.GetEntities())
                 {
                     var transform = entity.Transform;
+                    if (transform.MapID != _eyeManager.CurrentMap ||
+                        !_eyeManager.GetWorldViewport().Contains(transform.WorldPosition))
+                    {
+                        continue;
+                    }
 
                     var center = transform.WorldPosition;
-                    var worldRotation = transform.WorldRotation;
-
-                    var xLine = worldRotation.RotateVec(Vector2.UnitX);
-                    var yLine = worldRotation.RotateVec(Vector2.UnitY);
+                    var xLine = transform.WorldRotation.RotateVec(Vector2.UnitX);
+                    var yLine = transform.WorldRotation.RotateVec(Vector2.UnitY);
 
                     worldHandle.DrawLine(center, center + xLine * stubLength, Color.Red);
                     worldHandle.DrawLine(center, center + yLine * stubLength, Color.Green);

Robust.Client/Debugging/DebugDrawingManager.cs

@@ -1,12 +1,12 @@
+using Robust.Shared.IoC;
+using Robust.Shared.Network.Messages;
 using System;
 using System.Collections.Generic;
 using Robust.Client.Graphics;
-using Robust.Shared.Enums;
-using Robust.Shared.IoC;
 using Robust.Shared.Maths;
-using Robust.Shared.Network;
-using Robust.Shared.Network.Messages;
 using Robust.Shared.Timing;
+using Robust.Shared.Enums;
+using Robust.Shared.Network;
 
 namespace Robust.Client.Debugging
 {
@@ -54,7 +54,7 @@ namespace Robust.Client.Debugging
 
         public void Initialize()
         {
-            _net.RegisterNetMessage<MsgRay>(HandleDrawRay);
+            _net.RegisterNetMessage<MsgRay>(MsgRay.NAME, HandleDrawRay);
         }
 
         private void HandleDrawRay(MsgRay msg)

Robust.Client/GameController/GameController.cs

@@ -82,7 +82,7 @@ namespace Robust.Client
             _commandLineArgs = args;
         }
 
-        internal bool StartupContinue(DisplayMode displayMode)
+        private bool StartupContinue(DisplayMode displayMode)
         {
             _clyde.InitializePostWindowing();
             _clyde.SetWindowTitle(Options.DefaultWindowTitle);
@@ -93,7 +93,7 @@ namespace Robust.Client
             // Disable load context usage on content start.
             // This prevents Content.Client being loaded twice and things like csi blowing up because of it.
             _modLoader.SetUseLoadContext(!ContentStart);
-            _modLoader.SetEnableSandboxing(Options.Sandboxing);
+            _modLoader.SetEnableSandboxing(false && Options.Sandboxing);
 
             if (!_modLoader.TryLoadModulesFrom(new ResourcePath("/Assemblies/"), Options.ContentModulePrefix))
             {
@@ -196,34 +196,12 @@ namespace Robust.Client
             return true;
         }
 
-        internal bool StartupSystemSplash(Func<ILogHandler>? logHandlerFactory)
+        private bool StartupSystemSplash(Func<ILogHandler>? logHandlerFactory)
         {
             ReadInitialLaunchState();
 
             SetupLogging(_logManager, logHandlerFactory ?? (() => new ConsoleLogHandler()));
 
-            if (_commandLineArgs != null)
-            {
-                foreach (var (sawmill, level) in _commandLineArgs.LogLevels)
-                {
-                    LogLevel? logLevel;
-                    if (level == "null")
-                        logLevel = null;
-                    else
-                    {
-                        if (!Enum.TryParse<LogLevel>(level, out var result))
-                        {
-                            System.Console.WriteLine($"LogLevel {level} does not exist!");
-                            continue;
-                        }
-                        logLevel = result;
-                    }
-                    _logManager.GetSawmill(sawmill).Level = logLevel;
-                }
-            }
-
-            ProgramShared.PrintRuntimeInfo(_logManager.RootSawmill);
-
             // Figure out user data directory.
             var userDataDir = GetUserDataDir();
 
@@ -471,7 +449,7 @@ namespace Robust.Client
             Clyde,
         }
 
-        internal void Cleanup()
+        private void Cleanup()
         {
             _networkManager.Shutdown("Client shutting down");
             _midiManager.Shutdown();

Robust.Client/GameObjects/ClientEntityManager.cs

@@ -1,10 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using JetBrains.Annotations;
 using Prometheus;
 using Robust.Client.GameStates;
-using Robust.Client.Player;
+using Robust.Shared.Exceptions;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
+using Robust.Shared.Log;
+using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Network.Messages;
 using Robust.Shared.Timing;
@@ -17,7 +21,6 @@ namespace Robust.Client.GameObjects
     /// </summary>
     public sealed class ClientEntityManager : EntityManager, IClientEntityManagerInternal
     {
-        [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IClientNetManager _networkManager = default!;
         [Dependency] private readonly IClientGameStateManager _gameStateManager = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
@@ -64,7 +67,7 @@ namespace Robust.Client.GameObjects
         /// <inheritdoc />
         public void SetupNetworking()
         {
-            _networkManager.RegisterNetMessage<MsgEntity>(HandleEntityNetworkMessage);
+            _networkManager.RegisterNetMessage<MsgEntity>(MsgEntity.NAME, HandleEntityNetworkMessage);
         }
 
         public override void TickUpdate(float frameTime, Histogram? histogram)
@@ -145,11 +148,7 @@ namespace Robust.Client.GameObjects
                     return;
 
                 case EntityMessageType.SystemMessage:
-                    var msg = message.SystemMessage;
-                    var sessionType = typeof(EntitySessionMessage<>).MakeGenericType(msg.GetType());
-                    var sessionMsg = Activator.CreateInstance(sessionType, new EntitySessionEventArgs(_playerManager.LocalPlayer!.Session), msg)!;
-                    ReceivedSystemMessage?.Invoke(this, msg);
-                    ReceivedSystemMessage?.Invoke(this, sessionMsg);
+                    ReceivedSystemMessage?.Invoke(this, message.SystemMessage);
                     return;
             }
         }

Robust.Client/GameObjects/Components/Appearance/AppearanceComponent.cs

@@ -104,7 +104,7 @@ namespace Robust.Client.GameObjects
             _appearanceDirty = false;
         }
 
-        protected override void Initialize()
+        public override void Initialize()
         {
             base.Initialize();
 

Robust.Client/GameObjects/Components/Eye/EyeComponent.cs

@@ -116,7 +116,7 @@ namespace Robust.Client.GameObjects
         public MapCoordinates? Position => _eye?.Position;
 
         /// <inheritdoc />
-        protected override void Initialize()
+        public override void Initialize()
         {
             base.Initialize();
 
@@ -156,7 +156,7 @@ namespace Robust.Client.GameObjects
             VisibilityMask = state.VisibilityMask;
         }
 
-        protected override void OnRemove()
+        public override void OnRemove()
         {
             base.OnRemove();
 

Robust.Client/GameObjects/Components/Light/ClientOccluderComponent.cs

@@ -34,11 +34,11 @@ namespace Robust.Client.GameObjects
 
             if (Owner.Transform.Anchored)
             {
-                AnchorStateChanged();
+                SnapGridOnPositionChanged();
             }
         }
 
-        public void AnchorStateChanged()
+        public void SnapGridOnPositionChanged()
         {
             SendDirty();
 

Robust.Client/GameObjects/Components/Light/PointLightComponent.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
@@ -44,29 +44,11 @@ namespace Robust.Client.GameObjects
         public bool Enabled
         {
             get => _enabled;
-            set
-            {
-                if (_enabled == value) return;
-
-                _enabled = value;
-                Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new PointLightUpdateEvent());
-            }
+            set => _enabled = value;
         }
 
         [ViewVariables(VVAccess.ReadWrite)]
-        public bool ContainerOccluded
-        {
-            get => _containerOccluded;
-            set
-            {
-                if (_containerOccluded == value) return;
-
-                _containerOccluded = value;
-                Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new PointLightUpdateEvent());
-            }
-        }
-
-        private bool _containerOccluded;
+        public bool ContainerOccluded { get; set; }
 
         /// <summary>
         ///     Determines if the light mask should automatically rotate with the entity. (like a flashlight)
@@ -135,13 +117,30 @@ namespace Robust.Client.GameObjects
         public bool VisibleNested
         {
             get => _visibleNested;
-            set => _visibleNested = value;
+            set
+            {
+                if (_visibleNested == value) return;
+                _visibleNested = value;
+                if (value)
+                {
+                    if (Owner.Transform.Parent == null) return;
+
+                    _lightOnParent = true;
+                }
+                else
+                {
+                    if (!_lightOnParent) return;
+
+                    _lightOnParent = false;
+                }
+            }
         }
 
         [DataField("radius")]
         private float _radius = 5f;
         [DataField("nestedvisible")]
         private bool _visibleNested = true;
+        private bool _lightOnParent;
         [DataField("color")]
         private Color _color = Color.White;
         [DataField("offset")]
@@ -201,13 +200,42 @@ namespace Robust.Client.GameObjects
             }
         }
 
-        protected override void Initialize()
+        public override void Initialize()
         {
             base.Initialize();
             UpdateMask();
         }
 
-        protected override void OnRemove()
+        /// <inheritdoc />
+        public override void HandleMessage(ComponentMessage message, IComponent? component)
+        {
+            base.HandleMessage(message, component);
+
+            if (message is ParentChangedMessage msg)
+            {
+                HandleTransformParentChanged(msg);
+            }
+        }
+
+        private void HandleTransformParentChanged(ParentChangedMessage obj)
+        {
+            // TODO: this does not work for things nested multiply layers deep.
+            if (!VisibleNested)
+            {
+                return;
+            }
+
+            if (obj.NewParent != null && obj.NewParent.IsValid())
+            {
+                _lightOnParent = true;
+            }
+            else
+            {
+                _lightOnParent = false;
+            }
+        }
+
+        public override void OnRemove()
         {
             base.OnRemove();
 
@@ -242,9 +270,4 @@ namespace Robust.Client.GameObjects
             PointLightComponent = pointLightComponent;
         }
     }
-
-    internal sealed class PointLightUpdateEvent : EntityEventArgs
-    {
-
-    }
 }

Robust.Client/GameObjects/Components/Renderable/SpriteComponent.cs

@@ -42,13 +42,7 @@ namespace Robust.Client.GameObjects
         public override bool Visible
         {
             get => _visible;
-            set
-            {
-                if (_visible == value) return;
-                _visible = value;
-
-                Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new SpriteUpdateEvent());
-            }
+            set => _visible = value;
         }
 
         [DataField("drawdepth", customTypeSerializer: typeof(ConstantSerializer<DrawDepthTag>))]
@@ -158,7 +152,7 @@ namespace Robust.Client.GameObjects
             }
             set
             {
-                if (value == null) return;
+                if(value == null) return;
 
                 Layers.Clear();
                 foreach (var layerDatum in value)
@@ -168,12 +162,11 @@ namespace Robust.Client.GameObjects
                     if (!string.IsNullOrWhiteSpace(layerDatum.RsiPath))
                     {
                         var path = TextureRoot / layerDatum.RsiPath;
-
-                        if (IoCManager.Resolve<IResourceCache>().TryGetResource(path, out RSIResource? resource))
+                        try
                         {
-                            layer.RSI = resource.RSI;
+                            layer.RSI = IoCManager.Resolve<IResourceCache>().GetResource<RSIResource>(path).RSI;
                         }
-                        else
+                        catch
                         {
                             Logger.ErrorS(LogCategory, "Unable to load layer RSI '{0}'.", path);
                         }
@@ -272,7 +265,7 @@ namespace Robust.Client.GameObjects
                 }
 
                 _layerMapShared = true;
-                QueueUpdateIsInert();
+                UpdateIsInert();
             }
         }
 
@@ -315,30 +308,17 @@ namespace Robust.Client.GameObjects
         }
 
         [DataField("sprite", readOnly: true)] private string? rsi;
-        [DataField("layers", readOnly: true)] private List<PrototypeLayerData> layerDatums = new();
+        [DataField("layers", readOnly: true)] private List<PrototypeLayerData> layerDatums = new ();
 
         [DataField("state", readOnly: true)] private string? state;
         [DataField("texture", readOnly: true)] private string? texture;
 
         [ViewVariables(VVAccess.ReadWrite)]
-        public bool ContainerOccluded
-        {
-            get => _containerOccluded;
-            set
-            {
-                if (_containerOccluded == value) return;
-                _containerOccluded = value;
-                Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new SpriteUpdateEvent());
-            }
-        }
-
-        private bool _containerOccluded;
+        public bool ContainerOccluded { get; set; }
 
         [ViewVariables(VVAccess.ReadWrite)]
         public bool TreeUpdateQueued { get; set; }
 
-        [ViewVariables(VVAccess.ReadWrite)] private bool _inertUpdateQueued;
-
         [ViewVariables(VVAccess.ReadWrite)]
         public ShaderInstance? PostShader { get; set; }
 
@@ -368,13 +348,13 @@ namespace Robust.Client.GameObjects
                 if (!string.IsNullOrWhiteSpace(rsi))
                 {
                     var rsiPath = TextureRoot / rsi;
-                    if(IoCManager.Resolve<IResourceCache>().TryGetResource(rsiPath, out RSIResource? resource))
+                    try
                     {
-                        BaseRSI = resource.RSI;
+                        BaseRSI = IoCManager.Resolve<IResourceCache>().GetResource<RSIResource>(rsiPath).RSI;
                     }
-                    else
+                    catch (Exception e)
                     {
-                        Logger.ErrorS(LogCategory, "Unable to load RSI '{0}'. Trace:\n{1}", rsiPath);
+                        Logger.ErrorS(SpriteComponent.LogCategory, "Unable to load RSI '{0}'. Trace:\n{1}", rsiPath, e);
                     }
                 }
             }
@@ -502,7 +482,7 @@ namespace Robust.Client.GameObjects
 
         public int AddBlankLayer(int? newIndex = null)
         {
-            var layer = new Layer(this) { Visible = false };
+            var layer = new Layer(this) {Visible = false};
             return AddLayer(layer, newIndex);
         }
 
@@ -531,13 +511,13 @@ namespace Robust.Client.GameObjects
 
         public int AddLayer(Texture? texture, int? newIndex = null)
         {
-            var layer = new Layer(this) { Texture = texture };
+            var layer = new Layer(this) {Texture = texture};
             return AddLayer(layer, newIndex);
         }
 
         public int AddLayer(RSI.StateId stateId, int? newIndex = null)
         {
-            var layer = new Layer(this) { State = stateId };
+            var layer = new Layer(this) {State = stateId};
             if (BaseRSI != null && BaseRSI.TryGetState(stateId, out var state))
             {
                 layer.AnimationTimeLeft = state.GetDelay(0);
@@ -583,7 +563,7 @@ namespace Robust.Client.GameObjects
 
         public int AddLayer(RSI.StateId stateId, RSI? rsi, int? newIndex = null)
         {
-            var layer = new Layer(this) { State = stateId, RSI = rsi };
+            var layer = new Layer(this) {State = stateId, RSI = rsi};
             if (rsi != null && rsi.TryGetState(stateId, out var state))
             {
                 layer.AnimationTimeLeft = state.GetDelay(0);
@@ -639,7 +619,7 @@ namespace Robust.Client.GameObjects
                 index = Layers.Count - 1;
             }
 
-            QueueUpdateIsInert();
+            UpdateIsInert();
             return index;
         }
 
@@ -666,7 +646,7 @@ namespace Robust.Client.GameObjects
                 }
             }
 
-            QueueUpdateIsInert();
+            UpdateIsInert();
         }
 
         public void RemoveLayer(object layerKey)
@@ -1308,8 +1288,8 @@ namespace Robust.Client.GameObjects
 
             var layerColor = color * layer.Color;
 
-            var position = -(Vector2)texture.Size / (2f * EyeManager.PixelsPerMeter) + layer.Offset;
-            var textureSize = texture.Size / (float)EyeManager.PixelsPerMeter;
+            var position = -(Vector2) texture.Size / (2f * EyeManager.PixelsPerMeter) + layer.Offset;
+            var textureSize = texture.Size / (float) EyeManager.PixelsPerMeter;
             var quad = Box2.FromDimensions(position, textureSize);
 
             // TODO: Implement layer-specific rotation and scale.
@@ -1329,7 +1309,7 @@ namespace Robust.Client.GameObjects
         public static Angle CalcRectWorldAngle(Angle worldAngle, int numDirections)
         {
             var theta = worldAngle.Theta;
-            var segSize = (MathF.PI * 2) / (numDirections * 2);
+            var segSize = (MathF.PI*2) / (numDirections * 2);
             var segments = (int)(theta / segSize);
             var odd = segments % 2;
             var result = theta - (segments * segSize) - (odd * segSize);
@@ -1379,6 +1359,18 @@ namespace Robust.Client.GameObjects
             return texture;
         }
 
+        public override void OnRemove()
+        {
+            base.OnRemove();
+
+            var map = Owner.Transform.MapID;
+            if (map != MapId.Nullspace)
+            {
+                Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local,
+                    new RenderTreeRemoveSpriteEvent(this, map));
+            }
+        }
+
         public void FrameUpdate(float delta)
         {
             foreach (var t in Layers)
@@ -1429,7 +1421,7 @@ namespace Robust.Client.GameObjects
             if (curState == null)
                 return;
 
-            var thestate = (SpriteComponentState)curState;
+            var thestate = (SpriteComponentState) curState;
 
             Visible = thestate.Visible;
             DrawDepth = thestate.DrawDepth;
@@ -1517,20 +1509,8 @@ namespace Robust.Client.GameObjects
             };
         }
 
-        private void QueueUpdateIsInert()
+        private void UpdateIsInert()
         {
-            if (_inertUpdateQueued)
-                return;
-
-            _inertUpdateQueued = true;
-            // Yes that null check is valid because of that stupid fucking dummy IEntity.
-            // Who thought that was a good idea.
-            Owner?.EntityManager?.EventBus?.RaiseEvent(EventSource.Local, new SpriteUpdateInertEvent {Sprite = this});
-        }
-
-        internal void DoUpdateIsInert()
-        {
-            _inertUpdateQueued = false;
             IsInert = true;
 
             foreach (var layer in Layers)
@@ -1880,14 +1860,14 @@ namespace Robust.Client.GameObjects
             {
                 AutoAnimated = value;
 
-                _parent.QueueUpdateIsInert();
+                _parent.UpdateIsInert();
             }
 
             public void SetVisible(bool value)
             {
                 Visible = value;
 
-                _parent.QueueUpdateIsInert();
+                _parent.UpdateIsInert();
             }
 
             public void SetRsi(RSI? rsi)
@@ -1919,7 +1899,7 @@ namespace Robust.Client.GameObjects
                     }
                 }
 
-                _parent.QueueUpdateIsInert();
+                _parent.UpdateIsInert();
             }
 
             public void SetState(RSI.StateId stateId)
@@ -1951,7 +1931,7 @@ namespace Robust.Client.GameObjects
                 AnimationTime = 0;
                 AnimationTimeLeft = state.GetDelay(0);
 
-                _parent.QueueUpdateIsInert();
+                _parent.UpdateIsInert();
             }
 
             public void SetTexture(Texture? texture)
@@ -1959,7 +1939,7 @@ namespace Robust.Client.GameObjects
                 State = default;
                 Texture = texture;
 
-                _parent.QueueUpdateIsInert();
+                _parent.UpdateIsInert();
             }
 
             public void SetOffset(Vector2 offset)
@@ -2011,13 +1991,13 @@ namespace Robust.Client.GameObjects
             switch (layerProp)
             {
                 case "texture":
-                    LayerSetTexture(index, (string)value);
+                    LayerSetTexture(index, (string) value);
                     return;
                 case "state":
-                    LayerSetState(index, (string)value);
+                    LayerSetState(index, (string) value);
                     return;
                 case "color":
-                    LayerSetColor(index, (Color)value);
+                    LayerSetColor(index, (Color) value);
                     return;
                 default:
                     throw new ArgumentException($"Unknown layer property '{layerProp}'");
@@ -2062,7 +2042,7 @@ namespace Robust.Client.GameObjects
                 yield break;
             }
 
-            var dummy = new DummyIconEntity { Prototype = prototype };
+            var dummy = new DummyIconEntity {Prototype = prototype};
             var spriteComponent = dummy.AddComponent<SpriteComponent>();
 
             if (prototype.Components.TryGetValue("Appearance", out _))
@@ -2106,7 +2086,7 @@ namespace Robust.Client.GameObjects
                 return GetFallbackState(resourceCache);
             }
 
-            var dummy = new DummyIconEntity { Prototype = prototype };
+            var dummy = new DummyIconEntity {Prototype = prototype};
             var spriteComponent = dummy.AddComponent<SpriteComponent>();
             dummy.Delete();
 
@@ -2143,7 +2123,7 @@ namespace Robust.Client.GameObjects
             {
                 var typeFactory = IoCManager.Resolve<IDynamicTypeFactoryInternal>();
                 var serializationManager = IoCManager.Resolve<ISerializationManager>();
-                var comp = (T)typeFactory.CreateInstanceUnchecked(typeof(T));
+                var comp = (T) typeFactory.CreateInstanceUnchecked(typeof(T));
                 _components[typeof(T)] = comp;
                 comp.Owner = this;
 
@@ -2177,7 +2157,7 @@ namespace Robust.Client.GameObjects
 
             public T GetComponent<T>()
             {
-                return (T)_components[typeof(T)];
+                return (T) _components[typeof(T)];
             }
 
             public IComponent GetComponent(Type type)
@@ -2189,7 +2169,7 @@ namespace Robust.Client.GameObjects
             {
                 component = null;
                 if (!_components.TryGetValue(typeof(T), out var value)) return false;
-                component = (T)value;
+                component = (T) value;
                 return true;
             }
 
@@ -2245,14 +2225,4 @@ namespace Robust.Client.GameObjects
         }
         #endregion
     }
-
-    internal sealed class SpriteUpdateEvent : EntityEventArgs
-    {
-
-    }
-
-    internal struct SpriteUpdateInertEvent
-    {
-        public SpriteComponent Sprite;
-    }
 }

Robust.Client/GameObjects/EntitySystems/AudioSystem.cs

@@ -254,7 +254,7 @@ namespace Robust.Client.GameObjects
             if (!source.SetPosition(entity.Transform.WorldPosition))
             {
                 source.Dispose();
-                Logger.Warning($"Can't play positional audio \"{stream.Name}\", can't set position.");
+                Logger.Warning("Can't play positional audio, can't set position.");
                 return null;
             }
 
@@ -301,7 +301,7 @@ namespace Robust.Client.GameObjects
             if (!source.SetPosition(coordinates.ToMapPos(EntityManager)))
             {
                 source.Dispose();
-                Logger.Warning("Can't play positional audio \"{stream.Name}\", can't set position.");
+                Logger.Warning("Can't play positional audio, can't set position.");
                 return null;
             }
 

Robust.Client/GameObjects/EntitySystems/ClientOccluderSystem.cs

@@ -35,7 +35,7 @@ namespace Robust.Client.GameObjects
 
             SubscribeLocalEvent<OccluderDirtyEvent>(HandleDirtyEvent);
 
-            SubscribeLocalEvent<ClientOccluderComponent, AnchorStateChangedEvent>(HandleAnchorChanged);
+            SubscribeLocalEvent<ClientOccluderComponent, SnapGridPositionChangedEvent>(HandleSnapGridMove);
         }
 
         public override void FrameUpdate(float frameTime)
@@ -62,9 +62,9 @@ namespace Robust.Client.GameObjects
             }
         }
 
-        private static void HandleAnchorChanged(EntityUid uid, ClientOccluderComponent component, AnchorStateChangedEvent args)
+        private static void HandleSnapGridMove(EntityUid uid, ClientOccluderComponent component, SnapGridPositionChangedEvent args)
         {
-            component.AnchorStateChanged();
+            component.SnapGridOnPositionChanged();
         }
 
         private void HandleDirtyEvent(OccluderDirtyEvent ev)

Robust.Client/GameObjects/EntitySystems/DebugGridTileLookupSystem.cs

@@ -1,134 +0,0 @@
-#if DEBUG
-using System;
-using System.Text;
-using Robust.Client.Graphics;
-using Robust.Client.Input;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Console;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Map;
-using Robust.Shared.Maths;
-
-namespace Robust.Client.GameObjects
-{
-    internal sealed class DebugGridTileLookupSystem : EntitySystem
-    {
-        [Dependency] private readonly IEyeManager _eyeManager = default!;
-        [Dependency] private readonly IInputManager _inputManager = default!;
-        [Dependency] private readonly IMapManager _mapManager = default!;
-
-        public bool Enabled
-        {
-            get => _enabled;
-            set
-            {
-                if (_enabled == value) return;
-                _enabled = value;
-
-                if (_enabled)
-                {
-                    _label.Visible = true;
-                    LastTile = default;
-                }
-                else
-                {
-                    _label.Text = null;
-                    _label.Visible = false;
-                }
-            }
-        }
-
-        private bool _enabled;
-
-        private (GridId Grid, Vector2i Indices) LastTile;
-
-        // Label and shit that follows cursor
-        private Label _label = new()
-        {
-            Visible = false,
-        };
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeNetworkEvent<SendGridTileLookupMessage>(HandleSentEntities);
-            IoCManager.Resolve<IUserInterfaceManager>().StateRoot.AddChild(_label);
-        }
-
-        public override void Shutdown()
-        {
-            base.Shutdown();
-            UnsubscribeNetworkEvent<SendGridTileLookupMessage>();
-            IoCManager.Resolve<IUserInterfaceManager>().StateRoot.RemoveChild(_label);
-        }
-
-        private void RequestEntities(GridId gridId, Vector2i indices)
-        {
-            if (gridId == GridId.Invalid) return;
-            RaiseNetworkEvent(new RequestGridTileLookupMessage(gridId, indices));
-        }
-
-        private void HandleSentEntities(SendGridTileLookupMessage message)
-        {
-            if (!Enabled) return;
-            var text = new StringBuilder();
-            text.AppendLine($"GridId: {LastTile.Grid}, Tile: {LastTile.Indices}");
-
-            for (var i = 0; i < message.Entities.Count; i++)
-            {
-                var uid = message.Entities[i];
-
-                if (!EntityManager.TryGetEntity(uid, out var entity)) continue;
-
-                text.AppendLine(entity.ToString());
-            }
-
-            _label.Text = text.ToString();
-        }
-
-        public override void FrameUpdate(float frameTime)
-        {
-            base.FrameUpdate(frameTime);
-            if (!Enabled) return;
-
-            var mousePos = _inputManager.MouseScreenPosition;
-            var worldPos = _eyeManager.ScreenToMap(mousePos);
-
-            GridId gridId;
-            Vector2i tile;
-
-            if (_mapManager.TryFindGridAt(worldPos, out var grid))
-            {
-                gridId = grid.Index;
-                tile = grid.WorldToTile(worldPos.Position);
-            }
-            else
-            {
-                gridId = GridId.Invalid;
-                tile = new Vector2i((int) MathF.Floor(worldPos.Position.X), (int) MathF.Floor(worldPos.Position.Y));
-            }
-
-            LayoutContainer.SetPosition(_label, mousePos.Position);
-
-            if ((gridId, tile).Equals(LastTile)) return;
-
-            _label.Text = null;
-            LastTile = (gridId, tile);
-            RequestEntities(gridId, tile);
-        }
-    }
-
-    internal sealed class RequestTileEntities : IConsoleCommand
-    {
-        public string Command => "tilelookup";
-        public string Description => "Used for debugging GridTileLookupSystem";
-        public string Help => $"{Command}";
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
-        {
-            EntitySystem.Get<DebugGridTileLookupSystem>().Enabled ^= true;
-        }
-    }
-}
-#endif

Robust.Client/GameObjects/EntitySystems/InputSystem.cs

@@ -173,24 +173,4 @@ namespace Robust.Client.GameObjects
             AttachedEntity = attachedEntity;
         }
     }
-
-    public class PlayerAttachedEvent : EntityEventArgs
-    {
-        public PlayerAttachedEvent(IEntity entity)
-        {
-            Entity = entity;
-        }
-
-        public IEntity Entity { get; }
-    }
-
-    public class PlayerDetachedEvent : EntityEventArgs
-    {
-        public PlayerDetachedEvent(IEntity entity)
-        {
-            Entity = entity;
-        }
-
-        public IEntity Entity { get; }
-    }
 }

Robust.Client/GameObjects/EntitySystems/RenderingTreeSystem.cs

@@ -27,8 +27,6 @@ namespace Robust.Client.GameObjects
         private readonly List<SpriteComponent> _spriteQueue = new();
         private readonly List<PointLightComponent> _lightQueue = new();
 
-        private HashSet<EntityUid> _checkedChildren = new();
-
         internal DynamicTree<SpriteComponent> GetSpriteTreeForMap(MapId map, GridId grid)
         {
             return _gridTrees[map][grid].SpriteTree;
@@ -52,58 +50,16 @@ namespace Robust.Client.GameObjects
             _mapManager.OnGridCreated += MapManagerOnGridCreated;
             _mapManager.OnGridRemoved += MapManagerOnGridRemoved;
 
-            // Due to how recursion works, this must be done.
-            SubscribeLocalEvent<MoveEvent>(AnythingMoved);
-
             SubscribeLocalEvent<SpriteComponent, EntMapIdChangedMessage>(SpriteMapChanged);
+            SubscribeLocalEvent<SpriteComponent, MoveEvent>(SpriteMoved);
             SubscribeLocalEvent<SpriteComponent, EntParentChangedMessage>(SpriteParentChanged);
-            SubscribeLocalEvent<SpriteComponent, ComponentRemove>(RemoveSprite);
-            SubscribeLocalEvent<SpriteComponent, SpriteUpdateEvent>(HandleSpriteUpdate);
+            SubscribeLocalEvent<SpriteComponent, RenderTreeRemoveSpriteEvent>(RemoveSprite);
 
             SubscribeLocalEvent<PointLightComponent, EntMapIdChangedMessage>(LightMapChanged);
+            SubscribeLocalEvent<PointLightComponent, MoveEvent>(LightMoved);
             SubscribeLocalEvent<PointLightComponent, EntParentChangedMessage>(LightParentChanged);
             SubscribeLocalEvent<PointLightComponent, PointLightRadiusChangedEvent>(PointLightRadiusChanged);
             SubscribeLocalEvent<PointLightComponent, RenderTreeRemoveLightEvent>(RemoveLight);
-            SubscribeLocalEvent<PointLightComponent, PointLightUpdateEvent>(HandleLightUpdate);
-        }
-
-        private void HandleLightUpdate(EntityUid uid, PointLightComponent component, PointLightUpdateEvent args)
-        {
-            if (component.TreeUpdateQueued) return;
-            QueueLightUpdate(component);
-        }
-
-        private void HandleSpriteUpdate(EntityUid uid, SpriteComponent component, SpriteUpdateEvent args)
-        {
-            if (component.TreeUpdateQueued) return;
-            QueueSpriteUpdate(component);
-        }
-
-        private void AnythingMoved(MoveEvent args)
-        {
-            AnythingMovedSubHandler(args.Sender.Transform);
-        }
-
-        private void AnythingMovedSubHandler(ITransformComponent sender)
-        {
-            // To avoid doing redundant updates (and we don't need to update a grid's children ever)
-            if (!_checkedChildren.Add(sender.Owner.Uid) ||
-                sender.Owner.HasComponent<MapGridComponent>() ||
-                sender.Owner.HasComponent<MapComponent>()) return;
-
-            // This recursive search is needed, as MoveEvent is defined to not care about indirect events like children.
-            // WHATEVER YOU DO, DON'T REPLACE THIS WITH SPAMMING EVENTS UNLESS YOU HAVE A GUARANTEE IT WON'T LAG THE GC.
-            // (Struct-based events ok though)
-            if (sender.Owner.TryGetComponent(out SpriteComponent? sprite))
-                QueueSpriteUpdate(sprite);
-
-            if (sender.Owner.TryGetComponent(out PointLightComponent? light))
-                QueueLightUpdate(light);
-
-            foreach (ITransformComponent child in sender.Children)
-            {
-                AnythingMovedSubHandler(child);
-            }
         }
 
         // For the RemoveX methods
@@ -117,12 +73,17 @@ namespace Robust.Client.GameObjects
             QueueSpriteUpdate(component);
         }
 
+        private void SpriteMoved(EntityUid uid, SpriteComponent component, MoveEvent args)
+        {
+            QueueSpriteUpdate(component);
+        }
+
         private void SpriteParentChanged(EntityUid uid, SpriteComponent component, EntParentChangedMessage args)
         {
             QueueSpriteUpdate(component);
         }
 
-        private void RemoveSprite(EntityUid uid, SpriteComponent component, ComponentRemove args)
+        private void RemoveSprite(EntityUid uid, SpriteComponent component, RenderTreeRemoveSpriteEvent args)
         {
             ClearSprite(component);
         }
@@ -147,6 +108,22 @@ namespace Robust.Client.GameObjects
 
             component.TreeUpdateQueued = true;
             _spriteQueue.Add(component);
+
+            foreach (var child in component.Owner.Transform.Children)
+            {
+                QueueSpriteUpdate(child.Owner);
+            }
+        }
+
+        private void QueueSpriteUpdate(IEntity entity)
+        {
+            if (!entity.TryGetComponent(out SpriteComponent? spriteComponent)) return;
+            QueueSpriteUpdate(spriteComponent);
+
+            foreach (var child in entity.Transform.Children)
+            {
+                QueueSpriteUpdate(child.Owner);
+            }
         }
         #endregion
 
@@ -156,6 +133,11 @@ namespace Robust.Client.GameObjects
             QueueLightUpdate(component);
         }
 
+        private void LightMoved(EntityUid uid, PointLightComponent component, MoveEvent args)
+        {
+            QueueLightUpdate(component);
+        }
+
         private void LightParentChanged(EntityUid uid, PointLightComponent component, EntParentChangedMessage args)
         {
             QueueLightUpdate(component);
@@ -191,6 +173,22 @@ namespace Robust.Client.GameObjects
 
             component.TreeUpdateQueued = true;
             _lightQueue.Add(component);
+
+            foreach (var child in component.Owner.Transform.Children)
+            {
+                QueueLightUpdate(child.Owner);
+            }
+        }
+
+        private void QueueLightUpdate(IEntity entity)
+        {
+            if (!entity.TryGetComponent(out PointLightComponent? lightComponent)) return;
+            QueueLightUpdate(lightComponent);
+
+            foreach (var child in entity.Transform.Children)
+            {
+                QueueLightUpdate(child.Owner);
+            }
         }
         #endregion
 
@@ -265,19 +263,10 @@ namespace Robust.Client.GameObjects
 
         public override void FrameUpdate(float frameTime)
         {
-            _checkedChildren.Clear();
-
             foreach (var sprite in _spriteQueue)
             {
-                sprite.TreeUpdateQueued = false;
                 var mapId = sprite.Owner.Transform.MapID;
 
-                if (!sprite.Visible || sprite.ContainerOccluded)
-                {
-                    ClearSprite(sprite);
-                    continue;
-                }
-
                 // If we're on a new map then clear the old one.
                 if (sprite.IntersectingMapId != mapId)
                 {
@@ -313,19 +302,14 @@ namespace Robust.Client.GameObjects
 
                     sprite.IntersectingGrids.Add(gridId);
                 }
+
+                sprite.TreeUpdateQueued = false;
             }
 
             foreach (var light in _lightQueue)
             {
-                light.TreeUpdateQueued = false;
                 var mapId = light.Owner.Transform.MapID;
 
-                if (!light.Enabled || light.ContainerOccluded)
-                {
-                    ClearLight(light);
-                    continue;
-                }
-
                 // If we're on a new map then clear the old one.
                 if (light.IntersectingMapId != mapId)
                 {
@@ -341,7 +325,7 @@ namespace Robust.Client.GameObjects
                 var intersectingGrids = _mapManager.FindGridIdsIntersecting(mapId, aabb, true).ToList();
 
                 // Remove from old
-                foreach (var gridId in light.IntersectingGrids)
+                foreach (var gridId in intersectingGrids)
                 {
                     if (intersectingGrids.Contains(gridId)) continue;
                     mapTree[gridId].LightTree.Remove(light);
@@ -360,6 +344,8 @@ namespace Robust.Client.GameObjects
                     mapTree[gridId].LightTree.AddOrUpdate(light, translated);
                     light.IntersectingGrids.Add(gridId);
                 }
+
+                light.TreeUpdateQueued = false;
             }
 
             _spriteQueue.Clear();
@@ -394,6 +380,18 @@ namespace Robust.Client.GameObjects
         }
     }
 
+    internal class RenderTreeRemoveSpriteEvent : EntityEventArgs
+    {
+        public RenderTreeRemoveSpriteEvent(SpriteComponent sprite, MapId map)
+        {
+            Sprite = sprite;
+            Map = map;
+        }
+
+        public SpriteComponent Sprite { get; }
+        public MapId Map { get; }
+    }
+
     internal class RenderTreeRemoveLightEvent : EntityEventArgs
     {
         public RenderTreeRemoveLightEvent(PointLightComponent light, MapId map)

Robust.Client/GameObjects/EntitySystems/SpriteSystem.cs

@@ -1,9 +1,9 @@
-using System.Collections.Generic;
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Robust.Client.Graphics;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
+using Robust.Shared.Maths;
 
 namespace Robust.Client.GameObjects
 {
@@ -17,29 +17,16 @@ namespace Robust.Client.GameObjects
         [Dependency] private readonly IMapManager _mapManager = default!;
 
         private RenderingTreeSystem _treeSystem = default!;
-        private readonly Queue<SpriteComponent> _inertUpdateQueue = new();
 
         public override void Initialize()
         {
             base.Initialize();
-
             _treeSystem = Get<RenderingTreeSystem>();
-            SubscribeLocalEvent<SpriteUpdateInertEvent>(QueueUpdateInert);
-        }
-
-        private void QueueUpdateInert(SpriteUpdateInertEvent ev)
-        {
-            _inertUpdateQueue.Enqueue(ev.Sprite);
         }
 
         /// <inheritdoc />
         public override void FrameUpdate(float frameTime)
         {
-            while (_inertUpdateQueue.TryDequeue(out var sprite))
-            {
-                sprite.DoUpdateIsInert();
-            }
-
             // So we could calculate the correct size of the entities based on the contents of their sprite...
             // Or we can just assume that no entity is larger than 10x10 and get a stupid easy check.
             var pvsBounds = _eyeManager.GetWorldViewport().Enlarged(5);

Robust.Client/GameObjects/IClientEntityManager.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using Robust.Shared.GameObjects;
 
 namespace Robust.Client.GameObjects

Robust.Client/GameObjects/PlayerMessages.cs

@@ -0,0 +1,17 @@
+using System;
+using Robust.Shared.GameObjects;
+
+namespace Robust.Client.GameObjects
+{
+    [Obsolete("Component Messages are deprecated, use Entity Events instead.")]
+    public class PlayerAttachedMsg : ComponentMessage
+    {
+
+    }
+
+    [Obsolete("Component Messages are deprecated, use Entity Events instead.")]
+    public class PlayerDetachedMsg : ComponentMessage
+    {
+
+    }
+}

Robust.Client/GameStates/ClientGameStateManager.cs

@@ -1,5 +1,3 @@
-// ReSharper disable once RedundantUsingDirective
-// Used in EXCEPTION_TOLERANCE preprocessor
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -7,18 +5,19 @@ using System.Linq;
 using Robust.Client.GameObjects;
 using Robust.Client.Input;
 using Robust.Client.Map;
+using Robust.Shared.GameStates;
+using Robust.Shared.IoC;
+using Robust.Shared.Network.Messages;
 using Robust.Client.Player;
 using Robust.Client.Timing;
 using Robust.Shared;
 using Robust.Shared.Configuration;
 using Robust.Shared.Exceptions;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameStates;
 using Robust.Shared.Input;
-using Robust.Shared.IoC;
 using Robust.Shared.Log;
+using Robust.Shared.Map;
 using Robust.Shared.Network;
-using Robust.Shared.Network.Messages;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
@@ -81,8 +80,8 @@ namespace Robust.Client.GameStates
         {
             _processor = new GameStateProcessor(_timing);
 
-            _network.RegisterNetMessage<MsgState>(HandleStateMessage);
-            _network.RegisterNetMessage<MsgStateAck>();
+            _network.RegisterNetMessage<MsgState>(MsgState.NAME, HandleStateMessage);
+            _network.RegisterNetMessage<MsgStateAck>(MsgStateAck.NAME);
             _client.RunLevelChanged += RunLevelChanged;
 
             _config.OnValueChanged(CVars.NetInterp, b => _processor.Interpolation = b, true);
@@ -319,8 +318,6 @@ namespace Robust.Client.GameStates
 
         private void ResetPredictedEntities(GameTick curTick)
         {
-            var bus = (EntityEventBus) _entities.EventBus;
-
             foreach (var entity in _entities.GetEntities())
             {
                 // TODO: 99% there's an off-by-one here.
@@ -349,7 +346,6 @@ namespace Robust.Client.GameStates
 
                     Logger.DebugS(CVars.NetPredict.Name, $"  And also its component {comp.Name}");
                     // TODO: Handle interpolation.
-                    bus.RaiseComponentEvent(comp, new ComponentHandleState(compState, null));
                     comp.HandleComponentState(compState, null);
                 }
             }
@@ -397,7 +393,7 @@ namespace Robust.Client.GameStates
         private List<EntityUid> ApplyGameState(GameState curState, GameState? nextState)
         {
             _config.TickProcessMessages();
-            _mapManager.ApplyGameStatePre(curState.MapData, curState.EntityStates);
+            _mapManager.ApplyGameStatePre(curState.MapData);
             var createdEntities = ApplyEntityStates(curState.EntityStates, curState.EntityDeletions,
                 nextState?.EntityStates);
             _players.ApplyPlayerStates(curState.PlayerStates);
@@ -458,14 +454,12 @@ namespace Robust.Client.GameStates
                 }
             }
 
-            var bus = (EntityEventBus) _entities.EventBus;
-
             // Make sure this is done after all entities have been instantiated.
             foreach (var kvStates in toApply)
             {
                 var ent = kvStates.Key;
                 var entity = (Entity) ent;
-                HandleEntityState(entity.EntityManager.ComponentManager, entity, bus, kvStates.Value.Item1,
+                HandleEntityState(entity.EntityManager.ComponentManager, entity, kvStates.Value.Item1,
                     kvStates.Value.Item2);
             }
 
@@ -532,7 +526,7 @@ namespace Robust.Client.GameStates
             return created;
         }
 
-        private void HandleEntityState(IComponentManager compMan, IEntity entity, EntityEventBus bus, EntityState? curState,
+        private void HandleEntityState(IComponentManager compMan, IEntity entity, EntityState? curState,
             EntityState? nextState)
         {
             var compStateWork = new Dictionary<uint, (ComponentState? curState, ComponentState? nextState)>();
@@ -590,7 +584,6 @@ namespace Robust.Client.GameStates
                 {
                     try
                     {
-                        bus.RaiseComponentEvent(component, new ComponentHandleState(cur, next));
                         component.HandleComponentState(cur, next);
                     }
                     catch (Exception e)

Robust.Client/GameStates/NetEntityOverlay.cs

@@ -178,7 +178,7 @@ namespace Robust.Client.GameStates
                 var yPos = 10 + _lineHeight * i;
                 var name = $"({netEnt.Id}) {ent.Prototype?.ID}";
                 var color = CalcTextColor(ref netEnt);
-                screenHandle.DrawString(_font, new Vector2(xPos + (TrafficHistorySize + 4), yPos), name, color);
+                DrawString(screenHandle, _font, new Vector2(xPos + (TrafficHistorySize + 4), yPos), name, color);
                 DrawTrafficBox(screenHandle, ref netEnt, xPos, yPos);
             }
         }
@@ -223,6 +223,17 @@ namespace Robust.Client.GameStates
             base.DisposeBehavior();
         }
 
+        private static void DrawString(DrawingHandleScreen handle, Font font, Vector2 pos, string str, Color textColor)
+        {
+            var baseLine = new Vector2(pos.X, font.GetAscent(1) + pos.Y);
+
+            foreach (var rune in str.EnumerateRunes())
+            {
+                var advance = font.DrawChar(handle, rune, baseLine, 1, textColor);
+                baseLine += new Vector2(advance, 0);
+            }
+        }
+
         private struct NetEntity
         {
             public GameTick LastUpdate;

Robust.Client/GameStates/NetGraphOverlay.cs

@@ -184,7 +184,7 @@ namespace Robust.Client.GameStates
                 // Draw size if above average
                 if (drawSizeThreshold * 1.5 < state.Payload)
                 {
-                    handle.DrawString(_font, new Vector2(xOff, yoff - _font.GetLineHeight(1)), state.Payload.ToString());
+                    DrawString(handle, _font, new Vector2(xOff, yoff - _font.GetLineHeight(1)), state.Payload.ToString());
                 }
 
                 // second tick marks
@@ -224,14 +224,14 @@ namespace Robust.Client.GameStates
             handle.DrawLine(new Vector2(leftMargin, midYoff), new Vector2(leftMargin + width, midYoff), Color.DarkGray.WithAlpha(0.8f));
 
             // payload text
-            handle.DrawString(_font, new Vector2(leftMargin + width, warnYoff), "56K");
-            handle.DrawString(_font, new Vector2(leftMargin + width, midYoff), "33.6K");
+            DrawString(handle, _font, new Vector2(leftMargin + width, warnYoff), "56K");
+            DrawString(handle, _font, new Vector2(leftMargin + width, midYoff), "33.6K");
 
             // interp text info
             if(lastLagY != -1)
-                handle.DrawString(_font, new Vector2(leftMargin + width, lastLagY), $"{lastLagMs.ToString()}ms");
+                DrawString(handle, _font, new Vector2(leftMargin + width, lastLagY), $"{lastLagMs.ToString()}ms");
 
-            handle.DrawString(_font, new Vector2(leftMargin, height + LowerGraphOffset), $"{_gameStateManager.CurrentBufferSize.ToString()} states");
+            DrawString(handle, _font, new Vector2(leftMargin, height + LowerGraphOffset), $"{_gameStateManager.CurrentBufferSize.ToString()} states");
         }
 
         protected override void DisposeBehavior()
@@ -241,6 +241,17 @@ namespace Robust.Client.GameStates
             base.DisposeBehavior();
         }
 
+        private void DrawString(DrawingHandleScreen handle, Font font, Vector2 pos, string str)
+        {
+            var baseLine = new Vector2(pos.X, font.GetAscent(1) + pos.Y);
+
+            foreach (var rune in str.EnumerateRunes())
+            {
+                var advance = font.DrawChar(handle, rune, baseLine, 1, Color.White);
+                baseLine += new Vector2(advance, 0);
+            }
+        }
+
         private class NetShowGraphCommand : IConsoleCommand
         {
             public string Command => "net_graph";

Robust.Client/Graphics/Clyde/Audio/Clyde.Audio.cs

@@ -44,12 +44,8 @@ namespace Robust.Client.Graphics.Clyde
 
         internal bool IsEfxSupported;
 
-        private ISawmill _openALSawmill = default!;
-
         private void _initializeAudio()
         {
-            _openALSawmill = Logger.GetSawmill("clyde.oal");
-
             _audioOpenDevice();
 
             // Create OpenAL context.
@@ -78,9 +74,9 @@ namespace Robust.Client.Graphics.Clyde
                 _alContextExtensions.Add(extension);
             }
 
-            _openALSawmill.Debug("OpenAL Vendor: {0}", AL.Get(ALGetString.Vendor));
-            _openALSawmill.Debug("OpenAL Renderer: {0}", AL.Get(ALGetString.Renderer));
-            _openALSawmill.Debug("OpenAL Version: {0}", AL.Get(ALGetString.Version));
+            Logger.DebugS("clyde.oal", "OpenAL Vendor: {0}", AL.Get(ALGetString.Vendor));
+            Logger.DebugS("clyde.oal", "OpenAL Renderer: {0}", AL.Get(ALGetString.Renderer));
+            Logger.DebugS("clyde.oal", "OpenAL Version: {0}", AL.Get(ALGetString.Version));
         }
 
         private void _audioOpenDevice()
@@ -93,7 +89,7 @@ namespace Robust.Client.Graphics.Clyde
                 _openALDevice = ALC.OpenDevice(preferredDevice);
                 if (_openALDevice == IntPtr.Zero)
                 {
-                    _openALSawmill.Warning("Unable to open preferred audio device '{0}': {1}. Falling back default.",
+                    Logger.WarningS("clyde.oal", "Unable to open preferred audio device '{0}': {1}. Falling back default.",
                         preferredDevice, ALC.GetError(ALDevice.Null));
 
                     _openALDevice = ALC.OpenDevice(null);
@@ -157,7 +153,7 @@ namespace Robust.Client.Graphics.Clyde
             // Clear out finalized audio sources.
             while (_sourceDisposeQueue.TryDequeue(out var handles))
             {
-                _openALSawmill.Debug("Cleaning out source {0} which finalized in another thread.", handles.sourceHandle);
+                Logger.DebugS("clyde.oal", "Cleaning out source {0} which finalized in another thread.", handles.sourceHandle);
                 if (IsEfxSupported) RemoveEfx(handles);
                 AL.DeleteSource(handles.sourceHandle);
                 _checkAlError();
@@ -167,7 +163,7 @@ namespace Robust.Client.Graphics.Clyde
             // Clear out finalized buffered audio sources.
             while (_bufferedSourceDisposeQueue.TryDequeue(out var handles))
             {
-                _openALSawmill.Debug("Cleaning out buffered source {0} which finalized in another thread.", handles.sourceHandle);
+                Logger.DebugS("clyde.oal", "Cleaning out buffered source {0} which finalized in another thread.", handles.sourceHandle);
                 if (IsEfxSupported) RemoveEfx(handles);
                 AL.DeleteSource(handles.sourceHandle);
                 _checkAlError();
@@ -187,6 +183,32 @@ namespace Robust.Client.Graphics.Clyde
             if (handles.filterHandle != 0) EFX.DeleteFilter(handles.filterHandle);
         }
 
+        public AudioStream LoadAudioRaw(short[] samples, int channels, int sampleRate)
+        {
+            var buffer = AL.GenBuffer();
+
+            unsafe
+            {
+                fixed (short* ptr = samples)
+                {
+                    AL.BufferData(
+                        buffer,
+                        channels == 1 ? ALFormat.Mono16 : ALFormat.Stereo16,
+                        (IntPtr) ptr,
+                        samples.Length * 2,
+                        sampleRate);
+                }
+            }
+
+            _checkAlError();
+
+            var handle = new ClydeHandle(_audioSampleBuffers.Count);
+            _audioSampleBuffers.Add(new LoadedAudioSample(buffer));
+            // ReSharper disable once PossibleLossOfFraction
+            var length = TimeSpan.FromSeconds(samples.Length / channels / (double) sampleRate);
+            return new AudioStream(handle, length, channels);
+        }
+
         public void SetMasterVolume(float newVolume)
         {
             AL.Listener(ALListenerf.Gain, _baseGain * newVolume);
@@ -215,24 +237,24 @@ namespace Robust.Client.Graphics.Clyde
             return audioSource;
         }
 
-        private void _checkAlcError(ALDevice device,
+        private static void _checkAlcError(ALDevice device,
             [CallerMemberName] string callerMember = "",
             [CallerLineNumber] int callerLineNumber = -1)
         {
             var error = ALC.GetError(device);
             if (error != AlcError.NoError)
             {
-                _openALSawmill.Error("[{0}:{1}] ALC error: {2}", callerMember, callerLineNumber, error);
+                Logger.ErrorS("clyde.oal", "[{0}:{1}] ALC error: {2}", callerMember, callerLineNumber, error);
             }
         }
 
-        private void _checkAlError([CallerMemberName] string callerMember = "",
+        private static void _checkAlError([CallerMemberName] string callerMember = "",
             [CallerLineNumber] int callerLineNumber = -1)
         {
             var error = AL.GetError();
             if (error != ALError.NoError)
             {
-                _openALSawmill.Error("[{0}:{1}] AL error: {2}", callerMember, callerLineNumber, error);
+                Logger.ErrorS("clyde.oal", "[{0}:{1}] AL error: {2}", callerMember, callerLineNumber, error);
             }
         }
 
@@ -334,35 +356,6 @@ namespace Robust.Client.Graphics.Clyde
             return new AudioStream(handle, length, wav.NumChannels, name);
         }
 
-        public AudioStream LoadAudioRaw(ReadOnlySpan<short> samples, int channels, int sampleRate, string? name = null)
-        {
-            var fmt = channels switch
-            {
-                1 => ALFormat.Mono16,
-                2 => ALFormat.Stereo16,
-                _ => throw new ArgumentOutOfRangeException(
-                    nameof(channels), "Only stereo and mono is currently supported")
-            };
-
-            var buffer = AL.GenBuffer();
-            _checkAlError();
-
-            unsafe
-            {
-                fixed (short* ptr = samples)
-                {
-                    AL.BufferData(buffer, fmt, (IntPtr) ptr, samples.Length * sizeof(short), sampleRate);
-                }
-            }
-
-            _checkAlError();
-
-            var handle = new ClydeHandle(_audioSampleBuffers.Count);
-            var length = TimeSpan.FromSeconds((double) samples.Length / channels / sampleRate);
-            _audioSampleBuffers.Add(new LoadedAudioSample(buffer));
-            return new AudioStream(handle, length, channels, name);
-        }
-
         private sealed class LoadedAudioSample
         {
             public readonly int BufferHandle;
@@ -414,14 +407,14 @@ namespace Robust.Client.Graphics.Clyde
             {
                 _checkDisposed();
                 AL.SourcePlay(SourceHandle);
-                _master._checkAlError();
+                _checkAlError();
             }
 
             public void StopPlaying()
             {
                 _checkDisposed();
                 AL.SourceStop(SourceHandle);
-                _master._checkAlError();
+                _checkAlError();
             }
 
             public bool IsPlaying
@@ -440,14 +433,14 @@ namespace Robust.Client.Graphics.Clyde
                 {
                     _checkDisposed();
                     AL.GetSource(SourceHandle, ALSourceb.Looping, out var ret);
-                    _master._checkAlError();
+                    _checkAlError();
                     return ret;
                 }
                 set
                 {
                     _checkDisposed();
                     AL.Source(SourceHandle, ALSourceb.Looping, value);
-                    _master._checkAlError();
+                    _checkAlError();
                 }
             }
 
@@ -455,7 +448,7 @@ namespace Robust.Client.Graphics.Clyde
             {
                 _checkDisposed();
                 AL.Source(SourceHandle, ALSourceb.SourceRelative, true);
-                _master._checkAlError();
+                _checkAlError();
             }
 
             public void SetVolume(float decibels)
@@ -469,10 +462,10 @@ namespace Robust.Client.Graphics.Clyde
                 }
                 _gain =  MathF.Pow(10, decibels / 10);
                 AL.Source(SourceHandle, ALSourcef.Gain, _gain * priorOcclusion);
-                _master._checkAlError();
+                _checkAlError();
             }
 
-            public void SetVolumeDirect(float scale)
+            public void SetVolumeDirect(float decibels)
             {
                 _checkDisposed();
                 var priorOcclusion = 1f;
@@ -481,9 +474,10 @@ namespace Robust.Client.Graphics.Clyde
                     AL.GetSource(SourceHandle, ALSourcef.Gain, out var priorGain);
                     priorOcclusion = priorGain / _gain;
                 }
-                _gain = scale;
+
+                _gain = decibels;
                 AL.Source(SourceHandle, ALSourcef.Gain, _gain * priorOcclusion);
-                _master._checkAlError();
+                _checkAlError();
             }
 
             public void SetOcclusion(float blocks)
@@ -500,7 +494,7 @@ namespace Robust.Client.Graphics.Clyde
                     gain *= gain * gain;
                     AL.Source(SourceHandle, ALSourcef.Gain, _gain * gain);
                 }
-                _master._checkAlError();
+                _checkAlError();
             }
 
             private void SetOcclusionEfx(float gain, float cutoff)
@@ -520,7 +514,7 @@ namespace Robust.Client.Graphics.Clyde
             {
                 _checkDisposed();
                 AL.Source(SourceHandle, ALSourcef.SecOffset, seconds);
-                _master._checkAlError();
+                _checkAlError();
             }
 
             public bool SetPosition(Vector2 position)
@@ -546,7 +540,7 @@ namespace Robust.Client.Graphics.Clyde
 #endif
 
                 AL.Source(SourceHandle, ALSource3f.Position, x, y, 0);
-                _master._checkAlError();
+                _checkAlError();
                 return true;
             }
 
@@ -573,14 +567,14 @@ namespace Robust.Client.Graphics.Clyde
 
                 AL.Source(SourceHandle, ALSource3f.Velocity, x, y, 0);
 
-                _master._checkAlError();
+                _checkAlError();
             }
 
             public void SetPitch(float pitch)
             {
                 _checkDisposed();
                 AL.Source(SourceHandle, ALSourcef.Pitch, pitch);
-                _master._checkAlError();
+                _checkAlError();
             }
 
             ~AudioSource()
@@ -606,7 +600,7 @@ namespace Robust.Client.Graphics.Clyde
                     if (FilterHandle != 0) EFX.DeleteFilter(FilterHandle);
                     AL.DeleteSource(SourceHandle);
                     _master._audioSources.Remove(SourceHandle);
-                    _master._checkAlError();
+                    _checkAlError();
                 }
 
                 SourceHandle = -1;
@@ -656,7 +650,7 @@ namespace Robust.Client.Graphics.Clyde
                 _checkDisposed();
                 // ReSharper disable once PossibleInvalidOperationException
                 AL.SourcePlay(stackalloc int[] {SourceHandle!.Value});
-                _master._checkAlError();
+                _checkAlError();
             }
 
             public void StopPlaying()
@@ -664,7 +658,7 @@ namespace Robust.Client.Graphics.Clyde
                 _checkDisposed();
                 // ReSharper disable once PossibleInvalidOperationException
                 AL.SourceStop(SourceHandle!.Value);
-                _master._checkAlError();
+                _checkAlError();
             }
 
             public bool IsPlaying
@@ -690,7 +684,7 @@ namespace Robust.Client.Graphics.Clyde
                 _mono = false;
                 // ReSharper disable once PossibleInvalidOperationException
                 AL.Source(SourceHandle!.Value, ALSourceb.SourceRelative, true);
-                _master._checkAlError();
+                _checkAlError();
             }
 
             public void SetLooping()
@@ -709,21 +703,7 @@ namespace Robust.Client.Graphics.Clyde
                 }
                 _gain =  MathF.Pow(10, decibels / 10);
                 AL.Source(SourceHandle!.Value, ALSourcef.Gain, _gain * priorOcclusion);
-                _master._checkAlError();
-            }
-
-            public void SetVolumeDirect(float scale)
-            {
-                _checkDisposed();
-                var priorOcclusion = 1f;
-                if (!IsEfxSupported)
-                {
-                    AL.GetSource(SourceHandle!.Value, ALSourcef.Gain, out var priorGain);
-                    priorOcclusion = priorGain / _gain;
-                }
-                _gain = scale;
-                AL.Source(SourceHandle!.Value, ALSourcef.Gain, _gain * priorOcclusion);
-                _master._checkAlError();
+                _checkAlError();
             }
 
             public void SetOcclusion(float blocks)
@@ -741,7 +721,7 @@ namespace Robust.Client.Graphics.Clyde
                     AL.Source(SourceHandle!.Value, ALSourcef.Gain, gain * _gain);
                 }
 
-                _master._checkAlError();
+                _checkAlError();
             }
 
             private void SetOcclusionEfx(float gain, float cutoff)
@@ -761,7 +741,7 @@ namespace Robust.Client.Graphics.Clyde
                 _checkDisposed();
                 // ReSharper disable once PossibleInvalidOperationException
                 AL.Source(SourceHandle!.Value, ALSourcef.SecOffset, seconds);
-                _master._checkAlError();
+                _checkAlError();
             }
 
             public bool SetPosition(Vector2 position)
@@ -778,7 +758,7 @@ namespace Robust.Client.Graphics.Clyde
                 _mono = true;
                 // ReSharper disable once PossibleInvalidOperationException
                 AL.Source(SourceHandle!.Value, ALSource3f.Position, x, y, 0);
-                _master._checkAlError();
+                _checkAlError();
                 return true;
             }
 
@@ -805,7 +785,22 @@ namespace Robust.Client.Graphics.Clyde
 
                 AL.Source(SourceHandle!.Value, ALSource3f.Velocity, x, y, 0);
 
-                _master._checkAlError();
+                _checkAlError();
+            }
+
+            public void SetVolumeDirect(float masterVolumeDecay)
+            {
+                _checkDisposed();
+                var priorOcclusion = 1f;
+                if (!IsEfxSupported)
+                {
+                    AL.GetSource(SourceHandle!.Value, ALSourcef.Gain, out var priorGain);
+                    priorOcclusion = priorGain / _gain;
+                }
+
+                _gain = masterVolumeDecay;
+                AL.Source(SourceHandle!.Value, ALSourcef.Gain, _gain * priorOcclusion);
+                _checkAlError();
             }
 
             public void SetPitch(float pitch)
@@ -813,7 +808,7 @@ namespace Robust.Client.Graphics.Clyde
                 _checkDisposed();
                 // ReSharper disable once PossibleInvalidOperationException
                 AL.Source(SourceHandle!.Value, ALSourcef.Pitch, pitch);
-                _master._checkAlError();
+                _checkAlError();
             }
 
             ~BufferedAudioSource()
@@ -844,7 +839,7 @@ namespace Robust.Client.Graphics.Clyde
                     AL.DeleteSource(SourceHandle.Value);
                     AL.DeleteBuffers(BufferHandles);
                     _master._bufferedAudioSources.Remove(SourceHandle.Value);
-                    _master._checkAlError();
+                    _checkAlError();
                 }
 
                 SourceHandle = null;

Robust.Client/Graphics/Clyde/Clyde.DllMap.cs

@@ -11,7 +11,7 @@ namespace Robust.Client.Graphics.Clyde
     {
         static Clyde()
         {
-            if (OperatingSystem.IsWindows() &&
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) &&
                 RuntimeInformation.ProcessArchitecture == Architecture.X64 &&
                 Environment.GetEnvironmentVariable("ROBUST_INTEGRATED_GPU") != "1")
             {
@@ -28,20 +28,20 @@ namespace Robust.Client.Graphics.Clyde
                 }
             }
 
-            if (OperatingSystem.IsWindows())
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
                 return;
             }
 
             NativeLibrary.SetDllImportResolver(typeof(GL).Assembly, (name, assembly, path) =>
             {
-                if (OperatingSystem.IsLinux()
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
                     && _dllMapLinux.TryGetValue(name, out var mappedName))
                 {
                     return NativeLibrary.Load(mappedName);
                 }
 
-                if (OperatingSystem.IsMacOS()
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)
                     && _dllMapMacOS.TryGetValue(name, out mappedName))
                 {
                     return NativeLibrary.Load(mappedName);

Robust.Client/Graphics/Clyde/Clyde.HLR.cs

@@ -387,6 +387,12 @@ namespace Robust.Client.Graphics.Clyde
                     ref RefList<(SpriteComponent sprite, Matrix3 matrix, Angle worldRot, float yWorldPos)> state,
                     in SpriteComponent value) =>
                 {
+                    // TODO: Probably value in storing this as its own DynamicTree
+                    if (value.ContainerOccluded || !value.Visible)
+                    {
+                        return true;
+                    }
+
                     var entity = value.Owner;
                     var transform = entity.Transform;
 

Robust.Client/Graphics/Clyde/Clyde.LightRendering.cs

@@ -149,16 +149,16 @@ namespace Robust.Client.Graphics.Clyde
             // FOV FBO.
             _fovRenderTarget = CreateRenderTarget((FovMapSize, 2),
                 new RenderTargetFormatParameters(_hasGLFloatFramebuffers ? RenderTargetColorFormat.RG32F : RenderTargetColorFormat.Rgba8, true),
-                new TextureSampleParameters { WrapMode = TextureWrapMode.Repeat },
+                new TextureSampleParameters {WrapMode = TextureWrapMode.Repeat},
                 nameof(_fovRenderTarget));
 
             if (_hasGLSamplerObjects)
             {
                 _fovFilterSampler = new GLHandle(GL.GenSampler());
-                GL.SamplerParameter(_fovFilterSampler.Handle, SamplerParameterName.TextureMagFilter, (int)All.Linear);
-                GL.SamplerParameter(_fovFilterSampler.Handle, SamplerParameterName.TextureMinFilter, (int)All.Linear);
-                GL.SamplerParameter(_fovFilterSampler.Handle, SamplerParameterName.TextureWrapS, (int)All.Repeat);
-                GL.SamplerParameter(_fovFilterSampler.Handle, SamplerParameterName.TextureWrapT, (int)All.Repeat);
+                GL.SamplerParameter(_fovFilterSampler.Handle, SamplerParameterName.TextureMagFilter, (int) All.Linear);
+                GL.SamplerParameter(_fovFilterSampler.Handle, SamplerParameterName.TextureMinFilter, (int) All.Linear);
+                GL.SamplerParameter(_fovFilterSampler.Handle, SamplerParameterName.TextureWrapS, (int) All.Repeat);
+                GL.SamplerParameter(_fovFilterSampler.Handle, SamplerParameterName.TextureWrapT, (int) All.Repeat);
                 CheckGlError();
             }
 
@@ -180,17 +180,20 @@ namespace Robust.Client.Graphics.Clyde
             _fovCalculationProgram = _compileProgram(depthVert, depthFrag, attribLocations, "Shadow Depth Program");
 
             var debugShader = _resourceCache.GetResource<ShaderSourceResource>("/Shaders/Internal/depth-debug.swsl");
-            _fovDebugShaderInstance = (ClydeShaderInstance)InstanceShader(debugShader.ClydeHandle);
+            _fovDebugShaderInstance = (ClydeShaderInstance) InstanceShader(debugShader.ClydeHandle);
 
             ClydeHandle LoadShaderHandle(string path)
             {
-                if (_resourceCache.TryGetResource(path, out ShaderSourceResource? resource))
+                try
                 {
-                    return resource.ClydeHandle;
+                    var shaderSource = _resourceCache.GetResource<ShaderSourceResource>(path);
+                    return shaderSource.ClydeHandle;
+                }
+                catch (Exception ex)
+                {
+                    Logger.Warning($"Can't load shader {path}\n{ex.GetType().Name}: {ex.Message}");
+                    return default;
                 }
-
-                Logger.Warning($"Can't load shader {path}\n");
-                return default;
             }
 
             _lightSoftShaderHandle = LoadShaderHandle("/Shaders/Internal/light-soft.swsl");
@@ -211,7 +214,7 @@ namespace Robust.Client.Graphics.Clyde
             {
                 // Calculate maximum distance for the projection based on screen size.
                 var screenSizeCut = viewport.Size / EyeManager.PixelsPerMeter;
-                var maxDist = (float)Math.Max(screenSizeCut.X, screenSizeCut.Y);
+                var maxDist = (float) Math.Max(screenSizeCut.X, screenSizeCut.Y);
 
                 // FOV is rendered twice.
                 // Once with back face culling like regular lighting.
@@ -521,6 +524,12 @@ namespace Robust.Client.Graphics.Clyde
                         return false;
                     }
 
+                    // TODO: Don't insert into trees for these, same as sprites.
+                    if (!light.Enabled || light.ContainerOccluded)
+                    {
+                        return true;
+                    }
+
                     var lightPos = transform.WorldMatrix.Transform(light.Offset);
 
                     var circle = new Circle(lightPos, light.Radius);
@@ -581,7 +590,7 @@ namespace Robust.Client.Graphics.Clyde
 
             SetupGlobalUniformsImmediate(shader, viewport.LightRenderTarget.Texture);
 
-            shader.SetUniformMaybe("size", (Vector2)viewport.WallBleedIntermediateRenderTarget1.Size);
+            shader.SetUniformMaybe("size", (Vector2) viewport.WallBleedIntermediateRenderTarget1.Size);
             shader.SetUniformTextureMaybe(UniIMainTexture, TextureUnit.Texture0);
 
             var size = viewport.WallBleedIntermediateRenderTarget1.Size;
@@ -800,7 +809,7 @@ namespace Robust.Client.Graphics.Clyde
 
                     occluderTree.QueryAabb((in OccluderComponent sOccluder) =>
                     {
-                        var occluder = (ClientOccluderComponent)sOccluder;
+                        var occluder = (ClientOccluderComponent) sOccluder;
                         var transform = occluder.Owner.Transform;
                         if (!occluder.Enabled)
                         {
@@ -884,11 +893,11 @@ namespace Robust.Client.Graphics.Clyde
                                 // DddD
                                 // HHhh
                                 // deflection
-                                arrayVIBuffer[avi++] = (byte)((((vi + 1) & 2) != 0) ? 0 : 255);
+                                arrayVIBuffer[avi++] = (byte) ((((vi + 1) & 2) != 0) ? 0 : 255);
                                 // height
-                                arrayVIBuffer[avi++] = (byte)(((vi & 2) != 0) ? 0 : 255);
+                                arrayVIBuffer[avi++] = (byte) (((vi & 2) != 0) ? 0 : 255);
                             }
-                            QuadBatchIndexWrite(indexBuffer, ref ii, (ushort)aiBase);
+                            QuadBatchIndexWrite(indexBuffer, ref ii, (ushort) aiBase);
                         }
 
                         // North face (TL/TR)
@@ -922,7 +931,7 @@ namespace Robust.Client.Graphics.Clyde
                         arrayMaskBuffer[ami + 3] = new Vector2(blX, blY);
 
                         // Generate mask indices.
-                        QuadBatchIndexWrite(indexMaskBuffer, ref imi, (ushort)ami);
+                        QuadBatchIndexWrite(indexMaskBuffer, ref imi, (ushort) ami);
 
                         ami += 4;
 
@@ -964,7 +973,7 @@ namespace Robust.Client.Graphics.Clyde
             var lightMapSize = GetLightMapSize(viewport.Size);
             var lightMapSizeQuart = GetLightMapSize(viewport.Size, true);
             var lightMapColorFormat = _hasGLFloatFramebuffers ? RenderTargetColorFormat.R11FG11FB10F : RenderTargetColorFormat.Rgba8;
-            var lightMapSampleParameters = new TextureSampleParameters { Filter = true };
+            var lightMapSampleParameters = new TextureSampleParameters {Filter = true};
 
             viewport.LightRenderTarget?.Dispose();
             viewport.WallMaskRenderTarget?.Dispose();
@@ -1001,14 +1010,14 @@ namespace Robust.Client.Graphics.Clyde
 
         private Vector2i GetLightMapSize(Vector2i screenSize, bool furtherDivide = false)
         {
-            var divider = (float)_lightmapDivider;
+            var divider = (float) _lightmapDivider;
             if (furtherDivide)
             {
                 divider *= 2;
             }
 
-            var w = (int)Math.Ceiling(screenSize.X / divider);
-            var h = (int)Math.Ceiling(screenSize.Y / divider);
+            var w = (int) Math.Ceiling(screenSize.X / divider);
+            var h = (int) Math.Ceiling(screenSize.Y / divider);
 
             return (w, h);
         }
@@ -1034,7 +1043,7 @@ namespace Robust.Client.Graphics.Clyde
             // Shadow FBO.
             _shadowRenderTarget = CreateRenderTarget((ShadowMapSize, _maxLightsPerScene),
                 new RenderTargetFormatParameters(_hasGLFloatFramebuffers ? RenderTargetColorFormat.RG32F : RenderTargetColorFormat.Rgba8, true),
-                new TextureSampleParameters { WrapMode = TextureWrapMode.Repeat, Filter = true },
+                new TextureSampleParameters {WrapMode = TextureWrapMode.Repeat, Filter = true},
                 nameof(_shadowRenderTarget));
         }
 

Robust.Client/Graphics/Clyde/Clyde.Windowing.cs

@@ -131,7 +131,7 @@ namespace Robust.Client.Graphics.Clyde
 
             if (!succeeded)
             {
-                if (OperatingSystem.IsWindows())
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 {
                     var msgBoxContent = "Failed to create the game window. " +
                                         "This probably means your GPU is too old to play the game. " +
@@ -164,7 +164,7 @@ namespace Robust.Client.Graphics.Clyde
 
         private IEnumerable<Image<Rgba32>> LoadWindowIcons()
         {
-            if (OperatingSystem.IsMacOS())
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
                 // Does nothing on macOS so don't bother.
                 yield break;

Robust.Client/Graphics/Clyde/ClydeHeadless.cs

@@ -248,10 +248,9 @@ namespace Robust.Client.Graphics.Clyde
             return new(default, default, 1, name);
         }
 
-        public AudioStream LoadAudioRaw(ReadOnlySpan<short> samples, int channels, int sampleRate, string? name = null)
+        public AudioStream LoadAudioRaw(short[] samples, int channels, int sampleRate)
         {
-            // TODO: Might wanna actually load this so the length gets reported correctly.
-            return new(default, default, channels, name);
+            throw new NotImplementedException();
         }
 
         public IClydeAudioSource CreateAudioSource(AudioStream stream)
@@ -329,11 +328,6 @@ namespace Robust.Client.Graphics.Clyde
                 // Nada.
             }
 
-            public void SetVolumeDirect(float scale)
-            {
-                // Nada.
-            }
-
             public void SetOcclusion(float blocks)
             {
                 // Nada.
@@ -348,6 +342,11 @@ namespace Robust.Client.Graphics.Clyde
             {
                 // Nada.
             }
+
+            public void SetVolumeDirect(float masterVolumeDecay)
+            {
+                // Nada.
+            }
         }
 
         private sealed class DummyBufferedAudioSource : DummyAudioSource, IClydeBufferedAudioSource

Robust.Client/Graphics/Clyde/Windowing/Glfw.WindowThread.cs

@@ -1,4 +1,4 @@
-using System;
+using System.Runtime.InteropServices;
 using System.Threading.Channels;
 using System.Threading.Tasks;
 using OpenToolkit.GraphicsLibraryFramework;
@@ -13,6 +13,11 @@ namespace Robust.Client.Graphics.Clyde
     {
         private sealed partial class GlfwWindowingImpl
         {
+            // glfwPostEmptyEvent is broken on macOS and crashes when not called from the main thread
+            // (despite what the docs claim, and yes this makes it useless).
+            // Because of this, we just forego it and use glfwWaitEventsTimeout on macOS instead.
+            private static readonly bool IsMacOS = RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
+
             private bool _windowingRunning;
             private ChannelWriter<CmdBase> _cmdWriter = default!;
             private ChannelReader<CmdBase> _cmdReader = default!;
@@ -48,10 +53,7 @@ namespace Robust.Client.Graphics.Clyde
 
                 while (_windowingRunning)
                 {
-                    // glfwPostEmptyEvent is broken on macOS and crashes when not called from the main thread
-                    // (despite what the docs claim, and yes this makes it useless).
-                    // Because of this, we just forego it and use glfwWaitEventsTimeout on macOS instead.
-                    if (OperatingSystem.IsMacOS())
+                    if (IsMacOS)
                         GLFW.WaitEventsTimeout(0.008);
                     else
                         GLFW.WaitEvents();
@@ -155,7 +157,7 @@ namespace Robust.Client.Graphics.Clyde
                 _cmdWriter.TryWrite(cmd);
 
                 // Post empty event to unstuck WaitEvents if necessary.
-                if (!OperatingSystem.IsMacOS())
+                if (!IsMacOS)
                     GLFW.PostEmptyEvent();
             }
 

Robust.Client/Graphics/Clyde/Windowing/Glfw.Windows.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Runtime.Loader;
 using System.Threading.Tasks;
 using OpenToolkit;
 using OpenToolkit.Graphics.OpenGL4;
@@ -34,7 +33,6 @@ namespace Robust.Client.Graphics.Clyde
             private GlfwWindowReg? _mainWindow;
             private GlfwBindingsContext _mainGraphicsContext = default!;
             private int _nextWindowId = 1;
-            private static bool _eglLoaded;
 
             public async Task<WindowHandle> WindowCreate(WindowCreateParameters parameters)
             {
@@ -476,20 +474,6 @@ namespace Robust.Client.Graphics.Clyde
                     GLFW.WindowHint(WindowHintContextApi.ContextCreationApi, ContextApi.EglContextApi);
                     GLFW.WindowHint(WindowHintOpenGlProfile.OpenGlProfile, OpenGlProfile.Any);
                     GLFW.WindowHint(WindowHintBool.SrgbCapable, false);
-
-                    if (!_eglLoaded && OperatingSystem.IsWindows())
-                    {
-                        // On non-published builds (so, development), GLFW can't find libEGL.dll
-                        // because it'll be in runtimes/<rid>/native/ instead of next to the actual executable.
-                        // We manually preload the library here so that GLFW will find it when it does its thing.
-                        NativeLibrary.TryLoad(
-                            "libEGL.dll",
-                            typeof(Clyde).Assembly,
-                            DllImportSearchPath.SafeDirectories,
-                            out _);
-
-                        _eglLoaded = true;
-                    }
                 }
 
 

Robust.Client/Graphics/Drawing/DrawingHandleScreen.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Text;
 using Robust.Shared.Maths;
 
 namespace Robust.Client.Graphics
@@ -40,57 +39,5 @@ namespace Robust.Client.Graphics
             DrawPrimitiveTopology type = filled ? DrawPrimitiveTopology.TriangleFan : DrawPrimitiveTopology.LineStrip;
             DrawPrimitives(type, buffer, color);
         }
-
-        /// <summary>
-        ///     Draw a simple string to the screen at the specified position.
-        /// </summary>
-        /// <remarks>
-        ///     This method is primarily intended for debug purposes and does not handle things like UI scaling.
-        /// </remarks>
-        /// <returns>
-        ///     The space taken up (horizontal and vertical) by the text.
-        /// </returns>
-        /// <param name="font">The font to render with.</param>
-        /// <param name="pos">The top-left corner to start drawing text at.</param>
-        /// <param name="str">The text to draw.</param>
-        /// <param name="color">The color of text to draw.</param>
-        public Vector2 DrawString(Font font, Vector2 pos, string str, Color color)
-        {
-            var advanceTotal = Vector2.Zero;
-            var baseLine = new Vector2(pos.X, font.GetAscent(1) + pos.Y);
-            var lineHeight = font.GetLineHeight(1);
-
-            foreach (var rune in str.EnumerateRunes())
-            {
-                if (rune == new Rune('\n'))
-                {
-                    baseLine.X = pos.X;
-                    baseLine.Y += lineHeight;
-                    advanceTotal.Y += lineHeight;
-                    continue;
-                }
-
-                var advance = font.DrawChar(this, rune, baseLine, 1, color);
-                advanceTotal.X += advance;
-                baseLine += new Vector2(advance, 0);
-            }
-
-            return advanceTotal;
-        }
-
-        /// <summary>
-        ///     Draw a simple string to the screen at the specified position.
-        /// </summary>
-        /// <remarks>
-        ///     This method is primarily intended for debug purposes and does not handle things like UI scaling.
-        /// </remarks>
-        /// <returns>
-        ///     The space taken up (horizontal and vertical) by the text.
-        /// </returns>
-        /// <param name="font">The font to render with.</param>
-        /// <param name="pos">The top-left corner to start drawing text at.</param>
-        /// <param name="str">The text to draw.</param>
-        public Vector2 DrawString(Font font, Vector2 pos, string str)
-            => DrawString(font, pos, str, Color.White);
     }
 }

Robust.Client/Graphics/IClydeAudio.cs

@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using Robust.Client.Audio;
 
 namespace Robust.Client.Graphics
@@ -9,7 +8,7 @@ namespace Robust.Client.Graphics
         // AUDIO SYSTEM DOWN BELOW.
         AudioStream LoadAudioOggVorbis(Stream stream, string? name = null);
         AudioStream LoadAudioWav(Stream stream, string? name = null);
-        AudioStream LoadAudioRaw(ReadOnlySpan<short> samples, int channels, int sampleRate, string? name = null);
+        AudioStream LoadAudioRaw(short[] samples, int channels, int sampleRate);
 
         void SetMasterVolume(float newVolume);
 

Robust.Client/Graphics/IClydeAudioSource.cs

@@ -18,9 +18,9 @@ namespace Robust.Client.Graphics
         void SetPitch(float pitch);
         void SetGlobal();
         void SetVolume(float decibels);
-        void SetVolumeDirect(float decibels);
         void SetOcclusion(float blocks);
         void SetPlaybackPosition(float seconds);
         void SetVelocity(Vector2 velocity);
+        void SetVolumeDirect(float masterVolumeDecay);
     }
 }

Robust.Client/Graphics/IRenderHandle.cs

@@ -4,7 +4,7 @@ using Robust.Shared.Maths;
 
 namespace Robust.Client.Graphics
 {
-    internal interface IRenderHandle
+    public interface IRenderHandle
     {
         DrawingHandleScreen DrawingHandleScreen { get; }
         DrawingHandleWorld DrawingHandleWorld { get; }

Robust.Client/Input/InputDevices.cs

@@ -1,6 +1,7 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
 using Robust.Shared.Localization;
+using Robust.Shared.Map;
 
 namespace Robust.Client.Input
 {
@@ -178,9 +179,9 @@ namespace Robust.Client.Input
             var locId = $"input-key-{key}";
             if (key == Key.LSystem || key == Key.RSystem)
             {
-                if (OperatingSystem.IsWindows())
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                     locId += "-win";
-                else if (OperatingSystem.IsMacOS())
+                else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
                     locId += "-mac";
                 else
                     locId += "-linux";

Robust.Client/Map/ClientMapManager.cs

@@ -1,111 +1,72 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
+using Robust.Shared.IoC;
+using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
+using Robust.Shared.Network;
 using Robust.Shared.Utility;
 
 namespace Robust.Client.Map
 {
     internal class ClientMapManager : MapManager, IClientMapManager
     {
-        public void ApplyGameStatePre(GameStateMapData? data, EntityState[]? entityStates)
+        [Dependency] private readonly INetManager _netManager = default!;
+
+        public void ApplyGameStatePre(GameStateMapData? data)
         {
             // There was no map data this tick, so nothing to do.
             if(data == null)
                 return;
 
+            var createdGrids = data.CreatedGrids != null
+                ? new Dictionary<GridId, GameStateMapData.GridCreationDatum>(data.CreatedGrids)
+                : null;
+
             // First we need to figure out all the NEW MAPS.
             if(data.CreatedMaps != null)
             {
-                DebugTools.Assert(entityStates is not null, "Received new maps, but no entity state.");
-
                 foreach (var mapId in data.CreatedMaps)
                 {
-                    // map already exists from a previous state.
                     if (_maps.Contains(mapId))
-                        continue;
-
-                    EntityUid mapEuid = default;
-
-                    //get shared euid of map comp entity
-                    foreach (var entityState in entityStates!)
                     {
-                        if(entityState.ComponentStates is null)
-                            continue;
-
-                        foreach (var compState in entityState.ComponentStates)
-                        {
-                            if (compState is not MapComponentState mapCompState || mapCompState.MapId != mapId)
-                                continue;
-
-                            mapEuid = entityState.Uid;
-                            goto BreakMapEntSearch;
-                        }
+                        continue;
                     }
-                    BreakMapEntSearch:
 
-                    DebugTools.Assert(mapEuid != default, $"Could not find corresponding entity state for new map {mapId}.");
-
-                    CreateMap(mapId, mapEuid);
+                    CreateMap(mapId);
                 }
             }
 
             // Then make all the grids.
             if(data.CreatedGrids != null)
             {
-                DebugTools.Assert(data.GridData is not null, "Received new grids, but GridData was null.");
+                var gridData = data.GridData != null
+                    ? new Dictionary<GridId, GameStateMapData.GridDatum>(data.GridData)
+                    : null;
+
+                DebugTools.AssertNotNull(createdGrids);
 
                 foreach (var (gridId, creationDatum) in data.CreatedGrids)
                 {
                     if (_grids.ContainsKey(gridId))
+                    {
                         continue;
-
-                    EntityUid gridEuid = default;
-
-                    //get shared euid of map comp entity
-                    foreach (var entityState in entityStates!)
-                    {
-                        if(entityState.ComponentStates is null)
-                            continue;
-
-                        foreach (var compState in entityState.ComponentStates)
-                        {
-                            if (compState is not MapGridComponentState gridCompState || gridCompState.GridIndex != gridId)
-                                continue;
-
-                            gridEuid = entityState.Uid;
-                            goto BreakGridEntSearch;
-                        }
-                    }
-                    BreakGridEntSearch:
-
-                    DebugTools.Assert(gridEuid != default, $"Could not find corresponding entity state for new grid {gridId}.");
-
-                    MapId gridMapId = default;
-                    foreach (var kvData in data.GridData!)
-                    {
-                        if (kvData.Key != gridId)
-                            continue;
-
-                        gridMapId = kvData.Value.Coordinates.MapId;
-                        break;
                     }
 
-                    DebugTools.Assert(gridMapId != default, $"Could not find corresponding gridData for new grid {gridId}.");
-
-                    CreateGrid(gridMapId, gridId, creationDatum.ChunkSize, gridEuid);
+                    CreateGrid(gridData![gridId].Coordinates.MapId, gridId, creationDatum.ChunkSize);
                 }
             }
 
-            // Process all grid updates.
             if(data.GridData != null)
             {
                 SuppressOnTileChanged = true;
                 // Ok good all the grids and maps exist now.
                 foreach (var (gridId, gridDatum) in data.GridData)
                 {
+
                     var grid = _grids[gridId];
                     if (grid.ParentMapId != gridDatum.Coordinates.MapId)
                     {
@@ -151,9 +112,99 @@ namespace Robust.Client.Map
 
         public void ApplyGameStatePost(GameStateMapData? data)
         {
+            DebugTools.Assert(_netManager.IsClient, "Only the client should call this.");
+
             if(data == null) // if there is no data, there is nothing to do!
                 return;
 
+            // maps created on the client in pre-state are linked to client entities
+            // resolve new maps with their shared component that the server just gave us
+            // and delete the client entities
+            if (data.CreatedMaps != null)
+            {
+                foreach (var mapId in data.CreatedMaps)
+                {
+                    // CreateMap should have set this
+                    DebugTools.Assert(_mapEntities.ContainsKey(mapId));
+
+                    // this was already linked in a previous state.
+                    if(!_mapEntities[mapId].IsClientSide())
+                        continue;
+
+                    // get the existing client entity for the map.
+                    var cEntity = EntityManager.GetEntity(_mapEntities[mapId]);
+
+                    // locate the entity that represents this map that was just sent to us
+                    IEntity? sharedMapEntity = null;
+                    var mapComps = EntityManager.ComponentManager.EntityQuery<IMapComponent>(true);
+                    foreach (var mapComp in mapComps)
+                    {
+                        if (!mapComp.Owner.Uid.IsClientSide() && mapComp.WorldMap == mapId)
+                        {
+                            sharedMapEntity = mapComp.Owner;
+                            _mapEntities[mapId] = mapComp.Owner.Uid;
+                            Logger.DebugS("map", $"Map {mapId} pivoted bound entity from {cEntity.Uid} to {mapComp.Owner.Uid}.");
+                            break;
+                        }
+                    }
+
+                    // verify shared entity was found (the server sent us one)
+                    DebugTools.AssertNotNull(sharedMapEntity);
+                    DebugTools.Assert(!_mapEntities[mapId].IsClientSide());
+
+                    // Transfer client child grids made in GameStatePre to the shared component
+                    // so they are not deleted
+                    foreach (var childGridTrans in cEntity.Transform.Children.ToList())
+                    {
+                        childGridTrans.AttachParent(sharedMapEntity!);
+                    }
+
+                    // remove client entity
+                    var cGridComp = cEntity.GetComponent<IMapComponent>();
+                    cGridComp.ClearMapId();
+                    cEntity.Delete();
+                }
+            }
+
+
+            // grids created on the client in pre-state are linked to client entities
+            // resolve new grids with their shared component that the server just gave us
+            // and delete the client entities
+            if (data.CreatedGrids != null)
+            {
+                foreach (var kvNewGrid in data.CreatedGrids)
+                {
+                    var grid = _grids[kvNewGrid.Key];
+
+                    // this was already linked in a previous state.
+                    if(!grid.GridEntityId.IsClientSide())
+                        continue;
+
+                    // remove the existing client entity.
+                    var cEntity = EntityManager.GetEntity(grid.GridEntityId);
+                    var cGridComp = cEntity.GetComponent<IMapGridComponent>();
+
+                    // prevents us from deleting the grid when deleting the grid entity
+                    if(cEntity.Uid.IsClientSide())
+                        cGridComp.ClearGridId();
+
+                    cEntity.Delete(); // normal entities are already parented to the shared comp, client comp has no children
+
+                    var gridComps = EntityManager.ComponentManager.EntityQuery<IMapGridComponent>(true);
+                    foreach (var gridComp in gridComps)
+                    {
+                        if (gridComp.GridIndex == kvNewGrid.Key)
+                        {
+                            grid.GridEntityId = gridComp.Owner.Uid;
+                            Logger.DebugS("map", $"Grid {grid.Index} pivoted bound entity from {cEntity.Uid} to {grid.GridEntityId}.");
+                            break;
+                        }
+                    }
+
+                    DebugTools.Assert(!grid.GridEntityId.IsClientSide());
+                }
+            }
+
             if(data.DeletedGrids != null)
             {
                 foreach (var grid in data.DeletedGrids)

Robust.Client/Map/IClientMapManager.cs

@@ -1,4 +1,3 @@
-using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
 using Robust.Shared.Map;
 
@@ -8,7 +7,7 @@ namespace Robust.Client.Map
     {
         // Two methods here, so that new grids etc can be made BEFORE entities get states applied,
         // but old ones can be deleted after.
-        void ApplyGameStatePre(GameStateMapData? data, EntityState[]? entityStates);
+        void ApplyGameStatePre(GameStateMapData? data);
         void ApplyGameStatePost(GameStateMapData? data);
     }
 }

Robust.Client/Placement/PlacementManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Robust.Client.GameObjects;
@@ -25,6 +25,7 @@ namespace Robust.Client.Placement
 {
     public partial class PlacementManager : IPlacementManager, IDisposable
     {
+        [Dependency] public readonly IPhysicsManager PhysicsManager = default!;
         [Dependency] private readonly IClientNetManager NetworkManager = default!;
         [Dependency] public readonly IPlayerManager PlayerManager = default!;
         [Dependency] public readonly IResourceCache ResourceCache = default!;
@@ -155,7 +156,7 @@ namespace Robust.Client.Placement
         {
             _drawingShader = _prototypeManager.Index<ShaderPrototype>("unshaded").Instance();
 
-            NetworkManager.RegisterNetMessage<MsgPlacement>(HandlePlacementMessage);
+            NetworkManager.RegisterNetMessage<MsgPlacement>(MsgPlacement.NAME, HandlePlacementMessage);
 
             _modeDictionary.Clear();
             foreach (var type in ReflectionManager.GetAllChildren<PlacementMode>())

Robust.Client/Player/LocalPlayer.cs

@@ -1,5 +1,6 @@
-using System;
+using System;
 using Robust.Client.GameObjects;
+using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Network;
@@ -70,10 +71,10 @@ namespace Robust.Client.Player
             eye.Current = true;
 
             EntityAttached?.Invoke(new EntityAttachedEventArgs(entity));
+            entity.SendMessage(null, new PlayerAttachedMsg());
 
             // notify ECS Systems
             ControlledEntity.EntityManager.EventBus.RaiseEvent(EventSource.Local, new PlayerAttachSysMessage(ControlledEntity));
-            ControlledEntity.EntityManager.EventBus.RaiseLocalEvent(ControlledEntity.Uid, new PlayerAttachedEvent(ControlledEntity));
         }
 
         /// <summary>
@@ -82,13 +83,13 @@ namespace Robust.Client.Player
         public void DetachEntity()
         {
             var previous = ControlledEntity;
-            if (previous is {Initialized: true, Deleted: false})
+            if (previous != null && previous.Initialized && !previous.Deleted)
             {
                 previous.GetComponent<EyeComponent>().Current = false;
+                previous.SendMessage(null, new PlayerDetachedMsg());
 
                 // notify ECS Systems
                 previous.EntityManager.EventBus.RaiseEvent(EventSource.Local, new PlayerAttachSysMessage(null));
-                previous.EntityManager.EventBus.RaiseLocalEvent(previous.Uid, new PlayerDetachedEvent(previous));
             }
 
             ControlledEntity = null;

Robust.Client/Player/PlayerManager.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
@@ -81,8 +82,8 @@ namespace Robust.Client.Player
         {
             _client.RunLevelChanged += OnRunLevelChanged;
 
-            _network.RegisterNetMessage<MsgPlayerListReq>();
-            _network.RegisterNetMessage<MsgPlayerList>(HandlePlayerList);
+            _network.RegisterNetMessage<MsgPlayerListReq>(MsgPlayerListReq.NAME);
+            _network.RegisterNetMessage<MsgPlayerList>(MsgPlayerList.NAME, HandlePlayerList);
         }
 
         /// <inheritdoc />

Robust.Client/Prototypes/ClientPrototypeManager.cs

@@ -30,7 +30,7 @@ namespace Robust.Client.Prototypes
         {
             base.Initialize();
 
-            _netManager.RegisterNetMessage<MsgReloadPrototypes>(accept: NetMessageAccept.Server);
+            _netManager.RegisterNetMessage<MsgReloadPrototypes>(MsgReloadPrototypes.NAME, accept: NetMessageAccept.Server);
 
             _clyde.OnWindowFocused += WindowFocusedChanged;
 

Robust.Client/UserInterface/Control.cs

@@ -463,7 +463,7 @@ namespace Robust.Client.UserInterface
         {
         }
 
-        internal virtual void DrawInternal(IRenderHandle renderHandle)
+        public virtual void DrawInternal(IRenderHandle renderHandle)
         {
             Draw(renderHandle.DrawingHandleScreen);
         }

Robust.Client/UserInterface/Controls/ItemList.cs

@@ -318,8 +318,6 @@ namespace Robust.Client.UserInterface.Controls
         {
             base.Draw(handle);
 
-            var sizeBox = PixelSizeBox;
-
             var font = ActualFont;
             var listBg = ActualBackground;
             var iconBg = ActualItemBackground;
@@ -348,40 +346,33 @@ namespace Robust.Client.UserInterface.Controls
                     itemHeight = item.IconSize.Y;
                 }
 
-                itemHeight = Math.Max(itemHeight, font.GetHeight(UIScale));
+                itemHeight = Math.Max(itemHeight, ActualFont.GetHeight(UIScale));
                 itemHeight += ActualItemBackground.MinimumSize.Y;
 
-                var region = UIBox2.FromDimensions(0, offset, PixelWidth, itemHeight);
-                item.Region = region;
+                item.Region = UIBox2.FromDimensions(0, offset, PixelWidth, itemHeight);
 
-                if (region.Intersects(sizeBox))
+                bg.Draw(handle, item.Region.Value);
+
+                var contentBox = bg.GetContentBox(item.Region.Value);
+                var drawOffset = contentBox.TopLeft;
+                if (item.Icon != null)
                 {
-                    bg.Draw(handle, item.Region.Value);
-
-                    var contentBox = bg.GetContentBox(item.Region.Value);
-                    var drawOffset = contentBox.TopLeft;
-                    if (item.Icon != null)
+                    if (item.IconRegion.Size == Vector2.Zero)
                     {
-                        if (item.IconRegion.Size == Vector2.Zero)
-                        {
-                            handle.DrawTextureRect(item.Icon, UIBox2.FromDimensions(drawOffset, item.Icon.Size),
-                                item.IconModulate);
-                        }
-                        else
-                        {
-                            handle.DrawTextureRectRegion(item.Icon, UIBox2.FromDimensions(drawOffset, item.Icon.Size),
-                                item.IconRegion, item.IconModulate);
-                        }
+                        handle.DrawTextureRect(item.Icon, UIBox2.FromDimensions(drawOffset, item.Icon.Size), item.IconModulate);
                     }
-
-                    if (item.Text != null)
+                    else
                     {
-                        var textBox = new UIBox2(contentBox.Left + item.IconSize.X, contentBox.Top, contentBox.Right,
-                            contentBox.Bottom);
-                        DrawTextInternal(handle, item.Text, textBox);
+                        handle.DrawTextureRectRegion(item.Icon, UIBox2.FromDimensions(drawOffset, item.Icon.Size), item.IconRegion, item.IconModulate);
                     }
                 }
 
+                if (item.Text != null)
+                {
+                    var textBox = new UIBox2(contentBox.Left + item.IconSize.X, contentBox.Top, contentBox.Right, contentBox.Bottom);
+                    DrawTextInternal(handle, item.Text, textBox);
+                }
+
                 offset += itemHeight;
             }
         }

Robust.Client/UserInterface/Controls/SpriteView.cs

@@ -1,4 +1,4 @@
-using Robust.Client.GameObjects;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.Maths;
 
@@ -41,14 +41,14 @@ namespace Robust.Client.UserInterface.Controls
             return (32, 32) * Scale;
         }
 
-        internal override void DrawInternal(IRenderHandle renderHandle)
+        public override void DrawInternal(IRenderHandle renderHandle)
         {
             if (Sprite == null || Sprite.Deleted)
             {
                 return;
             }
 
-            renderHandle.DrawEntity(Sprite.Owner, GlobalPixelPosition + PixelSize / 2, Scale * UIScale, OverrideDirection);
+            renderHandle.DrawEntity(Sprite.Owner, GlobalPixelPosition + PixelSize / 2, Scale, OverrideDirection);
         }
     }
 }

Robust.Client/UserInterface/Controls/TabContainer.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Robust.Client.Graphics;
 using Robust.Shared.Input;
 using Robust.Shared.Localization;
@@ -75,7 +75,7 @@ namespace Robust.Client.UserInterface.Controls
             var control = GetChild(tab);
             var title = control.GetValue(TabTitleProperty);
 
-            return title ?? control.Name ?? Loc.GetString("tab-container-not-tab-title-provided");
+            return title ?? control.Name ?? Loc.GetString("No title");
         }
 
         public static string? GetTabTitle(Control control)

Robust.Client/UserInterface/CustomControls/BaseWindow.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Input;
 using Robust.Shared.IoC;
@@ -165,8 +165,6 @@ namespace Robust.Client.UserInterface.CustomControls
 
         protected internal override void MouseExited()
         {
-            base.MouseExited();
-
             if (Resizable && CurrentDrag == DragMode.None)
             {
                 DefaultCursorShape = CursorShape.Arrow;

Robust.Client/UserInterface/CustomControls/DebugInputPanel.cs

@@ -36,8 +36,7 @@ namespace Robust.Client.UserInterface.CustomControls
                 return;
             }
 
-            var functionsText = string.Join("\n", _inputManager.DownKeyFunctions);
-            _label.Text = $"Context: {_inputManager.Contexts.ActiveContext.Name}\n{functionsText}";
+            _label.Text = string.Join("\n", _inputManager.DownKeyFunctions);
         }
     }
 }

Robust.Client/UserInterface/CustomControls/EntitySpawnWindow.cs

@@ -65,7 +65,7 @@ namespace Robust.Client.UserInterface.CustomControls
             this.prototypeManager = prototypeManager;
             this.resourceCache = resourceCache;
 
-            Title = Loc.GetString("entity-spawn-window-title");
+            Title = Loc.GetString("Entity Spawn Panel");
 
 
             SetSize = (250, 300);
@@ -83,13 +83,13 @@ namespace Robust.Client.UserInterface.CustomControls
                             (SearchBar = new LineEdit
                             {
                                 HorizontalExpand = true,
-                                PlaceHolder = Loc.GetString("entity-spawn-window-search-bar-placeholder")
+                                PlaceHolder = Loc.GetString("Search")
                             }),
 
                             (ClearButton = new Button
                             {
                                 Disabled = true,
-                                Text = Loc.GetString("entity-spawn-window-clear-button"),
+                                Text = Loc.GetString("Clear"),
                             })
                         }
                     },
@@ -109,13 +109,13 @@ namespace Robust.Client.UserInterface.CustomControls
                             (EraseButton = new Button
                             {
                                 ToggleMode = true,
-                                Text = Loc.GetString("entity-spawn-window-erase-button-text")
+                                Text = Loc.GetString("Erase Mode")
                             }),
 
                             (OverrideMenu = new OptionButton
                             {
                                 HorizontalExpand = true,
-                                ToolTip = Loc.GetString("entity-spawn-window-override-menu-tooltip")
+                                ToolTip = Loc.GetString("Override placement")
                             })
                         }
                     },

Robust.Client/UserInterface/CustomControls/ScriptConsole.cs

@@ -1,5 +1,6 @@
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 
 namespace Robust.Client.UserInterface.CustomControls
@@ -36,9 +37,9 @@ namespace Robust.Client.UserInterface.CustomControls
                             (InputBar = new HistoryLineEdit
                             {
                                 HorizontalExpand = true,
-                                PlaceHolder = "Your C# code here."
+                                PlaceHolder = Loc.GetString("Your C# code here.")
                             }),
-                            (RunButton = new Button {Text = "Run"})
+                            (RunButton = new Button {Text = Loc.GetString("Run")})
                         }
                     },
                 }

Robust.Client/UserInterface/FileDialogManager.cs

@@ -148,7 +148,7 @@ namespace Robust.Client.UserInterface
         // ReSharper disable once MemberCanBeMadeStatic.Local
         private Task<string?> RunAsyncMaybe(Func<string?> action)
         {
-            if (OperatingSystem.IsMacOS())
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
                 // macOS seems pretty annoying about having the file dialog opened from the main thread.
                 // So we are forced to execute this synchronously on the main thread.
@@ -326,7 +326,7 @@ namespace Robust.Client.UserInterface
 
         private async Task<bool> IsKDialogAvailable()
         {
-            if (!OperatingSystem.IsLinux())
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
                 return false;
 
             if (!_checkedKDialogAvailable)

Robust.Client/ViewVariables/Instances/ViewVariablesInstanceEntity.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -120,7 +120,7 @@ namespace Robust.Client.ViewVariables.Instances
 
             var clientVBox = new VBoxContainer {SeparationOverride = 0};
             _tabs.AddChild(clientVBox);
-            _tabs.SetTabTitle(TabClientVars, Loc.GetString("view-variable-instance-entity-client-variables-tab-title"));
+            _tabs.SetTabTitle(TabClientVars, "Client Variables");
 
             var first = true;
             foreach (var group in LocalPropertyList(obj, ViewVariablesManager, _robustSerializer))
@@ -138,7 +138,7 @@ namespace Robust.Client.ViewVariables.Instances
 
             _clientComponents = new VBoxContainer {SeparationOverride = 0};
             _tabs.AddChild(_clientComponents);
-            _tabs.SetTabTitle(TabClientComponents, Loc.GetString("view-variable-instance-entity-client-components-tab-title"));
+            _tabs.SetTabTitle(TabClientComponents, "Client Components");
 
             PopulateClientComponents();
 
@@ -146,11 +146,11 @@ namespace Robust.Client.ViewVariables.Instances
             {
                 _serverVariables = new VBoxContainer {SeparationOverride = 0};
                 _tabs.AddChild(_serverVariables);
-                _tabs.SetTabTitle(TabServerVars, Loc.GetString("view-variable-instance-entity-server-variables-tab-title"));
+                _tabs.SetTabTitle(TabServerVars, "Server Variables");
 
                 _serverComponents = new VBoxContainer {SeparationOverride = 0};
                 _tabs.AddChild(_serverComponents);
-                _tabs.SetTabTitle(TabServerComponents, Loc.GetString("view-variable-instance-entity-server-components-tab-title"));
+                _tabs.SetTabTitle(TabServerComponents, "Server Components");
 
                 PopulateServerComponents(false);
             }
@@ -162,13 +162,13 @@ namespace Robust.Client.ViewVariables.Instances
 
             _clientComponents.AddChild(_clientComponentsSearchBar = new LineEdit
             {
-                PlaceHolder = Loc.GetString("view-variable-instance-entity-client-components-search-bar-placeholder"),
+                PlaceHolder = Loc.GetString("Search"),
                 HorizontalExpand = true,
             });
 
             _clientComponents.AddChild(_clientComponentsAddButton = new Button()
             {
-                Text = Loc.GetString("view-variable-instance-entity-server-components-add-component-button-placeholder"),
+                Text = Loc.GetString("Add Component"),
                 HorizontalExpand = true,
             });
 
@@ -198,13 +198,13 @@ namespace Robust.Client.ViewVariables.Instances
 
             _serverComponents.AddChild(_serverComponentsSearchBar = new LineEdit
             {
-                PlaceHolder = Loc.GetString("view-variable-instance-entity-server-components-search-bar-placeholder"),
+                PlaceHolder = Loc.GetString("Search"),
                 HorizontalExpand = true,
             });
 
             _serverComponents.AddChild(_serverComponentsAddButton = new Button()
             {
-                Text = Loc.GetString("view-variable-instance-entity-server-components-add-component-button-placeholder"),
+                Text = Loc.GetString("Add Component"),
                 HorizontalExpand = true,
             });
 
@@ -336,7 +336,7 @@ namespace Robust.Client.ViewVariables.Instances
         {
             _addComponentWindow?.Dispose();
 
-            _addComponentWindow = new ViewVariablesAddWindow(GetValidComponentsForAdding(), Loc.GetString("view-variable-instance-entity-add-window-client-components"));
+            _addComponentWindow = new ViewVariablesAddWindow(GetValidComponentsForAdding(), "Add Component [C]");
             _addComponentWindow.AddButtonPressed += TryAdd;
             _addComponentServer = false;
 
@@ -349,7 +349,7 @@ namespace Robust.Client.ViewVariables.Instances
 
             if (_entitySession == null) return;
 
-            _addComponentWindow = new ViewVariablesAddWindow(await GetValidServerComponentsForAdding(), Loc.GetString("view-variable-instance-entity-add-window-server-components"));
+            _addComponentWindow = new ViewVariablesAddWindow(await GetValidServerComponentsForAdding(), "Add Component [S]");
             _addComponentWindow.AddButtonPressed += TryAdd;
             _addComponentServer = true;
 

Robust.Client/ViewVariables/ViewVariablesManager.cs

@@ -16,7 +16,7 @@ using Robust.Shared.Network.Messages;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
-using static Robust.Client.ViewVariables.Editors.VVPropEditorNumeric;
+using NumberType = Robust.Client.ViewVariables.Editors.VVPropEditorNumeric.NumberType;
 
 namespace Robust.Client.ViewVariables
 {
@@ -43,13 +43,17 @@ namespace Robust.Client.ViewVariables
 
         public void Initialize()
         {
-            _netManager.RegisterNetMessage<MsgViewVariablesOpenSession>(_netMessageOpenSession);
-            _netManager.RegisterNetMessage<MsgViewVariablesRemoteData>(_netMessageRemoteData);
-            _netManager.RegisterNetMessage<MsgViewVariablesCloseSession>(_netMessageCloseSession);
-            _netManager.RegisterNetMessage<MsgViewVariablesDenySession>(_netMessageDenySession);
-            _netManager.RegisterNetMessage<MsgViewVariablesModifyRemote>();
-            _netManager.RegisterNetMessage<MsgViewVariablesReqSession>();
-            _netManager.RegisterNetMessage<MsgViewVariablesReqData>();
+            _netManager.RegisterNetMessage<MsgViewVariablesOpenSession>(MsgViewVariablesOpenSession.NAME,
+                _netMessageOpenSession);
+            _netManager.RegisterNetMessage<MsgViewVariablesRemoteData>(MsgViewVariablesRemoteData.NAME,
+                _netMessageRemoteData);
+            _netManager.RegisterNetMessage<MsgViewVariablesCloseSession>(MsgViewVariablesCloseSession.NAME,
+                _netMessageCloseSession);
+            _netManager.RegisterNetMessage<MsgViewVariablesDenySession>(MsgViewVariablesDenySession.NAME,
+                _netMessageDenySession);
+            _netManager.RegisterNetMessage<MsgViewVariablesModifyRemote>(MsgViewVariablesModifyRemote.NAME);
+            _netManager.RegisterNetMessage<MsgViewVariablesReqSession>(MsgViewVariablesReqSession.NAME);
+            _netManager.RegisterNetMessage<MsgViewVariablesReqData>(MsgViewVariablesReqData.NAME);
         }
 
         public VVPropEditor PropertyFor(Type? type)

Robust.Server/BaseServer.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Runtime;
@@ -217,28 +217,6 @@ namespace Robust.Server
                 _log.RootSawmill.AddHandler(_logHandler!);
             }
 
-            if (_commandLineArgs != null)
-            {
-                foreach (var (sawmill, level) in _commandLineArgs.LogLevels)
-                {
-                    LogLevel? logLevel;
-                    if (level == "null")
-                        logLevel = null;
-                    else
-                    {
-                        if (!Enum.TryParse<LogLevel>(level, out var result))
-                        {
-                            System.Console.WriteLine($"LogLevel {level} does not exist!");
-                            continue;
-                        }
-                        logLevel = result;
-                    }
-                    _log.GetSawmill(sawmill).Level = logLevel;
-                }
-            }
-
-            ProgramShared.PrintRuntimeInfo(_log.RootSawmill);
-
             SelfLog.Enable(s => { System.Console.WriteLine("SERILOG ERROR: {0}", s); });
 
             if (!SetupLoki())
@@ -352,10 +330,9 @@ namespace Robust.Server
 
             _watchdogApi.Initialize();
 
-            AddFinalStringsToSerializer();
             _stringSerializer.LockStrings();
 
-            if (OperatingSystem.IsWindows() && _config.GetCVar(CVars.SysWinTickPeriod) >= 0)
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && _config.GetCVar(CVars.SysWinTickPeriod) >= 0)
             {
                 WindowsTickPeriod.TimeBeginPeriod((uint) _config.GetCVar(CVars.SysWinTickPeriod));
             }
@@ -365,29 +342,6 @@ namespace Robust.Server
             return false;
         }
 
-        private void AddFinalStringsToSerializer()
-        {
-            var factory = IoCManager.Resolve<IComponentFactory>();
-            foreach (var regType in factory.AllRegisteredTypes)
-            {
-                var reg = factory.GetRegistration(regType);
-                _stringSerializer.AddString(reg.Name);
-            }
-
-            using var extraMappedStrings = typeof(BaseServer).Assembly
-                .GetManifestResourceStream("Robust.Server.ExtraMappedSerializerStrings.txt");
-
-            if (extraMappedStrings != null)
-            {
-                using var sr = new StreamReader(extraMappedStrings);
-                string? line;
-                while ((line = sr.ReadLine()) != null)
-                {
-                    _stringSerializer.AddString(line);
-                }
-            }
-        }
-
         private bool SetupLoki()
         {
             var enabled = _config.GetCVar(CVars.LokiEnabled);
@@ -449,7 +403,8 @@ namespace Robust.Server
             }
         }
 
-        internal void SetupMainLoop()
+        /// <inheritdoc />
+        public void MainLoop()
         {
             if (_mainLoop == null)
             {
@@ -471,26 +426,14 @@ namespace Robust.Server
 
             // set GameLoop.Running to false to return from this function.
             _time.Paused = false;
-        }
+            _mainLoop.Run();
 
-        internal void FinishMainLoop()
-        {
             _time.InSimulation = true;
             Cleanup();
 
             _shutdownEvent.Set();
         }
 
-        /// <inheritdoc />
-        public void MainLoop()
-        {
-            SetupMainLoop();
-
-            _mainLoop.Run();
-
-            FinishMainLoop();
-        }
-
         public bool ContentStart { get; set; }
         public bool LoadConfigAndUserData { private get; set; } = true;
 
@@ -571,7 +514,7 @@ namespace Robust.Server
 
             //TODO: This should prob shutdown all managers in a loop.
 
-            if (OperatingSystem.IsWindows() && _config.GetCVar(CVars.SysWinTickPeriod) >= 0)
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && _config.GetCVar(CVars.SysWinTickPeriod) >= 0)
             {
                 WindowsTickPeriod.TimeEndPeriod((uint) _config.GetCVar(CVars.SysWinTickPeriod));
             }

Robust.Server/CommandLineArgs.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Robust.Shared;
 using Robust.Shared.Utility;
@@ -12,7 +12,6 @@ namespace Robust.Server
         public string? ConfigFile { get; }
         public string? DataDir { get; }
         public IReadOnlyCollection<(string key, string value)> CVars { get; }
-        public IReadOnlyCollection<(string key, string value)> LogLevels { get; }
 
         // Manual parser because C# has no good command line parsing libraries. Also dependencies bad.
         // Also I don't like spending 100ms parsing command line args. Do you?
@@ -22,7 +21,6 @@ namespace Robust.Server
             string? configFile = null;
             string? dataDir = null;
             var cvars = new List<(string, string)>();
-            var logLevels = new List<(string, string)>();
             var mountOptions = new MountOptions();
 
             using var enumerator = args.GetEnumerator();
@@ -95,33 +93,13 @@ namespace Robust.Server
 
                     mountOptions.DirMounts.Add(enumerator.Current);
                 }
-                else if (arg == "--loglevel")
-                {
-                    if (!enumerator.MoveNext())
-                    {
-                        C.WriteLine("Missing loglevel sawmill.");
-                        return false;
-                    }
-
-                    var loglevel = enumerator.Current;
-                    DebugTools.AssertNotNull(loglevel);
-                    var pos = loglevel.IndexOf('=');
-
-                    if (pos == -1)
-                    {
-                        C.WriteLine("Expected = in loglevel.");
-                        return false;
-                    }
-
-                    logLevels.Add((loglevel[..pos], loglevel[(pos + 1)..]));
-                }
                 else
                 {
                     C.WriteLine("Unknown argument: {0}", arg);
                 }
             }
 
-            parsed = new CommandLineArgs(configFile, dataDir, cvars, logLevels, mountOptions);
+            parsed = new CommandLineArgs(configFile, dataDir, cvars, mountOptions);
             return true;
         }
 
@@ -132,19 +110,17 @@ Options:
   --config-file     Path to the config file to read from.
   --data-dir        Path to the data directory to read/write from/to.
   --cvar            Specifies an additional cvar overriding the config file. Syntax is <key>=<value>
-  --loglevel        Specifies an additional sawmill log level overriding the default values. Syntax is <key>=<value>
   --mount-dir       Resource directory to mount.
   --mount-zip       Resource zip to mount.
   --help            Display this help text and exit.
 ");
         }
 
-        private CommandLineArgs(string? configFile, string? dataDir, IReadOnlyCollection<(string, string)> cVars, IReadOnlyCollection<(string, string)> logLevels, MountOptions mountOptions)
+        private CommandLineArgs(string? configFile, string? dataDir, IReadOnlyCollection<(string, string)> cVars, MountOptions mountOptions)
         {
             ConfigFile = configFile;
             DataDir = dataDir;
             CVars = cVars;
-            LogLevels = logLevels;
             MountOptions = mountOptions;
         }
     }

Robust.Server/Console/ServerConsoleHost.cs

@@ -62,14 +62,15 @@ namespace Robust.Server.Console
                 var sudoShell = new SudoShell(this, localShell, shell);
                 ExecuteInShell(sudoShell, argStr.Substring("sudo ".Length));
             });
-
+            
             LoadConsoleCommands();
 
             // setup networking with clients
-            NetManager.RegisterNetMessage<MsgConCmd>(ProcessCommand);
-            NetManager.RegisterNetMessage<MsgConCmdAck>();
+            NetManager.RegisterNetMessage<MsgConCmd>(MsgConCmd.NAME, ProcessCommand);
+            NetManager.RegisterNetMessage<MsgConCmdAck>(MsgConCmdAck.NAME);
 
-            NetManager.RegisterNetMessage<MsgConCmdReg>(message => HandleRegistrationRequest(message.MsgChannel));
+            NetManager.RegisterNetMessage<MsgConCmdReg>(MsgConCmdReg.NAME,
+                message => HandleRegistrationRequest(message.MsgChannel));
         }
 
         private void ExecuteInShell(IConsoleShell shell, string command)

Robust.Server/Debugging/DebugDrawingManager.cs

@@ -14,7 +14,7 @@ namespace Robust.Server.Debugging
 
         public void Initialize()
         {
-            _net.RegisterNetMessage<MsgRay>();
+            _net.RegisterNetMessage<MsgRay>(MsgRay.NAME);
             // TODO _physics.DebugDrawRay += data => PhysicsOnDebugDrawRay(data);
         }
 

Robust.Server/ExtraMappedSerializerStrings.txt

@@ -1 +0,0 @@
-fixture-0

Robust.Server/GameObjects/Components/Actor/ActorComponent.cs

@@ -1,3 +1,4 @@
+using System;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
@@ -8,7 +9,69 @@ namespace Robust.Server.GameObjects
     {
         public override string Name => "Actor";
 
-        [ViewVariables]
-        public IPlayerSession PlayerSession { get; internal set; } = default!;
+        [ViewVariables] public IPlayerSession PlayerSession { get; internal set; } = default!;
+
+        /// <inheritdoc />
+        protected override void Shutdown()
+        {
+            base.Shutdown();
+
+            // Warning: careful here, Detach removes this component, make sure this is after the base shutdown
+            // to prevent infinite recursion
+            // ReSharper disable once ConstantConditionalAccessQualifier
+            PlayerSession?.DetachFromEntity();
+        }
+    }
+
+    /// <summary>
+    ///     Raised on an entity whenever a player attaches to this entity.
+    /// </summary>
+    [Serializable]
+    [Obsolete("Component Messages are deprecated, use Entity Events instead.")]
+    public class PlayerAttachedMsg : ComponentMessage
+    {
+        public IPlayerSession NewPlayer { get; }
+
+        public PlayerAttachedMsg(IPlayerSession newPlayer)
+        {
+            NewPlayer = newPlayer;
+        }
+    }
+
+    /// <summary>
+    ///     Raised on an entity whenever a player detaches from this entity.
+    /// </summary>
+    [Serializable]
+    [Obsolete("Component Messages are deprecated, use Entity Events instead.")]
+    public class PlayerDetachedMsg : ComponentMessage
+    {
+        public IPlayerSession OldPlayer { get; }
+
+        public PlayerDetachedMsg(IPlayerSession oldPlayer)
+        {
+            OldPlayer = oldPlayer;
+        }
+    }
+
+    public class PlayerAttachSystemMessage : EntityEventArgs
+    {
+        public PlayerAttachSystemMessage(IEntity entity, IPlayerSession newPlayer)
+        {
+            Entity = entity;
+            NewPlayer = newPlayer;
+        }
+
+        public IEntity Entity { get; }
+        public IPlayerSession NewPlayer { get; }
+    }
+
+    public class PlayerDetachedSystemMessage : EntityEventArgs
+    {
+        public PlayerDetachedSystemMessage(IEntity entity)
+        {
+            Entity = entity;
+        }
+
+        public IEntity Entity { get; }
     }
 }

Robust.Server/GameObjects/EntitySystems/ActorSystem.cs

@@ -1,227 +0,0 @@
-using JetBrains.Annotations;
-using Robust.Server.Player;
-using Robust.Shared.GameObjects;
-
-namespace Robust.Server.GameObjects
-{
-    /// <summary>
-    ///     System that handles players being attached/detached from entities.
-    /// </summary>
-    [UsedImplicitly]
-    public sealed class ActorSystem : EntitySystem
-    {
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<AttachPlayerEvent>(OnActorPlayerAttach);
-            SubscribeLocalEvent<ActorComponent, DetachPlayerEvent>(OnActorPlayerDetach);
-            SubscribeLocalEvent<ActorComponent, ComponentShutdown>(OnActorShutdown);
-        }
-
-        private void OnActorPlayerAttach(AttachPlayerEvent args)
-        {
-            args.Result = Attach(args.Entity, args.Player, args.Force, out var forceKicked);
-            args.ForceKicked = forceKicked;
-        }
-
-        /// <summary>
-        ///     Attaches a player session to an entity, optionally kicking any sessions already attached to it.
-        /// </summary>
-        /// <param name="entity">The entity to attach the player to</param>
-        /// <param name="player">The player to attach to the entity</param>
-        /// <param name="force">Whether to kick any existing players from the entity</param>
-        /// <returns>Whether the attach succeeded, or not.</returns>
-        public bool Attach(IEntity entity, IPlayerSession player, bool force = false)
-        {
-            return Attach(entity, player, false, out _);
-        }
-
-        /// <summary>
-        ///     Attaches a player session to an entity, optionally kicking any sessions already attached to it.
-        /// </summary>
-        /// <param name="entity">The entity to attach the player to</param>
-        /// <param name="player">The player to attach to the entity</param>
-        /// <param name="force">Whether to kick any existing players from the entity</param>
-        /// <param name="forceKicked">The player that was forcefully kicked, or null.</param>
-        /// <returns>Whether the attach succeeded, or not.</returns>
-        public bool Attach(IEntity entity, IPlayerSession player, bool force, out IPlayerSession? forceKicked)
-        {
-            // Null by default.
-            forceKicked = null;
-
-            // Cannot attach to a deleted entity.
-            if (entity.Deleted)
-            {
-                return false;
-            }
-
-            var uid = entity.Uid;
-
-            // Check if there was a player attached to the entity already...
-            if (ComponentManager.TryGetComponent(uid, out ActorComponent actor))
-            {
-                // If we're not forcing the attach, this fails.
-                if (!force)
-                {
-                    return false;
-                }
-
-                // Set the event's force-kicked session before detaching it.
-                forceKicked = actor.PlayerSession;
-
-                // This detach cannot fail, as a player is attached to this entity.
-                // It's important to note that detaching the player removes the component.
-                RaiseLocalEvent(uid, new DetachPlayerEvent());
-            }
-
-            // We add the actor component.
-            actor = ComponentManager.AddComponent<ActorComponent>(entity);
-            actor.PlayerSession = player;
-            player.SetAttachedEntity(entity);
-
-            // The player is fully attached now, raise an event!
-            RaiseLocalEvent(uid, new PlayerAttachedEvent(entity, player, forceKicked));
-            return true;
-        }
-
-        // Not gonna make this method call Detach as all we have to do is remove a component...
-        private void OnActorPlayerDetach(EntityUid uid, ActorComponent component, DetachPlayerEvent args)
-        {
-            // Removing the component will call shutdown, and our subscription will handle the rest of the detach logic.
-            ComponentManager.RemoveComponent<ActorComponent>(uid);
-            args.Result = true;
-        }
-
-        /// <summary>
-        ///     Detaches an attached session from the entity, if any.
-        /// </summary>
-        /// <param name="entity">The entity player sessions will be detached from.</param>
-        /// <returns>Whether any player session was detached.</returns>
-        public bool Detach(IEntity entity)
-        {
-            if (!entity.HasComponent<ActorComponent>())
-                return false;
-
-            // Removing the component will call shutdown, and our subscription will handle the rest of the detach logic.
-            entity.RemoveComponent<ActorComponent>();
-            return true;
-        }
-
-        /// <summary>
-        ///     Detaches this player from its attached entity, if any.
-        /// </summary>
-        /// <param name="player">The player session that will be detached from any attached entities.</param>
-        /// <returns>Whether the player is now detached from any entities.
-        /// This returns true if the player wasn't attached to any entity.</returns>
-        public bool Detach(IPlayerSession player)
-        {
-            var entity = player.AttachedEntity;
-            return entity == null || Detach(entity);
-        }
-
-        private void OnActorShutdown(EntityUid uid, ActorComponent component, ComponentShutdown args)
-        {
-            component.PlayerSession.SetAttachedEntity(null);
-
-            var entity = EntityManager.GetEntity(uid);
-
-            // The player is fully detached now that the component has shut down.
-            RaiseLocalEvent(uid, new PlayerDetachedEvent(entity, component.PlayerSession));
-        }
-    }
-
-    /// <summary>
-    ///     Raise this broadcast event to attach a player to an entity, optionally detaching the player attached to it.
-    /// </summary>
-    public sealed class AttachPlayerEvent : EntityEventArgs
-    {
-        /// <summary>
-        ///     Player to attach to the entity.
-        ///     Input parameter.
-        /// </summary>
-        public IPlayerSession Player { get; }
-
-        /// <summary>
-        ///     Entity to attach the player to.
-        ///     Input parameter.
-        /// </summary>
-        public IEntity Entity { get; }
-
-        /// <summary>
-        ///     Whether to force-attach the player,
-        ///     detaching any players attached to it if any.
-        ///     Input parameter.
-        /// </summary>
-        public bool Force { get; }
-
-        /// <summary>
-        ///     If the attach was forced and there was a player attached to the entity before, this will be it.
-        ///     Output parameter.
-        /// </summary>
-        public IPlayerSession? ForceKicked { get; set; }
-
-        /// <summary>
-        ///     Whether the player was attached correctly.
-        ///     False if not forcing and the entity already had a player attached to it.
-        ///     Output parameter.
-        /// </summary>
-        public bool Result { get; set; } = false;
-
-        public AttachPlayerEvent(IEntity entity, IPlayerSession player, bool force = false)
-        {
-            Entity = entity;
-            Player = player;
-            Force = force;
-        }
-    }
-
-    /// <summary>
-    ///     Raise this directed event to detach a player from an entity.
-    /// </summary>
-    public sealed class DetachPlayerEvent : EntityEventArgs
-    {
-        /// <summary>
-        ///     Whether the player was detached correctly.
-        ///     Fails if no player was attached to the entity.
-        ///     Output parameter.
-        /// </summary>
-        public bool Result { get; set; } = false;
-    }
-
-    /// <summary>
-    ///     Event for when a player has been attached to an entity.
-    /// </summary>
-    public sealed class PlayerAttachedEvent : EntityEventArgs
-    {
-        public IEntity Entity { get; }
-        public IPlayerSession Player { get; }
-
-        /// <summary>
-        ///     The player session that was forcefully kicked from the entity, if any.
-        /// </summary>
-        public IPlayerSession? Kicked { get; }
-
-        public PlayerAttachedEvent(IEntity entity, IPlayerSession player, IPlayerSession? kicked = null)
-        {
-            Entity = entity;
-            Player = player;
-            Kicked = kicked;
-        }
-    }
-
-    /// <summary>
-    ///     Event for when a player has been detached from an entity.
-    /// </summary>
-    public sealed class PlayerDetachedEvent : EntityEventArgs
-    {
-        public IEntity Entity { get; }
-        public IPlayerSession Player { get; }
-
-        public PlayerDetachedEvent(IEntity entity, IPlayerSession player)
-        {
-            Entity = entity;
-            Player = player;
-        }
-    }
-}

Robust.Server/GameObjects/EntitySystems/TileLookup/GridTileLookupNode.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
@@ -8,7 +7,7 @@ namespace Robust.Server.GameObjects
     internal sealed class GridTileLookupNode
     {
         internal GridTileLookupChunk ParentChunk { get; }
-
+        
         internal Vector2i Indices { get; }
 
         internal IEnumerable<IEntity> Entities
@@ -18,18 +17,7 @@ namespace Robust.Server.GameObjects
                 foreach (var entity in _entities)
                 {
                     if (!entity.Deleted)
-                    {
                         yield return entity;
-                    }
-
-                    if (!entity.TryGetComponent(out ContainerManagerComponent? containerManager)) continue;
-                    foreach (var container in containerManager.GetAllContainers())
-                    {
-                        foreach (var child in container.ContainedEntities)
-                        {
-                            yield return child;
-                        }
-                    }
                 }
             }
         }
@@ -41,7 +29,7 @@ namespace Robust.Server.GameObjects
             ParentChunk = parentChunk;
             Indices = indices;
         }
-
+        
         internal void AddEntity(IEntity entity)
         {
             _entities.Add(entity);

Robust.Server/GameObjects/EntitySystems/TileLookup/GridTileLookupSystem.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
-using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
@@ -17,7 +16,6 @@ namespace Robust.Server.GameObjects
     [UsedImplicitly]
     public sealed class GridTileLookupSystem : EntitySystem
     {
-        [Dependency] private readonly IEntityLookup _lookup = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
 
         private readonly Dictionary<GridId, Dictionary<Vector2i, GridTileLookupChunk>> _graph =
@@ -200,21 +198,17 @@ namespace Robust.Server.GameObjects
 
         private Box2 GetEntityBox(IEntity entity)
         {
-            var aabb = _lookup.GetWorldAabbFromEntity(entity);
-
             // Need to clip the aabb as anything with an edge intersecting another tile might be picked up, such as walls.
-            return aabb.Scale(0.98f);
+            if (entity.TryGetComponent(out IPhysBody? physics))
+                return new Box2(physics.GetWorldAABB().BottomLeft + 0.01f, physics.GetWorldAABB().TopRight - 0.01f);
+
+            // Don't want to accidentally get neighboring tiles unless we're near an edge
+            return Box2.CenteredAround(entity.Transform.Coordinates.ToMapPos(EntityManager), Vector2.One / 2);
         }
 
         public override void Initialize()
         {
-            base.Initialize();
-            #if DEBUG
-            SubscribeNetworkEvent<RequestGridTileLookupMessage>(HandleRequest);
-            #endif
             SubscribeLocalEvent<MoveEvent>(HandleEntityMove);
-            SubscribeLocalEvent<EntInsertedIntoContainerMessage>(HandleContainerInsert);
-            SubscribeLocalEvent<EntRemovedFromContainerMessage>(HandleContainerRemove);
             SubscribeLocalEvent<EntityInitializedMessage>(HandleEntityInitialized);
             SubscribeLocalEvent<EntityDeletedMessage>(HandleEntityDeleted);
             _mapManager.OnGridCreated += HandleGridCreated;
@@ -222,16 +216,6 @@ namespace Robust.Server.GameObjects
             _mapManager.TileChanged += HandleTileChanged;
         }
 
-        private void HandleContainerRemove(EntRemovedFromContainerMessage ev)
-        {
-            HandleEntityAdd(ev.Entity);
-        }
-
-        private void HandleContainerInsert(EntInsertedIntoContainerMessage ev)
-        {
-            HandleEntityRemove(ev.Entity);
-        }
-
         public override void Shutdown()
         {
             base.Shutdown();
@@ -241,21 +225,8 @@ namespace Robust.Server.GameObjects
             _mapManager.TileChanged -= HandleTileChanged;
         }
 
-#if DEBUG
-        private void HandleRequest(RequestGridTileLookupMessage message, EntitySessionEventArgs args)
-        {
-            var entities = GetEntitiesIntersecting(message.GridId, message.Indices).Select(e => e.Uid).ToList();
-            RaiseNetworkEvent(new SendGridTileLookupMessage(message.GridId, message.Indices, entities), args.SenderSession.ConnectedClient);
-        }
-#endif
-
         private void HandleEntityInitialized(EntityInitializedMessage message)
         {
-            if (message.Entity.IsInContainer())
-            {
-                return;
-            }
-
             HandleEntityAdd(message.Entity);
         }
 

Robust.Server/GameObjects/ServerEntityManager.cs

@@ -9,6 +9,7 @@ using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
+using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Network.Messages;
 using Robust.Shared.Prototypes;
@@ -107,7 +108,7 @@ namespace Robust.Server.GameObjects
         /// <inheritdoc />
         public void SetupNetworking()
         {
-            _networkManager.RegisterNetMessage<MsgEntity>(HandleEntityNetworkMessage);
+            _networkManager.RegisterNetMessage<MsgEntity>(MsgEntity.NAME, HandleEntityNetworkMessage);
 
             _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
 
@@ -232,7 +233,6 @@ namespace Robust.Server.GameObjects
                     var msg = message.SystemMessage;
                     var sessionType = typeof(EntitySessionMessage<>).MakeGenericType(msg.GetType());
                     var sessionMsg = Activator.CreateInstance(sessionType, new EntitySessionEventArgs(player), msg)!;
-                    ReceivedSystemMessage?.Invoke(this, msg);
                     ReceivedSystemMessage?.Invoke(this, sessionMsg);
                     return;
             }

Robust.Server/GameStates/EntityViewCulling.cs

@@ -213,8 +213,7 @@ namespace Robust.Server.GameStates
                         new TransformComponent.TransformComponentState(Vector2NaN,
                             oldState.Rotation,
                             oldState.ParentID,
-                            oldState.NoLocalRotation,
-                            oldState.Anchored)
+                            oldState.NoLocalRotation)
                     }));
             }
 

Robust.Server/GameStates/ServerGameStateManager.cs

@@ -12,6 +12,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
+using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Network.Messages;
 using Robust.Shared.Players;
@@ -62,8 +63,8 @@ namespace Robust.Server.GameStates
         /// <inheritdoc />
         public void Initialize()
         {
-            _networkManager.RegisterNetMessage<MsgState>();
-            _networkManager.RegisterNetMessage<MsgStateAck>(HandleStateAck);
+            _networkManager.RegisterNetMessage<MsgState>(MsgState.NAME);
+            _networkManager.RegisterNetMessage<MsgStateAck>(MsgStateAck.NAME, HandleStateAck);
 
             _networkManager.Connected += HandleClientConnected;
             _networkManager.Disconnect += HandleClientDisconnect;
@@ -183,8 +184,6 @@ namespace Robust.Server.GameStates
                     oldestAck = lastAck;
                 }
 
-                DebugTools.Assert(state.MapData?.CreatedMaps is null || (state.MapData?.CreatedMaps is not null && state.EntityStates is not null), "Sending new maps, but no entity state.");
-
                 // actually send the state
                 var stateUpdateMessage = _networkManager.CreateNetMessage<MsgState>();
                 stateUpdateMessage.State = state;
@@ -212,10 +211,7 @@ namespace Robust.Server.GameStates
                     _logger.Log(LogLevel.Error, e, string.Empty);
                 }
 
-                var msg = _networkManager.CreateNetMessage<MsgState>();
-                msg.MsgChannel = session.ConnectedClient;
-
-                return (msg, null);
+                return (new MsgState(session.ConnectedClient), null);
             }
 
             var mailBag = _playerManager.GetAllPlayers()
@@ -298,8 +294,10 @@ namespace Robust.Server.GameStates
 
                 DebugTools.Assert(entity.Initialized);
 
-                if (entity.LastModifiedTick >= fromTick)
-                    stateEntities.Add(GetEntityState(entityMan.ComponentManager, player, entity.Uid, fromTick));
+                if (entity.LastModifiedTick <= fromTick)
+                    continue;
+
+                stateEntities.Add(GetEntityState(entityMan.ComponentManager, player, entity.Uid, fromTick));
             }
 
             // no point sending an empty collection

Robust.Server/Placement/PlacementManager.cs

@@ -1,13 +1,13 @@
 using System;
+using Robust.Shared.IoC;
+using Robust.Shared.Map;
 using System.Collections.Generic;
 using System.Linq;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Log;
-using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Network;
 using Robust.Shared.Network.Messages;
@@ -34,7 +34,7 @@ namespace Robust.Server.Placement
 
         public void Initialize()
         {
-            _networkManager.RegisterNetMessage<MsgPlacement>(HandleNetMessage);
+            _networkManager.RegisterNetMessage<MsgPlacement>(MsgPlacement.NAME, HandleNetMessage);
         }
 
         /// <summary>

Robust.Server/Player/IPlayerSession.cs

@@ -20,8 +20,8 @@ namespace Robust.Server.Player
         ///     NOTE: The content pack almost certainly has an alternative for this.
         ///     Do not call this directly for most content code.
         /// </summary>
-        /// <param name="entity">The entity to attach to.</param>
-        void AttachToEntity(IEntity? entity);
+        /// <param name="a">The entity to attach to.</param>
+        void AttachToEntity(IEntity? a);
 
         /// <summary>
         ///     Detaches this player from an entity.
@@ -36,12 +36,5 @@ namespace Robust.Server.Player
         ///     Persistent data for this player.
         /// </summary>
         IPlayerData Data { get; }
-
-        /// <summary>
-        ///     Internal method to set <see cref="ICommonSession.AttachedEntity"/> and update the player's status.
-        ///     Do NOT use this unless you know what you're doing, you probably want <see cref="AttachToEntity"/>
-        ///     and <see cref="DetachFromEntity"/> instead.
-        /// </summary>
-        internal void SetAttachedEntity(IEntity? entity);
     }
 }

Robust.Server/Player/PlayerManager.cs

@@ -107,8 +107,8 @@ namespace Robust.Server.Player
 
             MaxPlayers = maxPlayers;
 
-            _network.RegisterNetMessage<MsgPlayerListReq>(HandlePlayerListReq);
-            _network.RegisterNetMessage<MsgPlayerList>();
+            _network.RegisterNetMessage<MsgPlayerListReq>(MsgPlayerListReq.NAME, HandlePlayerListReq);
+            _network.RegisterNetMessage<MsgPlayerList>(MsgPlayerList.NAME);
 
             _network.Connecting += OnConnecting;
             _network.Connected += NewSession;

Robust.Server/Player/PlayerSession.cs

@@ -6,7 +6,6 @@ using Robust.Shared.GameStates;
 using Robust.Shared.Network;
 using Robust.Shared.Players;
 using Robust.Shared.ViewVariables;
-using Logger = Robust.Shared.Log.Logger;
 
 namespace Robust.Server.Player
 {
@@ -37,7 +36,7 @@ namespace Robust.Server.Player
 
         [ViewVariables] public INetChannel ConnectedClient { get; }
 
-        [ViewVariables] public IEntity? AttachedEntity { get; set; }
+        [ViewVariables] public IEntity? AttachedEntity { get; private set; }
 
         [ViewVariables] public EntityUid? AttachedEntityUid => AttachedEntity?.Uid;
 
@@ -110,17 +109,21 @@ namespace Robust.Server.Player
         public event EventHandler<SessionStatusEventArgs>? PlayerStatusChanged;
 
         /// <inheritdoc />
-        public void AttachToEntity(IEntity? entity)
+        public void AttachToEntity(IEntity? a)
         {
             DetachFromEntity();
 
-            if (entity == null)
-                return;
-
-            if (!EntitySystem.Get<ActorSystem>().Attach(entity, this))
+            if (a == null)
             {
-                Logger.Warning($"Couldn't attach player \"{this}\" to entity \"{entity}\"! Did it have a player already attached to it?");
+                return;
             }
+
+            var actorComponent = a.AddComponent<ActorComponent>();
+            actorComponent.PlayerSession = this;
+            AttachedEntity = a;
+            a.SendMessage(actorComponent, new PlayerAttachedMsg(this));
+            a.EntityManager.EventBus.RaiseEvent(EventSource.Local, new PlayerAttachSystemMessage(a, this));
+            UpdatePlayerState();
         }
 
         /// <inheritdoc />
@@ -129,21 +132,22 @@ namespace Robust.Server.Player
             if (AttachedEntity == null)
                 return;
 
-#if EXCEPTION_TOLERANCE
             if (AttachedEntity.Deleted)
             {
-                Logger.Warning($"Player \"{this}\" was attached to an entity that was deleted. THIS SHOULD NEVER HAPPEN, BUT DOES.");
-                // We can't contact ActorSystem because trying to fire an entity event would crash.
-                // Work around it.
+                throw new InvalidOperationException("Tried to detach player, but my entity does not exist!");
+            }
+
+            if (AttachedEntity.TryGetComponent<ActorComponent>(out var actor))
+            {
+                AttachedEntity.SendMessage(actor, new PlayerDetachedMsg(this));
+                AttachedEntity.EntityManager.EventBus.RaiseEvent(EventSource.Local, new PlayerDetachedSystemMessage(AttachedEntity));
+                AttachedEntity.RemoveComponent<ActorComponent>();
                 AttachedEntity = null;
                 UpdatePlayerState();
-                return;
             }
-#endif
-
-            if (!EntitySystem.Get<ActorSystem>().Detach(AttachedEntity))
+            else
             {
-                Logger.Warning($"Couldn't detach player \"{this}\" to entity \"{AttachedEntity}\"! Is it missing an ActorComponent?");
+                throw new InvalidOperationException("Tried to detach player, but entity does not have ActorComponent!");
             }
         }
 
@@ -186,13 +190,6 @@ namespace Robust.Server.Player
 
         public LoginType AuthType => ConnectedClient.AuthType;
 
-        /// <inheritdoc />
-        void IPlayerSession.SetAttachedEntity(IEntity? entity)
-        {
-            AttachedEntity = entity;
-            UpdatePlayerState();
-        }
-
         private void UpdatePlayerState()
         {
             PlayerState.Status = Status;

Robust.Server/Program.cs

@@ -98,7 +98,7 @@ namespace Robust.Server
 
         internal static void SetupLogging()
         {
-            if (OperatingSystem.IsWindows())
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
 #if WINDOWS_USE_UTF8_CONSOLE
                 System.Console.OutputEncoding = Encoding.UTF8;

Robust.Server/Prototypes/ServerPrototypeManager.cs

@@ -24,7 +24,7 @@ namespace Robust.Server.Prototypes
         {
             base.Initialize();
 
-            _netManager.RegisterNetMessage<MsgReloadPrototypes>(HandleReloadPrototypes, NetMessageAccept.Server);
+            _netManager.RegisterNetMessage<MsgReloadPrototypes>(MsgReloadPrototypes.NAME, HandleReloadPrototypes, NetMessageAccept.Server);
         }
 
         private void HandleReloadPrototypes(MsgReloadPrototypes msg)

Robust.Server/Robust.Server.csproj

@@ -29,9 +29,6 @@
     <Content Include="server_config.toml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <EmbeddedResource Include="ExtraMappedSerializerStrings.txt">
-      <LogicalName>Robust.Server.ExtraMappedSerializerStrings.txt</LogicalName>
-    </EmbeddedResource>
   </ItemGroup>
   <Import Project="..\MSBuild\Robust.Engine.targets" />
 </Project>

Robust.Server/Scripting/ScriptHost.cs

@@ -36,11 +36,11 @@ namespace Robust.Server.Scripting
 
         public void Initialize()
         {
-            _netManager.RegisterNetMessage<MsgScriptStop>(ReceiveScriptEnd);
-            _netManager.RegisterNetMessage<MsgScriptEval>(ReceiveScriptEval);
-            _netManager.RegisterNetMessage<MsgScriptStart>(ReceiveScriptStart);
-            _netManager.RegisterNetMessage<MsgScriptResponse>();
-            _netManager.RegisterNetMessage<MsgScriptStartAck>();
+            _netManager.RegisterNetMessage<MsgScriptStop>(MsgScriptStop.NAME, ReceiveScriptEnd);
+            _netManager.RegisterNetMessage<MsgScriptEval>(MsgScriptEval.NAME, ReceiveScriptEval);
+            _netManager.RegisterNetMessage<MsgScriptStart>(MsgScriptStart.NAME, ReceiveScriptStart);
+            _netManager.RegisterNetMessage<MsgScriptResponse>(MsgScriptResponse.NAME);
+            _netManager.RegisterNetMessage<MsgScriptStartAck>(MsgScriptStartAck.NAME);
 
             _playerManager.PlayerStatusChanged += PlayerManagerOnPlayerStatusChanged;
         }

Robust.Server/ServerIoC.cs

@@ -37,7 +37,6 @@ namespace Robust.Server
 
             IoCManager.Register<IBaseServer, BaseServer>();
             IoCManager.Register<IBaseServerInternal, BaseServer>();
-            IoCManager.Register<BaseServer, BaseServer>();
             IoCManager.Register<IGameTiming, GameTiming>();
             IoCManager.Register<IComponentFactory, ServerComponentFactory>();
             IoCManager.Register<IConGroupController, ConGroupController>();

Robust.Server/Utility/WindowsTickPeriod.cs

@@ -11,7 +11,7 @@ namespace Robust.Server.Utility
 
         public static void TimeBeginPeriod(uint period)
         {
-            if (!OperatingSystem.IsWindows())
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 throw new InvalidOperationException();
 
             var ret = timeBeginPeriod(period);
@@ -21,7 +21,7 @@ namespace Robust.Server.Utility
 
         public static void TimeEndPeriod(uint period)
         {
-            if (!OperatingSystem.IsWindows())
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 throw new InvalidOperationException();
 
             var ret = timeEndPeriod(period);

Robust.Server/ViewVariables/ViewVariablesHost.cs

@@ -13,7 +13,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Reflection;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
-using static Robust.Shared.Network.Messages.MsgViewVariablesDenySession;
+using DenyReason = Robust.Shared.Network.Messages.MsgViewVariablesDenySession.DenyReason;
 
 namespace Robust.Server.ViewVariables
 {
@@ -34,13 +34,16 @@ namespace Robust.Server.ViewVariables
 
         public void Initialize()
         {
-            _netManager.RegisterNetMessage<MsgViewVariablesReqSession>(_msgReqSession);
-            _netManager.RegisterNetMessage<MsgViewVariablesReqData>(_msgReqData);
-            _netManager.RegisterNetMessage<MsgViewVariablesModifyRemote>(_msgModifyRemote);
-            _netManager.RegisterNetMessage<MsgViewVariablesCloseSession>(_msgCloseSession);
-            _netManager.RegisterNetMessage<MsgViewVariablesDenySession>();
-            _netManager.RegisterNetMessage<MsgViewVariablesOpenSession>();
-            _netManager.RegisterNetMessage<MsgViewVariablesRemoteData>();
+            _netManager.RegisterNetMessage<MsgViewVariablesReqSession>(MsgViewVariablesReqSession.NAME,
+                _msgReqSession);
+            _netManager.RegisterNetMessage<MsgViewVariablesReqData>(MsgViewVariablesReqData.NAME, _msgReqData);
+            _netManager.RegisterNetMessage<MsgViewVariablesModifyRemote>(MsgViewVariablesModifyRemote.NAME,
+                _msgModifyRemote);
+            _netManager.RegisterNetMessage<MsgViewVariablesCloseSession>(MsgViewVariablesCloseSession.NAME,
+                _msgCloseSession);
+            _netManager.RegisterNetMessage<MsgViewVariablesDenySession>(MsgViewVariablesDenySession.NAME);
+            _netManager.RegisterNetMessage<MsgViewVariablesOpenSession>(MsgViewVariablesOpenSession.NAME);
+            _netManager.RegisterNetMessage<MsgViewVariablesRemoteData>(MsgViewVariablesRemoteData.NAME);
         }
 
         private void _msgCloseSession(MsgViewVariablesCloseSession message)

Robust.Shared.Maths/FloatMath.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Robust.Shared.Maths
+{
+    [Obsolete("Use MathHelper instead.")]
+    public static class FloatMath
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static float Clamp01(float val)
+        {
+            return MathHelper.Clamp01(val);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static T Clamp<T>(T val, T min, T max) where T : IComparable<T>
+        {
+            return MathHelper.Clamp(val, min, max);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static float Clamp(float val, float min, float max)
+        {
+            return MathHelper.Clamp(val, min, max);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static double Clamp(double val, double min, double max)
+        {
+            return MathHelper.Clamp(val, min, max);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static bool CloseTo(float a, float b, double tolerance = .00001)
+        {
+            return MathHelper.CloseTo(a, b, tolerance);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static float Lerp(float a, float b, float blend)
+        {
+            return MathHelper.Lerp(a, b, blend);
+        }
+    }
+}

Robust.Shared/Asynchronous/TaskManager.cs

@@ -14,11 +14,6 @@ namespace Robust.Shared.Asynchronous
         public void Initialize()
         {
             _mainThreadContext = new RobustSynchronizationContext(_runtimeLog);
-            ResetSynchronizationContext();
-        }
-
-        public void ResetSynchronizationContext()
-        {
             SynchronizationContext.SetSynchronizationContext(_mainThreadContext);
         }
 

Robust.Shared/CVars.cs

@@ -73,7 +73,7 @@ namespace Robust.Shared
         // just has the Lidgren thread go absolute brr polling.
         public static readonly CVarDef<float> NetPredictLagBias = CVarDef.Create(
                 "net.predict_lag_bias",
-                OperatingSystem.IsWindows() ? 0.016f : 0,
+                RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? 0.016f : 0,
                 CVar.ARCHIVE);
 
         public static readonly CVarDef<int> NetStateBufMergeThreshold =
@@ -463,12 +463,5 @@ namespace Robust.Shared
         /// </summary>
         public static readonly CVarDef<int> DebugTargetFps =
             CVarDef.Create("debug.target_fps", 60, CVar.CLIENTONLY | CVar.ARCHIVE);
-
-        /*
-         * MIDI
-         */
-
-        public static readonly CVarDef<float> MidiVolume =
-            CVarDef.Create("midi.volume", 0f, CVar.CLIENTONLY | CVar.ARCHIVE);
     }
 }

Robust.Shared/Configuration/NetConfigurationManager.cs

@@ -82,7 +82,7 @@ namespace Robust.Shared.Configuration
                 _netManager.Disconnect += PeerDisconnected;
             }
 
-            _netManager.RegisterNetMessage<MsgConVars>(HandleNetVarMessage);
+            _netManager.RegisterNetMessage<MsgConVars>(MsgConVars.NAME, HandleNetVarMessage);
         }
 
         private void PeerConnected(object? sender, NetChannelArgs e)

Robust.Shared/Containers/BaseContainer.cs

@@ -68,10 +68,6 @@ namespace Robust.Shared.Containers
             InternalInsert(toinsert);
             transform.AttachParent(Owner.Transform);
 
-            // This is an edge case where the parent grid is the container being inserted into, so AttachParent would not unanchor.
-            if (transform.Anchored)
-                transform.Anchored = false;
-
             // spatially move the object to the location of the container. If you don't want this functionality, the
             // calling code can save the local position before calling this function, and apply it afterwords.
             transform.LocalPosition = Vector2.Zero;
@@ -149,8 +145,9 @@ namespace Robust.Shared.Containers
         {
             DebugTools.Assert(!Deleted);
 
-            Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new EntInsertedIntoContainerMessage(toinsert, this));
+            Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new EntInsertedIntoContainerMessage(toinsert, this));
             Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new UpdateContainerOcclusionMessage(toinsert));
+            Manager.Owner.SendMessage(Manager, new ContainerContentsModifiedMessage(this, toinsert, false));
             Manager.Dirty();
         }
 
@@ -165,8 +162,9 @@ namespace Robust.Shared.Containers
             DebugTools.AssertNotNull(toremove);
             DebugTools.Assert(toremove.IsValid());
 
-            Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new EntRemovedFromContainerMessage(toremove, this));
+            Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new EntRemovedFromContainerMessage(toremove, this));
             Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new UpdateContainerOcclusionMessage(toremove));
+            Manager.Owner.SendMessage(Manager, new ContainerContentsModifiedMessage(this, toremove, true));
             Manager.Dirty();
         }
     }

Robust.Shared/Containers/ContainerContentsModifiedMessage.cs

@@ -0,0 +1,40 @@
+using System;
+using Robust.Shared.GameObjects;
+
+namespace Robust.Shared.Containers
+{
+    /// <summary>
+    /// The contents of this container have been changed.
+    /// </summary>
+    [Obsolete("Component Messages are deprecated, use Entity Events instead.")]
+    public class ContainerContentsModifiedMessage : ComponentMessage
+    {
+        /// <summary>
+        /// Container whose contents were modified.
+        /// </summary>
+        public IContainer Container { get; }
+
+        /// <summary>
+        /// Entity that was added or removed from the container.
+        /// </summary>
+        public IEntity Entity { get; }
+
+        /// <summary>
+        /// If true, the entity was removed. If false, it was added to the container.
+        /// </summary>
+        public bool Removed { get; }
+
+        /// <summary>
+        /// Constructs a new instance of <see cref="ContainerContentsModifiedMessage"/>.
+        /// </summary>
+        /// <param name="container">Container whose contents were modified.</param>
+        /// <param name="entity">Entity that was added or removed in the container.</param>
+        /// <param name="removed">If true, the entity was removed. If false, it was added to the container.</param>
+        public ContainerContentsModifiedMessage(IContainer container, IEntity entity, bool removed)
+        {
+            Container = container;
+            Entity = entity;
+            Removed = removed;
+        }
+    }
+}

Robust.Shared/Containers/ContainerHelpers.cs

@@ -197,27 +197,6 @@ namespace Robust.Shared.Containers
             return userContainer == otherContainer;
         }
 
-        public static bool IsInSameOrParentContainer(this IEntity user, IEntity other)
-        {
-            DebugTools.AssertNotNull(user);
-            DebugTools.AssertNotNull(other);
-
-            var isUserContained = TryGetContainer(user, out var userContainer);
-            var isOtherContained = TryGetContainer(other, out var otherContainer);
-
-            // Both entities are not in a container
-            if (!isUserContained && !isOtherContained) return true;
-
-            // One contains the other
-            if (userContainer?.Owner == other || otherContainer?.Owner == user) return true;
-
-            // Both entities are in different contained states
-            if (isUserContained != isOtherContained) return false;
-
-            // Both entities are in the same container
-            return userContainer == otherContainer;
-        }
-
         /// <summary>
         /// Shortcut method to make creation of containers easier.
         /// Creates a new container on the entity and gives it back to you.

Robust.Shared/Containers/ContainerManagerComponent.cs

@@ -33,7 +33,7 @@ namespace Robust.Shared.Containers
         public sealed override uint? NetID => NetIDs.CONTAINER_MANAGER;
 
         /// <inheritdoc />
-        protected override void OnRemove()
+        public override void OnRemove()
         {
             base.OnRemove();
 
@@ -47,7 +47,7 @@ namespace Robust.Shared.Containers
         }
 
         /// <inheritdoc />
-        protected override void Initialize()
+        public override void Initialize()
         {
             base.Initialize();
 

Robust.Shared/ContentPack/AssemblyTypeChecker.cs

@@ -106,12 +106,6 @@ namespace Robust.Shared.ContentPack
 
             var asmName = reader.GetString(reader.GetAssemblyDefinition().Name);
 
-            if (peReader.PEHeaders.CorHeader?.ManagedNativeHeaderDirectory is {Size: not 0})
-            {
-                _sawmill.Error($"Assembly {asmName} contains native code.");
-                return false;
-            }
-
             if (VerifyIL)
             {
                 if (!DoVerifyIL(asmName, resolver, peReader, reader))
@@ -410,8 +404,7 @@ namespace Robust.Shared.ContentPack
             }
         }
 
-        private bool IsTypeAccessAllowed(SandboxConfig sandboxConfig, MTypeReferenced type,
-            [NotNullWhen(true)] out TypeConfig? cfg)
+        private bool IsTypeAccessAllowed(SandboxConfig sandboxConfig, MTypeReferenced type, [NotNullWhen(true)] out TypeConfig? cfg)
         {
             if (type.Namespace == null)
             {