Version: 208.0.2

* Fix security bug in WritableDirProvider.OpenOsWindow()

Reported by @NarryG and @nyeogmi

* Sandbox updates

* Update ImageSharp again

(cherry picked from commit 7d778248ee)
(cherry picked from commit f66cda74e95619ddba2221bda644bf4394619805)
(cherry picked from commit db8ba83866c523e08e4fba0b80cd954f4f190613)

.github/workflows/build-test.yml

@@ -27,8 +27,7 @@ jobs:
       run: dotnet restore
     - name: Build
       run: dotnet build --no-restore /p:WarningsAsErrors=nullable
-    - name: Robust.UnitTesting
+    - name: Test Engine
       run: dotnet test --no-build Robust.UnitTesting/Robust.UnitTesting.csproj -- NUnit.ConsoleOut=0
-    - name: Robust.Analyzers.Tests
-      run: dotnet test --no-build Robust.Analyzers.Tests/Robust.Analyzers.Tests.csproj -- NUnit.ConsoleOut=0
+
 

.github/workflows/publish-client.yml

@@ -33,10 +33,10 @@ jobs:
         mkdir "release/${{ steps.parse_version.outputs.version }}"
         mv release/*.zip "release/${{ steps.parse_version.outputs.version }}"
 
-    - name: Upload files to Suns
+    - name: Upload files to centcomm
       uses: appleboy/scp-action@master
       with:
-        host: suns.spacestation14.com
+        host: centcomm.spacestation14.io
         username: robust-build-push
         key: ${{ secrets.CENTCOMM_ROBUST_BUILDS_PUSH_KEY }}
         source: "release/${{ steps.parse_version.outputs.version }}"
@@ -46,7 +46,7 @@ jobs:
     - name: Update manifest JSON
       uses: appleboy/ssh-action@master
       with:
-        host: suns.spacestation14.com
+        host: centcomm.spacestation14.io
         username: robust-build-push
         key: ${{ secrets.CENTCOMM_ROBUST_BUILDS_PUSH_KEY }}
         script: /home/robust-build-push/push.ps1 ${{ steps.parse_version.outputs.version }}

Directory.Packages.props

@@ -1,14 +1,4 @@
 <Project>
-  <PropertyGroup>
-    <!--
-    We actually set ManagePackageVersionsCentrally manually in another import file.
-    Since .NET SDK 8.0.300, ManagePackageVersionsCentrally is automatically set if Directory.Packages.props exists.
-    https://github.com/NuGet/NuGet.Client/pull/5572
-    We actively negate this here, as we have some packages in tree we don't want such automatic behavior for.
-    We use Directory.Build.props to get copy the state *after* our MSBuild config but before Nuget's config.
-    -->
-    <ManagePackageVersionsCentrally />
-  </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
     <PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
@@ -61,14 +51,11 @@
     <PackageVersion Include="SpaceWizards.SharpFont" Version="1.0.2" />
     <PackageVersion Include="SpaceWizards.Sodium" Version="0.2.1" />
     <PackageVersion Include="System.Numerics.Vectors" Version="4.5.0" />
-    <PackageVersion Include="System.Memory" Version="4.5.5" />
-    <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
     <PackageVersion Include="TerraFX.Interop.Windows" Version="10.0.22621.5" />
     <PackageVersion Include="TerraFX.Interop.Xlib" Version="6.4.0" />
     <PackageVersion Include="VorbisPizza" Version="1.3.0" />
     <PackageVersion Include="YamlDotNet" Version="13.7.1" />
     <PackageVersion Include="prometheus-net" Version="8.2.1" />
     <PackageVersion Include="prometheus-net.DotNetRuntime" Version="4.4.0" />
-    <PackageVersion Include="PolySharp" Version="1.14.1" />
   </ItemGroup>
 </Project>

MSBuild/Robust.Engine.Version.props

@@ -1,4 +1,4 @@
 <Project>
 
-    <!-- This file automatically reset by Tools/version.py -->
+    <!-- This file automatically reset by Tools/version.py -->
 

MSBuild/XamlIL.targets

@@ -24,16 +24,12 @@
     <RobustInjectorsConfiguration>$(Configuration)</RobustInjectorsConfiguration>
     <RobustInjectorsConfiguration Condition="'$(Configuration)' == 'DebugOpt'">Debug</RobustInjectorsConfiguration>
     <RobustInjectorsConfiguration Condition="'$(Configuration)' == 'Tools'">Release</RobustInjectorsConfiguration>
-    <RobustInjectorsConfiguration Condition="'$(UseArtifactsOutput)' == 'true' And '$(RuntimeIdentifier)' != ''">$(RobustInjectorsConfiguration)_$(RuntimeIdentifier)</RobustInjectorsConfiguration>
-    <RobustInjectorsConfiguration Condition="'$(UseArtifactsOutput)' == 'true'">$(RobustInjectorsConfiguration.ToLower())</RobustInjectorsConfiguration>
-    <CompileRobustXamlTaskAssemblyFile Condition="'$(UseArtifactsOutput)' != 'true'">$(MSBuildThisFileDirectory)\..\Robust.Client.Injectors\bin\$(RobustInjectorsConfiguration)\netstandard2.0\Robust.Client.Injectors.dll</CompileRobustXamlTaskAssemblyFile>
-    <CompileRobustXamlTaskAssemblyFile Condition="'$(UseArtifactsOutput)' == 'true'">$(MSBuildThisFileDirectory)\..\..\artifacts\bin\Robust.Client.Injectors\$(RobustInjectorsConfiguration)\Robust.Client.Injectors.dll</CompileRobustXamlTaskAssemblyFile>
   </PropertyGroup>
 
   <UsingTask
     Condition="'$(_RobustUseExternalMSBuild)' != 'true' And $(DesignTimeBuild) != true"
     TaskName="CompileRobustXamlTask"
-    AssemblyFile="$(CompileRobustXamlTaskAssemblyFile)"/>
+    AssemblyFile="$(MSBuildThisFileDirectory)\..\Robust.Client.Injectors\bin\$(RobustInjectorsConfiguration)\netstandard2.0\Robust.Client.Injectors.dll"/>
   <Target
     Name="CompileRobustXaml"
     Condition="Exists('@(IntermediateAssembly)')"

RELEASE-NOTES.md

@@ -1,4 +1,4 @@
-# Release notes for RobustToolbox.
+# Release notes for RobustToolbox.
 
 <!--
 NOTE: automatically updated sometimes by version.py.
@@ -54,485 +54,10 @@ END TEMPLATE-->
 *None yet*
 
 
-## 218.2.2
+## 208.0.2
 
 
-## 218.2.1
-
-
-## 218.2.0
-
-### New features
-
-* Control layout properties such as `Margin` can now be set via style sheets.
-* Expose worldposition in SpriteComponent.Render
-* Network audio entity Play/Pause/Stop states and playback position.
-* Add `Disabled` functionality to `Slider` control.
-
-
-## 218.1.0
-
-### New features
-
-* Add IEquatable.Equals to the sandbox.
-* Enable roslyn extensions tests in CI.
-* Add a VerticalTabContainer control to match the horizontal one.
-
-### Bugfixes
-
-* Fix divison remainder issue for Colors, fixing purples.
-
-### Other
-
-* Default hub address (`hub.hub_urls`) has been changed to `https://hub.spacestation14.com/`.
-
-
-## 218.0.0
-
-### Breaking changes
-
-* `Robust.Shared.Configuration.EnvironmentVariables` is now internal and no longer usable by content.
-
-### New features
-
-* Add TryGetRandom to EntityManager to get a random entity with the specified component and TryGetRandom to IPrototypeManager to return a random prototype of the specified type.
-* Add CopyData to AppearanceSystem.
-* Update UI themes on prototype reloads.
-* Allow scaling the line height of a RichTextLabel.
-* You can now specify CVar overrides via environment variable with the `ROBUST_CVAR_*` prefix. For example `ROBUST_CVAR_game__hostname=foobar` would set the appropriate CVar. Double underscores in the environment variable name are replaced with ".".
-* Added non-generic variant of `GetCVar` to `IConfigurationManager`.
-* Add type tracking to FieldNotFoundErrorNode for serialization.
-* Distance between lines of a `RichTextLabel` can now be modified with `LineHeightScale`.
-* UI theme prototypes are now updated when reloaded.
-* New `RA0025` analyzer diagnostic warns for manual assignment to `[Dependency]` fields.
-
-### Bugfixes
-
-* Request headers in `IStatusHandlerContext` are now case-insensitive.
-* SetWorldPosition rotation now more closely aligns with prior behavior.
-* Fix exception when inspecting elements in some cases.
-* Fix HTTP errors on watchdog ping not being reported.
-
-### Other
-
-* Add an analyzer for redundantly assigning to dependency fields.
-
-### Internal
-
-* Remove redundant Exists checks in ContainerSystem.
-* Improve logging on watchdog pings.
-
-
-## 217.2.1
-
-### Bugfixes
-
-* Fix LineEdit tests on engine.
-
-### Internal
-
-* Make various ValueList enumerators access the span directly for performance.
-
-
-## 217.2.0
-
-### New features
-
-* Added `AddComponents` and `RemoveComponents` methods to EntityManager that handle EntityPrototype / ComponentRegistry bulk component changes.
-* Add double-clicking to LineEdit.
-
-### Bugfixes
-
-* Properly ignore non-hard fixtures for IntersectRayWithPredicate.
-* Fix nullable TimeSpan addition on some platforms.
-
-
-## 217.1.0
-
-### New features
-
-* Added `IRobustRandom.GetItems` extension methods for randomly picking multiple items from a collections.
-* Added `SharedPhysicsSystem.EffectiveCurTime`. This is effectively a variation of `IGameTiming.CurTime` that takes into account the current physics sub-step.
-
-### Bugfixes
-
-* Fix `MapComponent.LightingEnabled` not leaving FOV rendering in a broken state.
-
-### Internal
-
-* `Shuffle<T>(Span<T>, System.Random)` has been removed, just use the builtin method.
-
-
-## 217.0.0
-
-### Breaking changes
-
-* TransformSystem.SetWorldPosition and SetWorldPositionRotation will now also perform parent updates as necessary. Previously it would just set the entity's LocalPosition which may break if they were inside of a container. Now they will be removed from their container and TryFindGridAt will run to correctly parent them to the new position. If the old functionality is desired then you can use GetInvWorldMatrix to update the LocalPosition (bearing in mind containers may prevent this).
-
-### New features
-
-* Implement VV for AudioParams on SoundSpecifiers.
-* Add AddUi to the shared UI system.
-
-### Bugfixes
-
-* Fix the first measure of ScrollContainer bars.
-
-
-## 216.0.0
-
-### Breaking changes
-
-* The `net.low_lod_distance` cvar has been replaced with a new `net.pvs_priority_range`. Instead of limiting the range at which all entities are sent to a player, it now extends the range at which high priorities can be sent. The default value of this new cvar is 32.5, which is larger than the default `net.pvs_range` value of 25.
-
-### New features
-
-* You can now specify a component to not be saved to map files with `[UnsavedComponent]`.
-* Added `ITileDefinitionManager.TryGetDefinition`.
-* The map loader now tries to preserve the `tilemap` contents of map files, which should reduce diffs when re-saving a map after the game's internal tile IDs have changed.
-
-### Bugfixes
-
-* Fix buffered audio sources not being disposed.
-
-
-## 215.3.1
-
-### Bugfixes
-
-* Revert zstd update.
-
-
-## 215.3.0
-
-### New features
-
-* `EntityQuery<T>` now has `HasComp` and `TryComp` methods that are shorter than its existing ones.
-* Added `PlacementInformation.UseEditorContext`.
-* Added `Vector2Helpers` functions for comparing ranges between vectors.
-
-### Bugfixes
-
-* `Texture.GetPixel()`: fixed off-by-one with Y coordinate.
-* `Texture.GetPixel()`: fix stack overflow when reading large images.
-* `Texture.GetPixel()`: use more widely compatible OpenGL calls.
-
-### Other
-
-* Disabled `net.mtu_expand` again by default, as it was causing issues.
-* Updated `SharpZstd` dependency.
-
-
-## 215.2.0
-
-### New features
-
-* Implement basic VV for SoundSpecifiers.
-
-### Bugfixes
-
-* Fix QueueDel during EndCollideEvents from throwing while removing contacts.
-
-
-## 215.1.0
-
-### New features
-
-* Add a CompletionHelper for audio filepaths that handles server packaging.
-* Add Random.NextAngle(min, max) method and Pick for `ValueList<T>`.
-* Added an `ICommonSession` parser for toolshed commands.
-
-### Bugfixes
-
-
-## 215.0.0
-
-### Breaking changes
-
-* Update Lidgren to 0.3.0
-
-### New features
-
-* Made a new `IMetricsManager` interface with an `UpdateMetrics` event that can be used to update Prometheus metrics whenever they are scraped.
-  * Also added a `metrics.update_interval` CVar to go along with this, when metrics are scraped without usage of Prometheus directly.
-* IoC now contains an `IMeterFactory` implementation that you can use to instantiate metric meters.
-* `net.mtu_ipv6` CVar allows specifying a different MTU value for IPv6.
-* Allows `player:entity` to take a parameter representing the player name.
-* Add collection parsing to the dev window for UI.
-* Add a debug assert to Dirty(uid, comp) to catch mismatches being passed in.
-
-### Bugfixes
-
-* Support transform states with unknown parents.
-* Fix serialization error logging.
-* Fix naming of ResizableMemoryRegion metrics.
-* Fix uncaught overflow exception when parsing NetEntities.
-
-### Other
-
-* The replay system now allows loading a replay with a mismatching serializer type hash. This means replays should be more robust against future version updates (engine security patches or .NET updates).
-* `CheckBox`'s interior texture is now vertically centered.
-* Lidgren.Network has been updated to [`v0.3.0`](https://github.com/space-wizards/SpaceWizards.Lidgren.Network/blob/v0.3.0/RELEASE-NOTES.md).
-* Lowered default IPv4 MTU to 900 (from 1000).
-* Automatic MTU expansion (`net.mtu_expand`) is now enabled by default.
-
-### Internal
-
-* Cleanup some Dirty component calls internally.
-
-
-## 214.2.0
-
-### New features
-
-* Added a `Undetachable` entity metadata flag, which stops the client from moving an entity to nullspace when it moves out of PVS range.
-
-### Bugfixes
-
-* Fix tooltips not clamping to the left side of the viewport.
-* Fix global audio property not being properly set.
-
-### Internal
-
-* The server game state / PVS code has been rewritten. It should be somewhat faster now, albeit at the cost of using more memory. The current engine version may be unstable.
-
-
-## 214.1.1
-
-### Bugfixes
-
-* Fixed connection denial always causing redial.
-
-
-## 214.1.0
-
-### New features
-
-* Added the `pvs_override_info` command for debugging PVS overrides.
-
-### Bugfixes
-
-* Fix VV for prototype structs.
-* Fix audio limits for clientside audio.
-
-
-## 214.0.0
-
-### Breaking changes
-
-* `NetStructuredDisconnectMessages` has received a complete overhaul and has been moved to `NetDisconnectMessage`. The API is no longer designed such that consumers must pass around JSON nodes, as they are not in sandbox (and clunky).
-
-### New features
-
-* Add a basic default concurrent audio limit of 16 for a single filepath to avoid overflowing audio sources.
-* `NetConnectingArgs.Deny()` can now pass along structured data that will be received by the client.
-
-### Bugfixes
-
-* Fixed cursor position bugs when an empty `TextEdit` has a multi-line place holder.
-* Fixed empty `TextEdit` throwing exception if cursor is moved left.
-
-
-## 213.0.0
-
-### Breaking changes
-
-* Remove obsoleted BaseContainer methods.
-
-### New features
-
-* Add EntityManager.RaiseSharedEvent where the event won't go to the attached client but will be predicted locally on their end.
-* Add GetEntitiesInRange override that takes in EntityCoordinates and an EntityUid hashset.
-
-### Bugfixes
-
-* Check if a sprite entity is deleted before drawing in SpriteView.
-
-
-## 212.2.0
-
-### New features
-
-* Add IsHardCollidable to SharedPhysicsSystem to determine if 2 entities would collide.
-
-### Other
-
-* Double the default maximum replay size.
-
-
-## 212.1.0
-
-### New features
-
-* Add nullable methods for TryIndex / HasIndex on IPrototypeManager.
-
-### Bugfixes
-
-* Fix TextureRect alignment where the strech mode is KeepCentered.
-
-
-## 212.0.1
-
-### Bugfixes
-
-* Fix passing array by `this` instead of by `ref`.
-
-
-## 212.0.0
-
-### Breaking changes
-
-* Change Collapsible controls default orientations to Vertical.
-
-### New features
-
-* Expose the Label control for Collapsible controls.
-* Add GetGridPosition that considers physics center-of-mass.
-* Add TileToVector methods to get the LocalPosition of tile-coords (taking into account tile size).
-* Add some more helper methods to PVS filters around EntityUids.
-* Add support for Dictionary AutoNetworkedFields.
-* Add EnsureLength method for arrays.
-* Add PushMarkup to FormattedMessage.
-* Add DrawPrimitives overload for `List<Vector2>`
-* Add more ValueList ctors that are faster.
-* Add ToMapCoordinates method for NetCoordinates.
-
-### Other
-
-* Remove ISerializationHooks obsoletion as they are useful in some rare cases.
-
-### Internal
-
-* Bump max pool size for robust jobs.
-
-
-## 211.0.2
-
-### Bugfixes
-
-* Fix TextureRect scaling not handling UIScale correctly.
-
-
-## 211.0.1
-
-### Bugfixes
-
-* Fix GridChunkEnumerator on maps.
-
-
-## 211.0.0
-
-### Breaking changes
-
-* Moved ChunkIndicesEnumerator to engine and to a re-useable namespace at Robust.Shared/Maps.
-
-### New features
-
-* Added an Enlarged method for Box2Rotated.
-
-### Internal
-
-* Significantly optimise ChunkEnumerator / FindGridsIntersecting in certain use cases by intersecting the grid's AABB with the local AABB to avoid iterating dummy chunks.
-
-
-## 210.1.1
-
-### Bugfixes
-
-* Fixed multiple recent bugs with key binding storage.
-
-### Other
-
-* Change default of `ButtonGroup.IsNoneSetAllowed` to `true`. This makes it default again to the previous (unintentional) behavior.
-
-
-## 210.1.0
-
-### New features
-
-* `NetUserId` implements `ISelfSerialize` so can be used in data fields.
-* `ButtonGroup.IsNoneSetAllowed` to allow a button group to have no buttons pressed by default.
-
-
-## 210.0.3
-
-
-## 210.0.2
-
-### Bugfixes
-
-* Revert changes to `TextureRect` too.
-
-
-## 210.0.1
-
-### Bugfixes
-
-* Revert changes to `TextureButton` that broke style property handling.
-
-
-## 210.0.0
-
-### New features
-
-* Controls can now hook before, after, and during rendering of their children.
-* IRenderHandle is now a public API, with the caveat that it's properties and methods are unstable.
-* ButtonGroup now exposes what buttons it contains, alongside which is currently pressed.
-* OptionButton has additional styleclasses, and has a hook for modifying it's internal buttons.
-* PanelContainer.GetStyleBox() is now protected rather than private.
-* TextureButton now uses a TextureRect instead of custom drawing code.
-* TextureRect has additional style properties exposed.
-    * A new property, TextureSizeTarget, was added, which allows specifying a size in virtual pixels that the control should attempt to draw at.
-    * Stretch mode is now a style property.
-    * Scale is now a style property.
-* Avalonia.Metadata.XmlnsDefinitionAttribute is now permitted by the sandbox.
-* Add MaxDimension property to Box2 to return the higher of the Width or Height.
-* Add GetLocalPosition to convert ScreenCoordinates to coordinates relative to the control. Ignores window.
-* Add GlobalRect and GlobalPixelRect for controls to get their UIBox2i in screen terms.
-* Add dotted line drawing to DrawingHandleScreen.
-* You can use `Subs.CVar()` from an entity systems to subscribe to CVar changes. This is more convenient than `IConfigurationManager.OnValueChanged` as it automatically unsubscribes on system shutdown.
-* There is now a built-in type serializer for `DateTime`, so you can put `DateTime`s in your data fields.
-* `System.Text.Unicode.UnicodeRange` and `UnicodeRanges` are now available in the sandbox.
-
-### Bugfixes
-
-* UI drawing now properly accounts for a control's draw routine potentially mangling the current matrix.
-* UI roots now properly update when the global stylesheet is changed. They previously only did so if they had a dedicated stylesheet (which is the one case where they would be unaffected by a global sheet update.
-
-
-## 209.0.1
-
-### Bugfixes
-
-* Fix missed import from 209.0.0.
-
-
-## 209.0.0
-
-### Breaking changes
-
-* `replay.max_compressed_size` and `replay.max_uncompressed_size` CVars are now `long`.
-* Remove obsolete CoordinatesExtension for ToEntityCoordinates from GridUid / Vector2i.
-
-### New features
-
-* Add GetEntitiesOnMap / GetChildEntities to EntityLookupSystem to return components on the specified map and components with the specified parent respectively.
-* Add MaxDimension property to Box2 to return the higher of the Width or Height.
-* Add GetLocalPosition to convert ScreenCoordinates to coordinates relative to the control. Ignores window.
-* Add GlobalRect and GlobalPixelRect for controls to get their UIBox2i in screen terms.
-* Add dotted line drawing to DrawingHandleScreen.
-* `IConfigurationManager.LoadDefaultsFromTomlStream` properly does type conversions. This fixes scenarios like loading of `long` CVars.
-* Add helper methods for TileRef / Vector2i to SharedMapSystem for ToCenterCoordinates (tile center EntityCoordinates) and ToCoordinates (tile origin to EntityCoordinates).
-* Copy some of the coordinates extensions to SharedTransformSystem.
-
-### Bugfixes
-
-* Fixed integer overflows in replay max size calculation.
-* Explicitly capped `replay.replay_tick_batchSize` internally to avoid high values causing allocation failures.
-
-### Other
-
-* Important MIDI performance improvements.
+## 208.0.1
 
 
 ## 208.0.0

Resources/Locale/en-US/commands.ftl

@@ -11,7 +11,6 @@ cmd-parse-failure-uid = {$arg} is not a valid entity UID.
 cmd-parse-failure-mapid = {$arg} is not a valid MapId.
 cmd-parse-failure-grid = {$arg} is not a valid grid.
 cmd-parse-failure-entity-exist = UID {$arg} does not correspond to an existing entity.
-cmd-parse-failure-session = There is no session with username: {$username}
 
 cmd-error-file-not-found = Could not find file: {$file}.
 cmd-error-dir-not-found = Could not find directory: {$dir}.
@@ -491,7 +490,7 @@ cmd-net_entityreport-help = Usage: net_entityreport
 cmd-net_refresh-desc = Requests a full server state.
 cmd-net_refresh-help = Usage: net_refresh
 
-cmd-net_graph-desc = Toggles the net statistics panel.
+cmd-net_graph-desc = Toggles the net statistics pannel.
 cmd-net_graph-help = Usage: net_graph
 
 cmd-net_watchent-desc = Dumps all network updates for an EntityId to the console.
@@ -567,9 +566,3 @@ cmd-reloadtiletextures-help = Usage: reloadtiletextures
 cmd-audio_length-desc = Shows the length of an audio file
 cmd-audio_length-help = Usage: audio_length { cmd-audio_length-arg-file-name }
 cmd-audio_length-arg-file-name = <file name>
-
-## PVS
-cmd-pvs-override-info-desc = Prints information about any PVS overrides associated with an entity.
-cmd-pvs-override-info-empty = Entity {$nuid} has no PVS overrides.
-cmd-pvs-override-info-global = Entity {$nuid} has a global override.
-cmd-pvs-override-info-clients = Entity {$nuid} has a session override for {$clients}.

Resources/Locale/en-US/toolshed-commands.ftl

@@ -70,9 +70,9 @@ command-description-ls-in =
 command-description-methods-get =
     Returns all methods associated with the input type.
 command-description-methods-overrides =
-    Returns all methods overridden on the input type.
+    Returns all methods overriden on the input type.
 command-description-methods-overridesfrom =
-    Returns all methods overridden from the given type on the input type.
+    Returns all methods overriden from the given type on the input type.
 command-description-cmd-moo =
     Asks the important questions.
 command-description-cmd-descloc =
@@ -418,6 +418,6 @@ command-description-tee =
     This essentially lets you have a branch in your code to do multiple operations on one value.
 command-description-cmd-info =
     Returns a CommandSpec for the given command.
-    On its own, this means it'll print the command's help message.
+    On it's own, this means it'll print the comamnd's help message.
 command-description-comp-rm =
     Removes the given component from the entity.

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

@@ -10,18 +10,3 @@ 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]
-
-
-## SoundSpecifier
-vv-sound-none = None
-vv-sound-path = Path
-vv-sound-collection = Collection
-
-vv-sound-volume = volume
-vv-sound-pitch = Pitch
-vv-sound-max-distance = Max Distance
-vv-sound-rolloff-factor = Rolloff Factor
-vv-sound-reference-distance = Reference Distance
-vv-sound-loop = Loop
-vv-sound-play-offset = Play Offset (s)
-vv-sound-variation = Pitch variation

Robust.Analyzers.Tests/AccessAnalyzer_Test.cs

@@ -20,16 +20,11 @@ public sealed class AccessAnalyzer_Test
         {
             TestState =
             {
+                AdditionalReferences = { typeof(AccessAnalyzer).Assembly },
                 Sources = { code }
             },
         };
 
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.Analyzers.AccessAttribute.cs",
-            "Robust.Shared.Analyzers.AccessPermissions.cs"
-        );
-
         // ExpectedDiagnostics cannot be set, so we need to AddRange here...
         test.TestState.ExpectedDiagnostics.AddRange(expected);
 

Robust.Analyzers.Tests/Aliases.cs

@@ -1,8 +0,0 @@
-// OH BOY. TURNS OUT IT GETS EVEN MORE CURSED.
-//
-// So because we're compiling a copy of Robust.Roslyn.Shared into every analyzer project,
-// the test project sees multiple copies of it. This would make it impossible to use.
-// UNLESS you use this obscure C# feature called "extern alias"
-// that I guarantee you you've never heard of before, and are now concerned about.
-
-extern alias SerializationGenerator;

Robust.Analyzers.Tests/ComponentPauseGeneratorTest.cs

@@ -1,340 +0,0 @@
-extern alias SerializationGenerator;
-using System.Linq;
-using System.Reflection;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Text;
-using NUnit.Framework;
-using SerializationGenerator::Robust.Roslyn.Shared;
-using SerializationGenerator::Robust.Serialization.Generator;
-
-namespace Robust.Analyzers.Tests;
-
-[TestFixture]
-[TestOf(typeof(ComponentPauseGenerator))]
-[Parallelizable(ParallelScope.All)]
-public sealed class ComponentPauseGeneratorTest
-{
-    private const string TypesCode = """
-        global using System;
-        global using Robust.Shared.Analyzers;
-        global using Robust.Shared.GameObjects;
-
-        namespace Robust.Shared.Analyzers
-        {
-            [AttributeUsage(AttributeTargets.Class, Inherited = false)]
-            public sealed class AutoGenerateComponentPauseAttribute : Attribute
-            {
-                public bool Dirty = false;
-            }
-
-            [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
-            public sealed class AutoPausedFieldAttribute : Attribute;
-
-            [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
-            public sealed class AutoNetworkedFieldAttribute : Attribute
-            {
-            }
-        }
-
-        namespace Robust.Shared.GameObjects
-        {
-            public interface IComponent;
-        }
-        """;
-
-    [Test]
-    public void TestBasic()
-    {
-        var result = RunGenerator("""
-            [AutoGenerateComponentPause]
-            public sealed partial class FooComponent : IComponent
-            {
-                [AutoPausedField]
-                public TimeSpan Foo;
-            }
-            """);
-
-        ExpectNoDiagnostics(result);
-        ExpectSource(
-            result,
-            """
-            // <auto-generated />
-
-            using Robust.Shared.GameObjects;
-
-            public partial class FooComponent
-            {
-            [RobustAutoGenerated]
-            public sealed class FooComponent_AutoPauseSystem : EntitySystem
-            {
-                public override void Initialize()
-                {
-                    SubscribeLocalEvent<FooComponent, EntityUnpausedEvent>(OnEntityUnpaused);
-                }
-
-                private void OnEntityUnpaused(EntityUid uid, FooComponent component, ref EntityUnpausedEvent args)
-                {
-                    component.Foo += args.PausedTime;
-                }
-            }
-            }
-
-            """);
-    }
-
-    [Test]
-    public void TestNullable()
-    {
-        var result = RunGenerator("""
-            [AutoGenerateComponentPause]
-            public sealed partial class FooComponent : IComponent
-            {
-                [AutoPausedField]
-                public TimeSpan? Foo;
-            }
-            """);
-
-        ExpectNoDiagnostics(result);
-        ExpectSource(
-            result,
-            """
-            // <auto-generated />
-
-            using Robust.Shared.GameObjects;
-
-            public partial class FooComponent
-            {
-            [RobustAutoGenerated]
-            public sealed class FooComponent_AutoPauseSystem : EntitySystem
-            {
-                public override void Initialize()
-                {
-                    SubscribeLocalEvent<FooComponent, EntityUnpausedEvent>(OnEntityUnpaused);
-                }
-
-                private void OnEntityUnpaused(EntityUid uid, FooComponent component, ref EntityUnpausedEvent args)
-                {
-                    if (component.Foo.HasValue)
-                        component.Foo = component.Foo.Value + args.PausedTime;
-                }
-            }
-            }
-
-            """);
-    }
-
-    [Test]
-    public void TestAutoState()
-    {
-        var result = RunGenerator("""
-            [AutoGenerateComponentPause]
-            public sealed partial class FooComponent : IComponent
-            {
-                [AutoPausedField, AutoNetworkedField]
-                public TimeSpan Foo;
-            }
-            """);
-
-        ExpectNoDiagnostics(result);
-        ExpectSource(
-            result,
-            """
-            // <auto-generated />
-
-            using Robust.Shared.GameObjects;
-
-            public partial class FooComponent
-            {
-            [RobustAutoGenerated]
-            public sealed class FooComponent_AutoPauseSystem : EntitySystem
-            {
-                public override void Initialize()
-                {
-                    SubscribeLocalEvent<FooComponent, EntityUnpausedEvent>(OnEntityUnpaused);
-                }
-
-                private void OnEntityUnpaused(EntityUid uid, FooComponent component, ref EntityUnpausedEvent args)
-                {
-                    component.Foo += args.PausedTime;
-                    Dirty(uid, component);
-                }
-            }
-            }
-
-            """);
-    }
-
-    [Test]
-    public void TestExplicitDirty()
-    {
-        var result = RunGenerator("""
-            [AutoGenerateComponentPause(Dirty = true)]
-            public sealed partial class FooComponent : IComponent
-            {
-                [AutoPausedField]
-                public TimeSpan Foo;
-            }
-            """);
-
-        ExpectNoDiagnostics(result);
-        ExpectSource(
-            result,
-            """
-            // <auto-generated />
-
-            using Robust.Shared.GameObjects;
-
-            public partial class FooComponent
-            {
-            [RobustAutoGenerated]
-            public sealed class FooComponent_AutoPauseSystem : EntitySystem
-            {
-                public override void Initialize()
-                {
-                    SubscribeLocalEvent<FooComponent, EntityUnpausedEvent>(OnEntityUnpaused);
-                }
-
-                private void OnEntityUnpaused(EntityUid uid, FooComponent component, ref EntityUnpausedEvent args)
-                {
-                    component.Foo += args.PausedTime;
-                    Dirty(uid, component);
-                }
-            }
-            }
-
-            """);
-    }
-
-    [Test]
-    public void TestDiagnosticNotIComponent()
-    {
-        var result = RunGenerator("""
-            [AutoGenerateComponentPause]
-            public sealed partial class FooComponent
-            {
-                [AutoPausedField]
-                public TimeSpan Foo;
-            }
-            """);
-
-        ExpectNoSource(result);
-        ExpectDiagnostics(result, [
-            (Diagnostics.IdComponentPauseNotComponent, new LinePositionSpan(new LinePosition(1, 28), new LinePosition(1, 40)))
-        ]);
-    }
-
-    [Test]
-    public void TestDiagnosticNoFields()
-    {
-        var result = RunGenerator("""
-            [AutoGenerateComponentPause]
-            public sealed partial class FooComponent : IComponent
-            {
-                public TimeSpan Foo;
-            }
-            """);
-
-        ExpectNoSource(result);
-        ExpectDiagnostics(result, [
-            (Diagnostics.IdComponentPauseNoFields, new LinePositionSpan(new LinePosition(1, 28), new LinePosition(1, 40)))
-        ]);
-    }
-
-    [Test]
-    public void TestDiagnosticNoParentAttribute()
-    {
-        var result = RunGenerator("""
-            public sealed partial class FooComponent : IComponent
-            {
-                [AutoPausedField]
-                public TimeSpan Foo, Fooz;
-
-                [AutoPausedField]
-                public TimeSpan Bar { get; set; }
-            }
-            """);
-
-        ExpectNoSource(result);
-        ExpectDiagnostics(result, [
-            (Diagnostics.IdComponentPauseNoParentAttribute, new LinePositionSpan(new LinePosition(3, 20), new LinePosition(3, 23))),
-            (Diagnostics.IdComponentPauseNoParentAttribute, new LinePositionSpan(new LinePosition(3, 25), new LinePosition(3, 29))),
-            (Diagnostics.IdComponentPauseNoParentAttribute, new LinePositionSpan(new LinePosition(6, 20), new LinePosition(6, 23)))
-        ]);
-    }
-
-    [Test]
-    public void TestDiagnosticWrongType()
-    {
-        var result = RunGenerator("""
-            [AutoGenerateComponentPause]
-            public sealed partial class FooComponent : IComponent
-            {
-                [AutoPausedField]
-                public int Foo, Fooz;
-
-                [AutoPausedField]
-                public int Bar { get; set; }
-            }
-            """);
-
-        ExpectNoSource(result);
-        ExpectDiagnostics(result, [
-            (Diagnostics.IdComponentPauseWrongTypeAttribute, new LinePositionSpan(new LinePosition(4, 15), new LinePosition(4, 18))),
-            (Diagnostics.IdComponentPauseWrongTypeAttribute, new LinePositionSpan(new LinePosition(4, 20), new LinePosition(4, 24))),
-            (Diagnostics.IdComponentPauseWrongTypeAttribute, new LinePositionSpan(new LinePosition(7, 15), new LinePosition(7, 18)))
-        ]);
-    }
-
-    private static void ExpectSource(GeneratorRunResult result, string expected)
-    {
-        Assert.That(result.GeneratedSources, Has.Length.EqualTo(1));
-
-        var source = result.GeneratedSources[0];
-
-        Assert.That(source.SourceText.ToString(), Is.EqualTo(expected));
-    }
-
-    private static void ExpectNoSource(GeneratorRunResult result)
-    {
-        Assert.That(result.GeneratedSources, Is.Empty);
-    }
-
-    private static void ExpectNoDiagnostics(GeneratorRunResult result)
-    {
-        Assert.That(result.Diagnostics, Is.Empty);
-    }
-
-    private static void ExpectDiagnostics(GeneratorRunResult result, (string code, LinePositionSpan span)[] diagnostics)
-    {
-        Assert.Multiple(() =>
-        {
-            Assert.That(result.Diagnostics, Has.Length.EqualTo(diagnostics.Length));
-            foreach (var (code, span) in diagnostics)
-            {
-                Assert.That(
-                    result.Diagnostics.Any(x => x.Id == code && x.Location.GetLineSpan().Span == span),
-                    $"Expected diagnostic with code {code} and location {span}");
-            }
-        });
-    }
-
-    private static GeneratorRunResult RunGenerator(string source)
-    {
-        var compilation = (Compilation)CSharpCompilation.Create("compilation",
-            new[]
-            {
-                CSharpSyntaxTree.ParseText(source, path: "Source.cs"),
-                CSharpSyntaxTree.ParseText(TypesCode, path: "Types.cs")
-            },
-            new[] { MetadataReference.CreateFromFile(typeof(Binder).GetTypeInfo().Assembly.Location) },
-            new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
-
-        var generator = new ComponentPauseGenerator();
-        GeneratorDriver driver = CSharpGeneratorDriver.Create(generator);
-        driver = driver.RunGeneratorsAndUpdateCompilation(compilation, out var newCompilation, out _);
-        var result = driver.GetRunResult();
-
-        return result.Results[0];
-    }
-}

Robust.Analyzers.Tests/DependencyAssignAnalyzerTest.cs

@@ -1,58 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.DependencyAssignAnalyzer>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-public sealed class DependencyAssignAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<DependencyAssignAnalyzer, NUnitVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code }
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.IoC.DependencyAttribute.cs"
-        );
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using Robust.Shared.IoC;
-
-            public sealed class Foo
-            {
-                [Dependency]
-                private object? Field;
-
-                public Foo()
-                {
-                    Field = "A";
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(10,9): warning RA0025: Tried to assign to [Dependency] field 'Field'. Remove [Dependency] or inject it via field injection instead.
-            VerifyCS.Diagnostic().WithSpan(10, 9, 10, 20).WithArguments("Field"));
-    }
-}

Robust.Analyzers.Tests/Robust.Analyzers.Tests.csproj

@@ -1,18 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <SkipRobustAnalyzer>true</SkipRobustAnalyzer>
-  </PropertyGroup>
-
   <Import Project="..\MSBuild\Robust.Properties.targets"/>
   <Import Project="..\MSBuild\Robust.Engine.props"/>
 
-  <!-- Engine source files needed to make the tests work -->
-  <ItemGroup>
-    <EmbeddedResource Include="..\Robust.Shared\Analyzers\AccessAttribute.cs" LogicalName="Robust.Shared.Analyzers.AccessAttribute.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\Analyzers\AccessPermissions.cs" LogicalName="Robust.Shared.Analyzers.AccessPermissions.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\IoC\DependencyAttribute.cs" LogicalName="Robust.Shared.IoC.DependencyAttribute.cs" LinkBase="Implementations" />
-  </ItemGroup>
-
   <PropertyGroup>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -34,6 +23,5 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Robust.Analyzers\Robust.Analyzers.csproj"/>
-    <ProjectReference Include="..\Robust.Serialization.Generator\Robust.Serialization.Generator.csproj" Aliases="SerializationGenerator" />
   </ItemGroup>
 </Project>

Robust.Analyzers.Tests/TestHelper.cs

@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Text;
-
-namespace Robust.Analyzers.Tests;
-
-public static class TestHelper
-{
-    public static void AddEmbeddedSources(SolutionState state, params string[] embeddedFiles)
-    {
-        AddEmbeddedSources(state, (IEnumerable<string>) embeddedFiles);
-    }
-
-    public static void AddEmbeddedSources(SolutionState state, IEnumerable<string> embeddedFiles)
-    {
-        foreach (var fileName in embeddedFiles)
-        {
-            using var stream = typeof(AccessAnalyzer_Test).Assembly.GetManifestResourceStream(fileName)!;
-            state.Sources.Add((fileName, SourceText.From(stream)));
-        }
-    }
-}

Robust.Analyzers/AccessAnalyzer.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
 using Robust.Shared.Analyzers.Implementation;
 
 namespace Robust.Analyzers

Robust.Analyzers/ByRefEventAnalyzer.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
 using static Microsoft.CodeAnalysis.SymbolEqualityComparer;
 
 namespace Robust.Analyzers;
@@ -17,7 +16,7 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
     private static readonly DiagnosticDescriptor ByRefEventSubscribedByValueRule = new(
         Diagnostics.IdByRefEventSubscribedByValue,
         "By-ref event subscribed to by value",
-        "Tried to subscribe to a by-ref event '{0}' by value",
+        "Tried to subscribe to a by-ref event '{0}' by value.",
         "Usage",
         DiagnosticSeverity.Error,
         true,
@@ -27,7 +26,7 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
     private static readonly DiagnosticDescriptor ByRefEventRaisedByValueRule = new(
         Diagnostics.IdByRefEventRaisedByValue,
         "By-ref event raised by value",
-        "Tried to raise a by-ref event '{0}' by value",
+        "Tried to raise a by-ref event '{0}' by value.",
         "Usage",
         DiagnosticSeverity.Error,
         true,
@@ -37,7 +36,7 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
     private static readonly DiagnosticDescriptor ByValueEventRaisedByRefRule = new(
         Diagnostics.IdValueEventRaisedByRef,
         "Value event raised by-ref",
-        "Tried to raise a value event '{0}' by-ref",
+        "Tried to raise a value event '{0}' by-ref.",
         "Usage",
         DiagnosticSeverity.Error,
         true,

Robust.Analyzers/DataDefinitionAnalyzer.cs

@@ -5,7 +5,6 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
 
 namespace Robust.Analyzers;
 
@@ -19,7 +18,7 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
     private static readonly DiagnosticDescriptor DataDefinitionPartialRule = new(
         Diagnostics.IdDataDefinitionPartial,
         "Type must be partial",
-        "Type {0} is a DataDefinition but is not partial",
+        "Type {0} is a DataDefinition but is not partial.",
         "Usage",
         DiagnosticSeverity.Error,
         true,
@@ -29,7 +28,7 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
     private static readonly DiagnosticDescriptor NestedDataDefinitionPartialRule = new(
         Diagnostics.IdNestedDataDefinitionPartial,
         "Type must be partial",
-        "Type {0} contains nested data definition {1} but is not partial",
+        "Type {0} contains nested data definition {1} but is not partial.",
         "Usage",
         DiagnosticSeverity.Error,
         true,
@@ -39,7 +38,7 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
     private static readonly DiagnosticDescriptor DataFieldWritableRule = new(
         Diagnostics.IdDataFieldWritable,
         "Data field must not be readonly",
-        "Data field {0} in data definition {1} is readonly",
+        "Data field {0} in data definition {1} is readonly.",
         "Usage",
         DiagnosticSeverity.Error,
         true,
@@ -49,7 +48,7 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
     private static readonly DiagnosticDescriptor DataFieldPropertyWritableRule = new(
         Diagnostics.IdDataFieldPropertyWritable,
         "Data field property must have a setter",
-        "Data field property {0} in data definition {1} does not have a setter",
+        "Data field property {0} in data definition {1} does not have a setter.",
         "Usage",
         DiagnosticSeverity.Error,
         true,

Robust.Analyzers/DataDefinitionFixer.cs

@@ -9,7 +9,7 @@ using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxKind;
-using static Robust.Roslyn.Shared.Diagnostics;
+using static Robust.Analyzers.Diagnostics;
 
 namespace Robust.Analyzers;
 

Robust.Analyzers/DependencyAssignAnalyzer.cs

@@ -1,61 +0,0 @@
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class DependencyAssignAnalyzer : DiagnosticAnalyzer
-{
-    private const string DependencyAttributeType = "Robust.Shared.IoC.DependencyAttribute";
-
-    private static readonly DiagnosticDescriptor Rule = new (
-        Diagnostics.IdDependencyFieldAssigned,
-        "Assignment to dependency field",
-        "Tried to assign to [Dependency] field '{0}'. Remove [Dependency] or inject it via field injection instead.",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        true);
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.EnableConcurrentExecution();
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
-        context.RegisterOperationAction(CheckAssignment, OperationKind.SimpleAssignment);
-    }
-
-    private static void CheckAssignment(OperationAnalysisContext context)
-    {
-        if (context.Operation is not ISimpleAssignmentOperation assignment)
-            return;
-
-        if (assignment.Target is not IFieldReferenceOperation fieldRef)
-            return;
-
-        var field = fieldRef.Field;
-        var attributes = field.GetAttributes();
-        if (attributes.Length == 0)
-            return;
-
-        var depAttribute = context.Compilation.GetTypeByMetadataName(DependencyAttributeType);
-        if (!HasAttribute(attributes, depAttribute))
-            return;
-
-        context.ReportDiagnostic(Diagnostic.Create(Rule, assignment.Syntax.GetLocation(), field.Name));
-    }
-
-    private static bool HasAttribute(ImmutableArray<AttributeData> attributes, ISymbol symbol)
-    {
-        foreach (var attribute in attributes)
-        {
-            if (SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, symbol))
-                return true;
-        }
-
-        return false;
-    }
-}

Robust.Analyzers/Diagnostics.cs

@@ -1,6 +1,6 @@
 using Microsoft.CodeAnalysis;
 
-namespace Robust.Roslyn.Shared;
+namespace Robust.Analyzers;
 
 public static class Diagnostics
 {
@@ -24,11 +24,6 @@ public static class Diagnostics
     public const string IdNestedDataDefinitionPartial = "RA0018";
     public const string IdDataFieldWritable = "RA0019";
     public const string IdDataFieldPropertyWritable = "RA0020";
-    public const string IdComponentPauseNotComponent = "RA0021";
-    public const string IdComponentPauseNoFields = "RA0022";
-    public const string IdComponentPauseNoParentAttribute = "RA0023";
-    public const string IdComponentPauseWrongTypeAttribute = "RA0024";
-    public const string IdDependencyFieldAssigned = "RA0025";
 
     public static SuppressionDescriptor MeansImplicitAssignment =>
         new SuppressionDescriptor("RADC1000", "CS0649", "Marked as implicitly assigned.");

Robust.Analyzers/ExplicitInterfaceAnalyzer.cs

@@ -10,7 +10,6 @@ using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
 using Document = Microsoft.CodeAnalysis.Document;
 
 namespace Robust.Analyzers

Robust.Analyzers/ExplicitVirtualAnalyzer.cs

@@ -5,7 +5,6 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
 
 namespace Robust.Analyzers;
 

Robust.Analyzers/MeansImplicitAssigmentSuppressor.cs

@@ -2,7 +2,6 @@ using System.Collections.Immutable;
 using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
 
 namespace Robust.Analyzers
 {

Robust.Analyzers/NotNullableFlagAnalyzer.cs

@@ -3,7 +3,6 @@ using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
 
 namespace Robust.Analyzers;
 
@@ -32,7 +31,7 @@ public sealed class NotNullableFlagAnalyzer : DiagnosticAnalyzer
 
     private static readonly DiagnosticDescriptor InvalidNotNullableImplementationRule = new (
         Diagnostics.IdInvalidNotNullableFlagImplementation,
-        "Invalid NotNullable flag implementation",
+        "Invalid NotNullable flag implementation.",
         "NotNullable flag is either not typed as bool, or does not have a default value equaling false",
         "Usage",
         DiagnosticSeverity.Error,
@@ -42,7 +41,7 @@ public sealed class NotNullableFlagAnalyzer : DiagnosticAnalyzer
     private static readonly DiagnosticDescriptor InvalidNotNullableTypeRule = new (
         Diagnostics.IdInvalidNotNullableFlagType,
         "Failed to resolve type parameter",
-        "Failed to resolve type parameter \"{0}\"",
+        "Failed to resolve type parameter \"{0}\".",
         "Usage",
         DiagnosticSeverity.Error,
         true,
@@ -50,7 +49,7 @@ public sealed class NotNullableFlagAnalyzer : DiagnosticAnalyzer
 
     private static readonly DiagnosticDescriptor NotNullableFlagValueTypeRule = new (
         Diagnostics.IdNotNullableFlagValueType,
-        "NotNullable flag not supported for value types",
+        "NotNullable flag not supported for value types.",
         "Value types as generic arguments are not supported for NotNullable flags",
         "Usage",
         DiagnosticSeverity.Error,

Robust.Analyzers/PreferGenericVariantAnalyzer.cs

@@ -11,7 +11,6 @@ using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
 
 namespace Robust.Analyzers;
 

Robust.Analyzers/Robust.Analyzers.csproj

@@ -1,30 +1,31 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>10</LangVersion>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />
+  </ItemGroup>
+
   <ItemGroup>
     <!-- Needed for NotNullableFlagAnalyzer. -->
-    <Compile Include="..\Robust.Shared\Analyzers\NotNullableFlagAttribute.cs" LinkBase="Implementations" />
+    <Compile Include="..\Robust.Shared\Analyzers\NotNullableFlagAttribute.cs" />
   </ItemGroup>
 
   <ItemGroup>
     <!-- Needed for FriendAnalyzer. -->
-    <Compile Include="..\Robust.Shared\Analyzers\AccessAttribute.cs" LinkBase="Implementations" />
-    <Compile Include="..\Robust.Shared\Analyzers\AccessPermissions.cs" LinkBase="Implementations" />
+    <Compile Include="..\Robust.Shared\Analyzers\AccessAttribute.cs" />
+    <Compile Include="..\Robust.Shared\Analyzers\AccessPermissions.cs" />
   </ItemGroup>
 
   <ItemGroup>
     <!-- Needed for PreferGenericVariantAnalyzer. -->
-    <Compile Include="..\Robust.Shared\Analyzers\PreferGenericVariantAttribute.cs" LinkBase="Implementations" />
+    <Compile Include="..\Robust.Shared\Analyzers\PreferGenericVariantAttribute.cs" />
   </ItemGroup>
 
-  <Import Project="../Robust.Roslyn.Shared/Robust.Roslyn.Shared.props" />
-
-  <PropertyGroup>
-    <Nullable>disable</Nullable>
-    <!--
-    Rider seems to get really confused with hot reload if we directly compile in the above-linked classes.
-    As such, they have an #if to change their namespace in this project.
-    -->
-    <DefineConstants>$(DefineConstants);ROBUST_ANALYZERS_IMPL</DefineConstants>
-  </PropertyGroup>
-
 </Project>

Robust.Analyzers/SerializableAnalyzer.cs

@@ -10,7 +10,6 @@ using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
 
 namespace Robust.Analyzers
 {

Robust.Analyzers/TaskResultAnalyzer.cs

@@ -3,7 +3,6 @@ using System.Diagnostics.CodeAnalysis;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
 
 namespace Robust.Analyzers;
 

Robust.Benchmarks/Collections/ValueListEnumerationBenchmarks.cs

@@ -1,83 +0,0 @@
-using System;
-using System.Collections.Generic;
-using BenchmarkDotNet.Attributes;
-using Robust.Shared.Analyzers;
-using Robust.Shared.Collections;
-
-namespace Robust.Benchmarks.Collections;
-
-[Virtual]
-public class ValueListEnumerationBenchmarks
-{
-    [Params(4, 16, 64)]
-    public int N { get; set; }
-
-    private sealed class Data(int i)
-    {
-        public readonly int I = i;
-    }
-
-    private ValueList<Data> _valueList;
-    private Data[] _array = default!;
-
-    [GlobalSetup]
-    public void Setup()
-    {
-        var list = new List<Data>(N);
-        for (var i = 0; i < N; i++)
-        {
-            list.Add(new(i));
-        }
-
-        _array = list.ToArray();
-        _valueList = new(list.ToArray());
-    }
-
-    [Benchmark]
-    public int ValueList()
-    {
-        var total = 0;
-        foreach (var ev in _valueList)
-        {
-            total += ev.I;
-        }
-
-        return total;
-    }
-
-    [Benchmark]
-    public int ValueListSpan()
-    {
-        var total = 0;
-        foreach (var ev in _valueList.Span)
-        {
-            total += ev.I;
-        }
-
-        return total;
-    }
-
-    [Benchmark]
-    public int Array()
-    {
-        var total = 0;
-        foreach (var ev in _array)
-        {
-            total += ev.I;
-        }
-
-        return total;
-    }
-
-    [Benchmark]
-    public int Span()
-    {
-        var total = 0;
-        foreach (var ev in _array.AsSpan())
-        {
-            total += ev.I;
-        }
-
-        return total;
-    }
-}

Robust.Client.NameGenerator/Robust.Client.NameGenerator.csproj

@@ -1,17 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+      <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Link="XamlX\filename" Include="../XamlX/src/XamlX/**/*.cs" />
     <Compile Remove="../XamlX/src/XamlX/**/SreTypeSystem.cs" />
     <Compile Remove="../XamlX/src/XamlX/obj/**" />
     <Compile Include="..\Robust.Client\UserInterface\ControlPropertyAccess.cs" />
   </ItemGroup>
-
-  <Import Project="../Robust.Roslyn.Shared/Robust.Roslyn.Shared.props" />
-
-  <PropertyGroup>
-    <!-- XamlX doesn't do NRTs. -->
-    <Nullable>disable</Nullable>
-  </PropertyGroup>
-
 </Project>

Robust.Client/Audio/AudioOverlay.cs

@@ -39,7 +39,7 @@ public sealed class AudioOverlay : Overlay
 
     protected internal override void Draw(in OverlayDrawArgs args)
     {
-        var localPlayer = _playerManager.LocalEntity;
+        var localPlayer = _playerManager.LocalPlayer?.ControlledEntity;
 
         if (args.ViewportControl == null || localPlayer == null)
             return;

Robust.Client/Audio/AudioSystem.Limits.cs

@@ -1,57 +0,0 @@
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using Robust.Shared;
-using Robust.Shared.GameObjects;
-
-namespace Robust.Client.Audio;
-
-public sealed partial class AudioSystem
-{
-    /*
-     * Handles limiting concurrent sounds for audio to avoid blowing the source budget on one sound getting spammed.
-     */
-
-    private readonly Dictionary<string, int> _playingCount = new();
-
-    private int _maxConcurrent;
-
-    private void InitializeLimit()
-    {
-        Subs.CVar(CfgManager, CVars.AudioDefaultConcurrent, SetConcurrentLimit, true);
-    }
-
-    private void SetConcurrentLimit(int obj)
-    {
-        _maxConcurrent = obj;
-    }
-
-    private bool TryAudioLimit(string sound)
-    {
-        if (string.IsNullOrEmpty(sound))
-            return true;
-
-        ref var count = ref CollectionsMarshal.GetValueRefOrAddDefault(_playingCount, sound, out _);
-
-        if (count >= _maxConcurrent)
-            return false;
-
-        count++;
-        return true;
-    }
-
-    private void RemoveAudioLimit(string sound)
-    {
-        if (!_playingCount.TryGetValue(sound, out var count))
-            return;
-
-        count--;
-
-        if (count <= 0)
-        {
-            _playingCount.Remove(sound);
-            return;
-        }
-
-        _playingCount[sound] = count;
-    }
-}

Robust.Client/Audio/AudioSystem.cs

@@ -41,7 +41,6 @@ public sealed partial class AudioSystem : SharedAudioSystem
     [Dependency] private readonly IParallelManager _parMan = default!;
     [Dependency] private readonly IRuntimeLog _runtimeLog = default!;
     [Dependency] private readonly IAudioInternal _audio = default!;
-    [Dependency] private readonly MetaDataSystem _metadata = default!;
     [Dependency] private readonly SharedTransformSystem _xformSys = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
 
@@ -52,7 +51,6 @@ public sealed partial class AudioSystem : SharedAudioSystem
     private EntityUid? _listenerGrid;
     private UpdateAudioJob _updateAudioJob;
 
-
     private EntityQuery<PhysicsComponent> _physicsQuery;
 
     private float _maxRayLength;
@@ -108,9 +106,8 @@ public sealed partial class AudioSystem : SharedAudioSystem
         SubscribeNetworkEvent<PlayAudioEntityMessage>(OnEntityAudio);
         SubscribeNetworkEvent<PlayAudioPositionalMessage>(OnEntityCoordinates);
 
-        Subs.CVar(CfgManager, CVars.AudioAttenuation, OnAudioAttenuation, true);
-        Subs.CVar(CfgManager, CVars.AudioRaycastLength, OnRaycastLengthChanged, true);
-        InitializeLimit();
+        CfgManager.OnValueChanged(CVars.AudioAttenuation, OnAudioAttenuation, true);
+        CfgManager.OnValueChanged(CVars.AudioRaycastLength, OnRaycastLengthChanged, true);
     }
 
     private void OnAudioState(EntityUid uid, AudioComponent component, ref AfterAutoHandleStateEvent args)
@@ -126,33 +123,6 @@ public sealed partial class AudioSystem : SharedAudioSystem
         {
             component.Source.SetAuxiliary(null);
         }
-
-        switch (component.State)
-        {
-            case AudioState.Playing:
-                component.StartPlaying();
-                break;
-            case AudioState.Paused:
-                component.Pause();
-                break;
-            case AudioState.Stopped:
-                component.StopPlaying();
-                component.PlaybackPosition = 0f;
-                break;
-        }
-
-        // If playback position changed then update it.
-        if (!string.IsNullOrEmpty(component.FileName))
-        {
-            var position = (float) ((component.PauseTime ?? Timing.CurTime) - component.AudioStart).TotalSeconds;
-            var currentPosition = component.Source.PlaybackPosition;
-            var diff = Math.Abs(position - currentPosition);
-
-            if (diff > 0.1f)
-            {
-                component.PlaybackPosition = position;
-            }
-        }
     }
 
     /// <summary>
@@ -163,6 +133,13 @@ public sealed partial class AudioSystem : SharedAudioSystem
         _audio.SetMasterGain(value);
     }
 
+    public override void Shutdown()
+    {
+        CfgManager.UnsubValueChanged(CVars.AudioAttenuation, OnAudioAttenuation);
+        CfgManager.UnsubValueChanged(CVars.AudioRaycastLength, OnRaycastLengthChanged);
+        base.Shutdown();
+    }
+
     private void OnAudioPaused(EntityUid uid, AudioComponent component, ref EntityPausedEvent args)
     {
         component.Pause();
@@ -193,37 +170,26 @@ public sealed partial class AudioSystem : SharedAudioSystem
             return;
         }
 
-        SetupSource((uid, component), audioResource);
+        SetupSource(component, audioResource);
         component.Loaded = true;
     }
 
-    private void SetupSource(Entity<AudioComponent> entity, AudioResource audioResource, TimeSpan? length = null)
+    private void SetupSource(AudioComponent component, AudioResource audioResource, TimeSpan? length = null)
     {
-        var component = entity.Comp;
+        var source = _audio.CreateAudioSource(audioResource);
 
-        if (TryAudioLimit(component.FileName))
+        if (source == null)
         {
-            var newSource = _audio.CreateAudioSource(audioResource);
-
-            if (newSource == null)
-            {
-                Log.Error($"Error creating audio source for {audioResource}");
-                DebugTools.Assert(false);
-            }
-            else
-            {
-                component.Source = newSource;
-            }
+            Log.Error($"Error creating audio source for {audioResource}");
+            DebugTools.Assert(false);
+            source = component.Source;
         }
 
-        if ((component.Flags & AudioFlags.GridAudio) != 0x0)
-        {
-            _metadata.SetFlag(entity.Owner, MetaDataFlags.Undetachable, true);
-        }
+        component.Source = source;
 
         // Need to set all initial data for first frame.
         ApplyAudioParams(component.Params, component);
-        component.Source.Global = component.Global;
+        source.Global = component.Global;
 
         // Don't play until first frame so occlusion etc. are correct.
         component.Gain = 0f;
@@ -243,8 +209,6 @@ public sealed partial class AudioSystem : SharedAudioSystem
     {
         // Breaks with prediction?
         component.Source.Dispose();
-
-        RemoveAudioLimit(component.FileName);
     }
 
     private void OnAudioAttenuation(int obj)
@@ -454,13 +418,13 @@ public sealed partial class AudioSystem : SharedAudioSystem
         return false;
     }
 
-    public override (EntityUid Entity, AudioComponent Component)? PlayPvs(string? filename, EntityCoordinates coordinates,
+    public override (EntityUid Entity, AudioComponent Component)? PlayPvs(string filename, EntityCoordinates coordinates,
         AudioParams? audioParams = null)
     {
         return PlayStatic(filename, Filter.Local(), coordinates, true, audioParams);
     }
 
-    public override (EntityUid Entity, AudioComponent Component)? PlayPvs(string? filename, EntityUid uid, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayPvs(string filename, EntityUid uid, AudioParams? audioParams = null)
     {
         return PlayEntity(filename, Filter.Local(), uid, true, audioParams);
     }
@@ -487,11 +451,8 @@ public sealed partial class AudioSystem : SharedAudioSystem
     /// </summary>
     /// <param name="filename">The resource path to the OGG Vorbis file to play.</param>
     /// <param name="audioParams"></param>
-    private (EntityUid Entity, AudioComponent Component)? PlayGlobal(string? filename, AudioParams? audioParams = null, bool recordReplay = true)
+    private (EntityUid Entity, AudioComponent Component)? PlayGlobal(string filename, AudioParams? audioParams = null, bool recordReplay = true)
     {
-        if (string.IsNullOrEmpty(filename))
-            return null;
-
         if (recordReplay && _replayRecording.IsRecording)
         {
             _replayRecording.RecordReplayMessage(new PlayAudioGlobalMessage
@@ -523,11 +484,8 @@ public sealed partial class AudioSystem : SharedAudioSystem
     /// </summary>
     /// <param name="filename">The resource path to the OGG Vorbis file to play.</param>
     /// <param name="entity">The entity "emitting" the audio.</param>
-    private (EntityUid Entity, AudioComponent Component)? PlayEntity(string? filename, EntityUid entity, AudioParams? audioParams = null, bool recordReplay = true)
+    private (EntityUid Entity, AudioComponent Component)? PlayEntity(string filename, EntityUid entity, AudioParams? audioParams = null, bool recordReplay = true)
     {
-        if (string.IsNullOrEmpty(filename))
-            return null;
-
         if (recordReplay && _replayRecording.IsRecording)
         {
             _replayRecording.RecordReplayMessage(new PlayAudioEntityMessage
@@ -567,11 +525,8 @@ public sealed partial class AudioSystem : SharedAudioSystem
     /// <param name="filename">The resource path to the OGG Vorbis file to play.</param>
     /// <param name="coordinates">The coordinates at which to play the audio.</param>
     /// <param name="audioParams"></param>
-    private (EntityUid Entity, AudioComponent Component)? PlayStatic(string? filename, EntityCoordinates coordinates, AudioParams? audioParams = null, bool recordReplay = true)
+    private (EntityUid Entity, AudioComponent Component)? PlayStatic(string filename, EntityCoordinates coordinates, AudioParams? audioParams = null, bool recordReplay = true)
     {
-        if (string.IsNullOrEmpty(filename))
-            return null;
-
         if (recordReplay && _replayRecording.IsRecording)
         {
             _replayRecording.RecordReplayMessage(new PlayAudioPositionalMessage
@@ -605,65 +560,65 @@ public sealed partial class AudioSystem : SharedAudioSystem
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string? filename, Filter playerFilter, bool recordReplay, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string filename, Filter playerFilter, bool recordReplay, AudioParams? audioParams = null)
     {
         return PlayGlobal(filename, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(string? filename, Filter playerFilter, EntityUid entity, bool recordReplay, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(string filename, Filter playerFilter, EntityUid entity, bool recordReplay, AudioParams? audioParams = null)
     {
         return PlayEntity(filename, entity, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(string? filename, Filter playerFilter, EntityCoordinates coordinates, bool recordReplay, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(string filename, Filter playerFilter, EntityCoordinates coordinates, bool recordReplay, AudioParams? audioParams = null)
     {
         return PlayStatic(filename, coordinates, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string? filename, ICommonSession recipient, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string filename, ICommonSession recipient, AudioParams? audioParams = null)
     {
         return PlayGlobal(filename, audioParams);
     }
 
-    public override void LoadStream<T>(Entity<AudioComponent> entity, T stream)
+    public override void LoadStream<T>(AudioComponent component, T stream)
     {
         if (stream is AudioStream audioStream)
         {
             TryGetAudio(audioStream, out var audio);
-            SetupSource(entity, audio!, audioStream.Length);
-            entity.Comp.Loaded = true;
+            SetupSource(component, audio!, audioStream.Length);
+            component.Loaded = true;
         }
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string? filename, EntityUid recipient, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string filename, EntityUid recipient, AudioParams? audioParams = null)
     {
         return PlayGlobal(filename, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(string? filename, ICommonSession recipient, EntityUid uid, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(string filename, ICommonSession recipient, EntityUid uid, AudioParams? audioParams = null)
     {
         return PlayEntity(filename, uid, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(string? filename, EntityUid recipient, EntityUid uid, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(string filename, EntityUid recipient, EntityUid uid, AudioParams? audioParams = null)
     {
         return PlayEntity(filename, uid, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(string? filename, ICommonSession recipient, EntityCoordinates coordinates, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(string filename, ICommonSession recipient, EntityCoordinates coordinates, AudioParams? audioParams = null)
     {
         return PlayStatic(filename, coordinates, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(string? filename, EntityUid recipient, EntityCoordinates coordinates, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(string filename, EntityUid recipient, EntityCoordinates coordinates, AudioParams? audioParams = null)
     {
         return PlayStatic(filename, coordinates, audioParams);
     }
@@ -673,7 +628,7 @@ public sealed partial class AudioSystem : SharedAudioSystem
         var audioP = audioParams ?? AudioParams.Default;
         var entity = EntityManager.CreateEntityUninitialized("Audio", MapCoordinates.Nullspace);
         var comp = SetupAudio(entity, null, audioP, stream.Length);
-        LoadStream((entity, comp), stream);
+        LoadStream(comp, stream);
         EntityManager.InitializeAndStartEntity(entity);
         var source = comp.Source;
 

Robust.Client/Audio/Midi/MidiManager.cs

@@ -114,7 +114,7 @@ internal sealed partial class MidiManager : IMidiManager
         "/usr/share/sounds/sf2/TimGM6mb.sf2",
     };
 
-    private static readonly string WindowsSoundfont = $@"{Environment.GetEnvironmentVariable("SystemRoot")}\system32\drivers\gm.dls";
+    private const string WindowsSoundfont = @"C:\WINDOWS\system32\drivers\gm.dls";
 
     private const string OsxSoundfont =
         "/System/Library/Components/CoreAudio.component/Contents/Resources/gs_instruments.dls";
@@ -192,12 +192,7 @@ internal sealed partial class MidiManager : IMidiManager
             _settings["synth.midi-bank-select"].StringValue = "gm";
             //_settings["synth.verbose"].IntValue = 1; // Useful for debugging.
 
-            var midiParallel = _cfgMan.GetCVar(CVars.MidiParallelism);
-            _settings["synth.polyphony"].IntValue = Math.Clamp(1024 + (int)(Math.Log2(midiParallel) * 2048), 1, 65535);
-            _settings["synth.cpu-cores"].IntValue = Math.Clamp(midiParallel, 1, 256);
-
-            _midiSawmill.Debug($"Synth Cores: {_settings["synth.cpu-cores"].IntValue}");
-            _midiSawmill.Debug($"Synth Polyphony: {_settings["synth.polyphony"].IntValue}");
+            _parallel.AddAndInvokeParallelCountChanged(UpdateParallelCount);
         }
         catch (Exception e)
         {
@@ -206,10 +201,7 @@ internal sealed partial class MidiManager : IMidiManager
             return;
         }
 
-        _midiThread = new Thread(ThreadUpdate)
-        {
-            Name = "RobustToolbox MIDI Thread"
-        };
+        _midiThread = new Thread(ThreadUpdate);
         _midiThread.Start();
 
         _updateJob = new MidiUpdateJob()
@@ -227,6 +219,18 @@ internal sealed partial class MidiManager : IMidiManager
         FluidsynthInitialized = true;
     }
 
+    private void UpdateParallelCount()
+    {
+        if (_settings == null)
+            return;
+
+        _settings["synth.polyphony"].IntValue = Math.Clamp(1024 + (int)(Math.Log2(_parallel.ParallelProcessCount) * 2048), 1, 65535);
+        _settings["synth.cpu-cores"].IntValue = Math.Clamp(_parallel.ParallelProcessCount, 1, 256);
+
+        _midiSawmill.Debug($"Synth Cores: {_settings["synth.cpu-cores"].IntValue}");
+        _midiSawmill.Debug($"Synth Polyphony: {_settings["synth.polyphony"].IntValue}");
+    }
+
     private void LoggerDelegate(NFluidsynth.Logger.LogLevel level, string message, IntPtr data)
     {
         var rLevel = level switch

Robust.Client/Audio/Midi/MidiRenderer.cs

@@ -38,7 +38,6 @@ internal sealed class MidiRenderer : IMidiRenderer
     private readonly Synth _synth;
     private readonly Sequencer _sequencer;
     private NFluidsynth.Player? _player;
-    private int _playerTotalTicks;
     private MidiDriver? _driver;
     private byte _midiProgram = 1;
     private byte _midiBank = 1;
@@ -145,21 +144,7 @@ internal sealed class MidiRenderer : IMidiRenderer
     public bool DisableProgramChangeEvent { get; set; } = true;
 
     [ViewVariables(VVAccess.ReadWrite)]
-    public int PlayerTotalTick
-    {
-        get
-        {
-            // GetTotalTicks is really expensive (has to iterate the entire file, not cached).
-            // Slight problem with caching it ourselves: the value only becomes available when the player loads the MIDI file.
-            // And that only happens after playback really starts, with the timer and synth and all that stuff.
-            // So we cache it "as soon as it's available", i.e. not 0.
-            // We don't care about playlists and such, so it shouldn't change anymore after.
-            if (_playerTotalTicks != 0)
-                return _playerTotalTicks;
-
-            return _playerTotalTicks = _player?.GetTotalTicks ?? 0;
-        }
-    }
+    public int PlayerTotalTick => _player?.GetTotalTicks ?? 0;
 
     [ViewVariables(VVAccess.ReadWrite)]
     public int PlayerTick
@@ -354,7 +339,6 @@ internal sealed class MidiRenderer : IMidiRenderer
                 return false;
             }
 
-            _playerTotalTicks = 0;
             _player?.Dispose();
             _player = new NFluidsynth.Player(_synth);
             _player.SetPlaybackCallback(MidiPlayerEventHandler);
@@ -393,7 +377,6 @@ internal sealed class MidiRenderer : IMidiRenderer
             _player?.Join();
             _player?.Dispose();
             _player = null;
-            _playerTotalTicks = 0;
         }
 
         StopAllNotes();

Robust.Client/Audio/Sources/BaseAudioSource.cs

@@ -314,8 +314,6 @@ public abstract class BaseAudioSource : IAudioSource
         set
         {
             _checkDisposed();
-
-            value = MathF.Max(value, 0f);
             AL.Source(SourceHandle, ALSourcef.SecOffset, value);
             Master._checkAlError($"Tried to set invalid playback position of {value:0.00}");
         }

Robust.Client/BaseClient.cs

@@ -229,7 +229,7 @@ namespace Robust.Client
 
             // Don't invoke PlayerLeaveServer if PlayerJoinedServer & GameStartedSetup hasn't been called yet.
             if (RunLevel > ClientRunLevel.Connecting)
-                PlayerLeaveServer?.Invoke(this, new PlayerEventArgs(_playMan.LocalSession));
+                PlayerLeaveServer?.Invoke(this, new PlayerEventArgs(_playMan.LocalPlayer?.Session));
 
             LastDisconnectReason = args.Reason;
             GameStoppedReset();

Robust.Client/Console/ClientConsoleHost.cs

@@ -188,7 +188,7 @@ namespace Robust.Client.Console
             }
 
             args.RemoveAt(0);
-            var shell = new ConsoleShell(this, session ?? _player.LocalSession, session == null);
+            var shell = new ConsoleShell(this, session ?? _player.LocalPlayer?.Session, session == null);
             var cmdArgs = args.ToArray();
 
             AnyCommandExecuted?.Invoke(shell, commandName, command, cmdArgs);
@@ -200,7 +200,8 @@ namespace Robust.Client.Console
             // When not connected to a server, you can run all local commands.
             // When connected to a server, you can only run commands according to the con group controller.
 
-            return _player.LocalSession is not { Status: > SessionStatus.Connecting }
+            return _player.LocalPlayer == null
+                   || _player.LocalPlayer.Session.Status <= SessionStatus.Connecting
                    || _conGroup.CanCommand(cmdName);
         }
 

Robust.Client/Console/Commands/ClientSpawnCommand.cs

@@ -16,7 +16,8 @@ namespace Robust.Client.Console.Commands
 
         public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            if (_playerManager.LocalEntity is not { } controlled)
+            var controlled = _playerManager.LocalPlayer?.ControlledEntity ?? EntityUid.Invalid;
+            if (controlled == EntityUid.Invalid)
             {
                 shell.WriteLine("You don't have an attached entity.");
                 return;

Robust.Client/Console/Commands/Debug.cs

@@ -294,6 +294,7 @@ namespace Robust.Client.Console.Commands
     internal sealed class SnapGridGetCell : LocalizedCommands
     {
         [Dependency] private readonly IEntityManager _entManager = default!;
+        [Dependency] private readonly IMapManager _map = default!;
 
         public override string Command => "sggcell";
 
@@ -319,7 +320,7 @@ namespace Robust.Client.Console.Commands
                 return;
             }
 
-            if (_entManager.TryGetComponent<MapGridComponent>(_entManager.GetEntity(gridNet), out var grid))
+            if (_map.TryGetGrid(_entManager.GetEntity(gridNet), out var grid))
             {
                 foreach (var entity in grid.GetAnchoredEntities(new Vector2i(
                              int.Parse(indices.Split(',')[0], CultureInfo.InvariantCulture),
@@ -428,6 +429,7 @@ namespace Robust.Client.Console.Commands
     internal sealed class GridTileCount : LocalizedCommands
     {
         [Dependency] private readonly IEntityManager _entManager = default!;
+        [Dependency] private readonly IMapManager _map = default!;
 
         public override string Command => "gridtc";
 
@@ -446,7 +448,7 @@ namespace Robust.Client.Console.Commands
                 return;
             }
 
-            if (_entManager.TryGetComponent<MapGridComponent>(gridUid, out var grid))
+            if (_map.TryGetGrid(gridUid, out var grid))
             {
                 shell.WriteLine(grid.GetAllTiles().Count().ToString());
             }
@@ -553,7 +555,7 @@ namespace Robust.Client.Console.Commands
                 if (type != typeof(Control))
                     cname = $"Control > {cname}";
 
-                returnVal.GetOrNew(cname).Add((member.Name, GetMemberValue(member, control, ", ")));
+                returnVal.GetOrNew(cname).Add((member.Name, member.GetValue(control)?.ToString() ?? "null"));
             }
 
             foreach (var (attachedProperty, value) in control.AllAttachedProperties)
@@ -568,28 +570,6 @@ namespace Robust.Client.Console.Commands
             }
             return returnVal;
         }
-
-        internal static string PropertyValuesString(Control control, string key)
-        {
-            var member = GetAllMembers(control).Find(m => m.Name == key);
-            return GetMemberValue(member, control, "\n", "\"{0}\"");
-        }
-
-        private static string GetMemberValue(MemberInfo? member, Control control, string separator, string
-                wrap = "{0}")
-        {
-            var value = member?.GetValue(control);
-            var o = value switch
-            {
-                ICollection<Control> controls => string.Join(separator,
-                    controls.Select(ctrl => $"{ctrl.Name}({ctrl.GetType()})")),
-                ICollection<string> list => string.Join(separator, list),
-                null => null,
-                _ => value.ToString()
-            };
-            // Convert to quote surrounded string or null with no quotes
-            return o is not null ? string.Format(wrap, o) : "null";
-        }
     }
 
     internal sealed class SetClipboardCommand : LocalizedCommands

Robust.Client/Console/Commands/UITestCommand.cs

@@ -165,7 +165,7 @@ Suspendisse hendrerit blandit urna ut laoreet. Suspendisse ac elit at erat males
     {
         var textEdit = new TextEdit
         {
-            Placeholder = new Rope.Leaf("You deleted the lipsum\nOwO")
+            Placeholder = new Rope.Leaf("You deleted the lipsum OwO")
         };
         TabContainer.SetTabTitle(textEdit, "TextEdit");
 

Robust.Client/Debugging/DebugPhysicsSystem.cs

@@ -420,7 +420,7 @@ namespace Robust.Client.Debugging
                 if (mapPos.MapId != args.MapId)
                     return;
 
-                var player = _playerManager.LocalEntity;
+                var player = _playerManager.LocalPlayer?.ControlledEntity;
 
                 if (!_entityManager.TryGetComponent<TransformComponent>(player, out var playerXform) ||
                     playerXform.MapID != args.MapId)

Robust.Client/GameController/GameController.cs

@@ -612,8 +612,6 @@ namespace Robust.Client
             {
                 _modLoader.BroadcastUpdate(ModUpdateLevel.FramePostEngine, frameEventArgs);
             }
-
-            _audio.FlushALDisposeQueues();
         }
 
         internal static void SetupLogging(

Robust.Client/GameObjects/ClientEntityManager.Network.cs

@@ -42,8 +42,6 @@ public sealed partial class ClientEntityManager
         var pending = PendingNetEntityStates.GetOrNew(nEntity);
         pending.Add((typeof(T), callerEntity));
 
-
-
         return entity.Item1;
     }
 

Robust.Client/GameObjects/ClientEntityManager.cs

@@ -8,7 +8,6 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 using Robust.Shared.Network.Messages;
-using Robust.Shared.Player;
 using Robust.Shared.Replays;
 using Robust.Shared.Utility;
 
@@ -135,24 +134,6 @@ namespace Robust.Client.GameObjects
             EventBus.RaiseEvent(EventSource.Local, new EntitySessionMessage<T>(eventArgs, msg));
         }
 
-        /// <inheritdoc />
-        public override void RaiseSharedEvent<T>(T message, EntityUid? user = null)
-        {
-            if (user == null || user != _playerManager.LocalEntity || !_gameTiming.IsFirstTimePredicted)
-                return;
-
-            EventBus.RaiseEvent(EventSource.Local, ref message);
-        }
-
-        /// <inheritdoc />
-        public override void RaiseSharedEvent<T>(T message, ICommonSession? user = null)
-        {
-            if (user == null || user != _playerManager.LocalSession || !_gameTiming.IsFirstTimePredicted)
-                return;
-
-            EventBus.RaiseEvent(EventSource.Local, ref message);
-        }
-
         #region IEntityNetworkManager impl
 
         public override IEntityNetworkManager EntityNetManager => this;
@@ -240,7 +221,7 @@ namespace Robust.Client.GameObjects
         public void DispatchReceivedNetworkMsg(EntityEventArgs msg)
         {
             var sessionType = typeof(EntitySessionMessage<>).MakeGenericType(msg.GetType());
-            var sessionMsg = Activator.CreateInstance(sessionType, new EntitySessionEventArgs(_playerManager.LocalSession!), msg)!;
+            var sessionMsg = Activator.CreateInstance(sessionType, new EntitySessionEventArgs(_playerManager.LocalPlayer!.Session), msg)!;
             ReceivedSystemMessage?.Invoke(this, msg);
             ReceivedSystemMessage?.Invoke(this, sessionMsg);
         }

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

@@ -8,9 +8,11 @@ using System.Text;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Client.Utility;
+using Robust.Shared;
 using Robust.Shared.Animations;
 using Robust.Shared.ComponentTrees;
 using Robust.Shared.GameObjects;
+using Robust.Shared.Graphics;
 using Robust.Shared.Graphics.RSI;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
@@ -1235,9 +1237,9 @@ namespace Robust.Client.GameObjects
         public IEnumerable<ISpriteLayer> AllLayers => Layers;
 
         // Lobby SpriteView rendering path
-        public void Render(DrawingHandleWorld drawingHandle, Angle eyeRotation, Angle worldRotation, Direction? overrideDirection = null, Vector2 position = default)
+        public void Render(DrawingHandleWorld drawingHandle, Angle eyeRotation, Angle worldRotation, Direction? overrideDirection = null)
         {
-            RenderInternal(drawingHandle, eyeRotation, worldRotation, position, overrideDirection);
+            RenderInternal(drawingHandle, eyeRotation, worldRotation, Vector2.Zero, overrideDirection);
         }
 
         [DataField("noRot")] private bool _screenLock = false;

Robust.Client/GameObjects/EntitySystems/ContainerSystem.cs

@@ -107,7 +107,7 @@ namespace Robust.Client.GameObjects
                 toDelete.Add(id);
             }
 
-            foreach (var dead in toDelete.Span)
+            foreach (var dead in toDelete)
             {
                 component.Containers.Remove(dead);
             }
@@ -142,7 +142,7 @@ namespace Robust.Client.GameObjects
                         toRemove.Add(entity);
                 }
 
-                foreach (var entity in toRemove.Span)
+                foreach (var entity in toRemove)
                 {
                     Remove(
                         (entity, TransformQuery.GetComponent(entity), MetaQuery.GetComponent(entity)),
@@ -162,7 +162,7 @@ namespace Robust.Client.GameObjects
                         removedExpected.Add(netEntity);
                 }
 
-                foreach (var entityUid in removedExpected.Span)
+                foreach (var entityUid in removedExpected)
                 {
                     RemoveExpectedEntity(entityUid, out _);
                 }

Robust.Client/GameObjects/EntitySystems/InputSystem.cs

@@ -26,7 +26,6 @@ namespace Robust.Client.GameObjects
         [Dependency] private readonly IConsoleHost _conHost = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly ILogManager _logManager = default!;
-        [Dependency] private readonly SharedTransformSystem _transform = default!;
 
         private ISawmill _sawmillInputContext = default!;
 
@@ -106,10 +105,12 @@ namespace Robust.Client.GameObjects
         /// <param name="inputCmd">Input command to handle as predicted.</param>
         public void PredictInputCommand(IFullInputCmdMessage inputCmd)
         {
+            DebugTools.AssertNotNull(_playerManager.LocalPlayer);
+
             var keyFunc = _inputManager.NetworkBindMap.KeyFunctionName(inputCmd.InputFunctionId);
 
             Predicted = true;
-            var session = _playerManager.LocalSession;
+            var session = _playerManager.LocalPlayer!.Session;
             foreach (var handler in BindRegistry.GetHandlers(keyFunc))
             {
                 if (handler.HandleCmdMessage(EntityManager, session, inputCmd))
@@ -144,22 +145,27 @@ namespace Robust.Client.GameObjects
 
         private void GenerateInputCommand(IConsoleShell shell, string argstr, string[] args)
         {
-            if (_playerManager.LocalEntity is not { } pent)
+            var localPlayer = _playerManager.LocalPlayer;
+            if(localPlayer is null)
+                return;
+
+            var pent = localPlayer.ControlledEntity;
+            if(pent is null)
                 return;
 
             BoundKeyFunction keyFunction = new BoundKeyFunction(args[0]);
             BoundKeyState state = args[1] == "u" ? BoundKeyState.Up: BoundKeyState.Down;
 
-            var pxform = Transform(pent);
+            var pxform = Transform(pent.Value);
             var wPos = pxform.WorldPosition + new Vector2(float.Parse(args[2]), float.Parse(args[3]));
-            var coords = EntityCoordinates.FromMap(pent, new MapCoordinates(wPos, pxform.MapID), _transform, EntityManager);
+            var coords = EntityCoordinates.FromMap(EntityManager, pent.Value, new MapCoordinates(wPos, pxform.MapID));
 
             var funcId = _inputManager.NetworkBindMap.KeyFunctionID(keyFunction);
 
             var message = new FullInputCmdMessage(_timing.CurTick, _timing.TickFraction, funcId, state,
                 GetNetCoordinates(coords), new ScreenCoordinates(0, 0, default), NetEntity.Invalid);
 
-            HandleInputCommand(_playerManager.LocalSession, keyFunction, message);
+            HandleInputCommand(localPlayer.Session, keyFunction, message);
         }
 
         private void OnAttachedEntityChanged(LocalPlayerAttachedEvent message)
@@ -202,8 +208,11 @@ namespace Robust.Client.GameObjects
         /// </summary>
         public void SetEntityContextActive()
         {
-            if (_playerManager.LocalEntity is not { } controlled)
+            var controlled = _playerManager.LocalPlayer?.ControlledEntity ?? EntityUid.Invalid;
+            if (controlled == EntityUid.Invalid)
+            {
                 return;
+            }
 
             SetEntityContextActive(_inputManager, controlled);
         }

Robust.Client/GameObjects/EntitySystems/SpriteSystem.cs

@@ -62,7 +62,7 @@ namespace Robust.Client.GameObjects
             SubscribeLocalEvent<SpriteComponent, SpriteUpdateInertEvent>(QueueUpdateInert);
             SubscribeLocalEvent<SpriteComponent, ComponentInit>(OnInit);
 
-            Subs.CVar(_cfg, CVars.RenderSpriteDirectionBias, OnBiasChanged, true);
+            _cfg.OnValueChanged(CVars.RenderSpriteDirectionBias, OnBiasChanged, true);
             _sawmill = _logManager.GetSawmill("sprite");
         }
 
@@ -72,6 +72,12 @@ namespace Robust.Client.GameObjects
             QueueUpdateInert(uid, component);
         }
 
+        public override void Shutdown()
+        {
+            base.Shutdown();
+            _cfg.UnsubValueChanged(CVars.RenderSpriteDirectionBias, OnBiasChanged);
+        }
+
         private void OnBiasChanged(double value)
         {
             SpriteComponent.DirectionBias = value;

Robust.Client/GameObjects/EntitySystems/UserInterfaceSystem.cs

@@ -29,7 +29,10 @@ namespace Robust.Client.GameObjects
 
             var uiKey = ev.UiKey;
             var message = ev.Message;
-            message.Session = _playerManager.LocalSession!;
+            // This should probably not happen at this point, but better make extra sure!
+            if (_playerManager.LocalPlayer != null)
+                message.Session = _playerManager.LocalPlayer.Session;
+
             message.Entity = GetNetEntity(uid);
             message.UiKey = uiKey;
 
@@ -72,7 +75,8 @@ namespace Robust.Client.GameObjects
             boundInterface.Open();
             uiComp.OpenInterfaces[uiKey] = boundInterface;
 
-            if (_playerManager.LocalSession is { } playerSession)
+            var playerSession = _playerManager.LocalPlayer?.Session;
+            if (playerSession != null)
             {
                 uiComp.Interfaces[uiKey]._subscribedSessions.Add(playerSession);
                 RaiseLocalEvent(uid, new BoundUIOpenedEvent(uiKey, uid, playerSession), true);

Robust.Client/GameObjects/EntitySystems/VelocityDebugSystem.cs

@@ -35,7 +35,7 @@ namespace Robust.Client.GameObjects
                 return;
             }
 
-            var player = _playerManager.LocalEntity;
+            var player = _playerManager.LocalPlayer?.ControlledEntity;
 
             if (player == null || !EntityManager.TryGetComponent(player.Value, out PhysicsComponent? body))
             {

Robust.Client/GameStates/ClientGameStateManager.cs

@@ -232,9 +232,9 @@ namespace Robust.Client.GameStates
                 return default;
             }
 
-            DebugTools.Assert(_players.LocalSession != null);
+            DebugTools.AssertNotNull(_players.LocalPlayer);
 
-            var evArgs = new EntitySessionEventArgs(_players.LocalSession);
+            var evArgs = new EntitySessionEventArgs(_players.LocalPlayer!.Session);
             _pendingSystemMessages.Enqueue((_nextInputCmdSeq, _timing.CurTick, message,
                 new EntitySessionMessage<T>(evArgs, message)));
 
@@ -700,7 +700,7 @@ namespace Robust.Client.GameStates
         {
             using var _ = _timing.StartStateApplicationArea();
 
-            // TODO replays optimize this.
+            // TODO repays optimize this.
             // This currently just saves game states as they are applied.
             // However this is inefficient and may have redundant data.
             // E.g., we may record states: [10 to 15] [11 to 16] *error* [0 to 18] [18 to 19] [18 to 20] ...
@@ -1120,7 +1120,7 @@ namespace Robust.Client.GameStates
                     continue;
                 }
 
-                if ((meta.Flags & (MetaDataFlags.Detached | MetaDataFlags.Undetachable)) != 0)
+                if ((meta.Flags & MetaDataFlags.Detached) != 0)
                     continue;
 
                 if (lastStateApplied.HasValue)
@@ -1138,7 +1138,7 @@ namespace Robust.Client.GameStates
                     if ((meta.Flags & MetaDataFlags.InContainer) != 0 &&
                         metas.TryGetComponent(xform.ParentUid, out var containerMeta) &&
                         (containerMeta.Flags & MetaDataFlags.Detached) == 0 &&
-                        containerSys.TryGetContainingContainer(xform.ParentUid, ent.Value, out container))
+                        containerSys.TryGetContainingContainer(xform.ParentUid, ent.Value, out container, null, true))
                     {
                         containerSys.Remove((ent.Value, xform, meta), container, false, true);
                     }
@@ -1414,7 +1414,7 @@ namespace Robust.Client.GameStates
                     _entities.TryGetComponent(xform.ParentUid, out MetaDataComponent? containerMeta) &&
                     (containerMeta.Flags & MetaDataFlags.Detached) == 0)
                 {
-                    containerSys.TryGetContainingContainer(xform.ParentUid, uid, out container);
+                    containerSys.TryGetContainingContainer(xform.ParentUid, uid, out container, null, true);
                 }
 
                 _entities.EntitySysManager.GetEntitySystem<TransformSystem>().DetachParentToNull(uid, xform);

Robust.Client/GameStates/NetGraphOverlay.cs

@@ -313,7 +313,7 @@ namespace Robust.Client.GameStates
 
                 if (args.Length == 0)
                 {
-                    entity = _playerManager.LocalEntity ?? EntityUid.Invalid;
+                    entity = _playerManager.LocalPlayer?.ControlledEntity ?? EntityUid.Invalid;
                 }
                 else if (!NetEntity.TryParse(args[0], out var netEntity) || !_entManager.TryGetEntity(netEntity, out entity))
                 {

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

@@ -11,7 +11,6 @@ using Robust.Shared;
 using Robust.Shared.Enums;
 using Robust.Shared.Graphics;
 using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
 using Robust.Shared.Maths;
 using Robust.Shared.Profiling;
 using Robust.Shared.Utility;
@@ -515,9 +514,7 @@ namespace Robust.Client.Graphics.Clyde
 
                     if (_lightManager.Enabled && _lightManager.DrawHardFov && eye.DrawLight && eye.DrawFov)
                     {
-                        var mapUid = _mapManager.GetMapEntityId(eye.Position.MapId);
-                        if (_entityManager.GetComponent<MapComponent>(mapUid).LightingEnabled)
-                            ApplyFovToBuffer(viewport, eye);
+                        ApplyFovToBuffer(viewport, eye);
                     }
                 }
 

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

@@ -1201,7 +1201,7 @@ namespace Robust.Client.Graphics.Clyde
 
         private void LightResolutionScaleChanged(float newValue)
         {
-            _lightResolutionScale = newValue > 0.05f ? newValue : 0.05f;
+            _lightResolutionScale = newValue;
             RegenAllLightRts();
         }
 

Robust.Client/Graphics/Clyde/Clyde.Textures.cs

@@ -649,30 +649,24 @@ namespace Robust.Client.Graphics.Clyde
                 return $"ClydeTexture: ({TextureId})";
             }
 
-            public override unsafe Color GetPixel(int x, int y)
+            public override Color GetPixel(int x, int y)
             {
                 if (!_clyde._loadedTextures.TryGetValue(TextureId, out var loaded))
                 {
                     throw new DataException("Texture not found");
                 }
 
-                var curTexture2D = GL.GetInteger(GetPName.TextureBinding2D);
-                var bufSize = 4 * loaded.Size.X * loaded.Size.Y;
-                var buffer = ArrayPool<byte>.Shared.Rent(bufSize);
-
-                GL.BindTexture(TextureTarget.Texture2D, loaded.OpenGLObject.Handle);
-
-                fixed (byte* p = buffer)
+                Span<byte> rgba = stackalloc byte[4*this.Size.X*this.Size.Y];
+                unsafe
                 {
-                    GL.GetnTexImage(TextureTarget.Texture2D, 0, PF.Rgba, PT.UnsignedByte, bufSize, (IntPtr) p);
+                    fixed (byte* p = rgba)
+                    {
+
+                        GL.GetTextureImage(loaded.OpenGLObject.Handle, 0, PF.Rgba, PT.UnsignedByte, 4*this.Size.X*this.Size.Y, (IntPtr) p);
+                    }
                 }
-
-                GL.BindTexture(TextureTarget.Texture2D, curTexture2D);
-
-                var pixelPos = (loaded.Size.X * (loaded.Size.Y - y - 1) + x) * 4;
-                var color = new Color(buffer[pixelPos+0], buffer[pixelPos+1], buffer[pixelPos+2], buffer[pixelPos+3]);
-                ArrayPool<byte>.Shared.Return(buffer);
-                return color;
+                int pixelPos = (this.Size.X*(this.Size.Y-y) + x)*4;
+                return new Color(rgba[pixelPos+0], rgba[pixelPos+1], rgba[pixelPos+2], rgba[pixelPos+3]);
             }
         }
 

Robust.Client/Graphics/Drawing/DrawingHandleBase.cs

@@ -1,10 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Runtime.Intrinsics;
+using Robust.Shared.Graphics;
 using Robust.Shared.Maths;
 
 namespace Robust.Client.Graphics
@@ -64,19 +63,6 @@ namespace Robust.Client.Graphics
 
         // ---- DrawPrimitives: Vector2 API ----
 
-        /// <summary>
-        ///     Draws arbitrary geometry primitives with a flat color.
-        /// </summary>
-        /// <param name="primitiveTopology">The topology of the primitives to draw.</param>
-        /// <param name="vertices">The list of vertices to render.</param>
-        /// <param name="color">The color to draw with.</param>
-        public void DrawPrimitives(DrawPrimitiveTopology primitiveTopology, List<Vector2> vertices,
-            Color color)
-        {
-            var span = CollectionsMarshal.AsSpan(vertices);
-            DrawPrimitives(primitiveTopology, span, color);
-        }
-
         /// <summary>
         ///     Draws arbitrary geometry primitives with a flat color.
         /// </summary>
@@ -114,43 +100,12 @@ namespace Robust.Client.Graphics
             DrawPrimitives(primitiveTopology, White, indices, drawVertices);
         }
 
-        private static void PadVerticesV2(ReadOnlySpan<Vector2> input, Span<DrawVertexUV2DColor> output, Color color)
+        private void PadVerticesV2(ReadOnlySpan<Vector2> input, Span<DrawVertexUV2DColor> output, Color color)
         {
-            if (input.Length == 0)
-                return;
-
-            if (input.Length != output.Length)
+            Color colorLinear = Color.FromSrgb(color);
+            for (var i = 0; i < output.Length; i++)
             {
-                throw new InvalidOperationException("Invalid lengths!");
-            }
-
-            var colorLinear = Color.FromSrgb(color);
-            var colorVec = Unsafe.As<Color, Vector128<float>>(ref colorLinear);
-            var uvVec = Vector128.Create(0, 0, 0.5f, 0.5f);
-            var maskVec = Vector128.Create(0xFFFFFFFF, 0xFFFFFFFF, 0, 0).AsSingle();
-
-            var simdVectors = (nuint)(input.Length / 2);
-            ref readonly var srcBase = ref Unsafe.As<Vector2, float>(ref Unsafe.AsRef(in input[0]));
-            ref var dstBase = ref Unsafe.As<DrawVertexUV2DColor, float>(ref output[0]);
-
-            for (nuint i = 0; i < simdVectors; i++)
-            {
-                var positions = Vector128.LoadUnsafe(in srcBase, i * 4);
-
-                var posColorLower = (positions & maskVec) | uvVec;
-                var posColorUpper = (Vector128.Shuffle(positions, Vector128.Create(2, 3, 0, 0)) & maskVec) | uvVec;
-
-                posColorLower.StoreUnsafe(ref dstBase, i * 16);
-                colorVec.StoreUnsafe(ref dstBase, i * 16 + 4);
-                posColorUpper.StoreUnsafe(ref dstBase, i * 16 + 8);
-                colorVec.StoreUnsafe(ref dstBase, i * 16 + 12);
-            }
-
-            var lastPos = (int)simdVectors * 2;
-            if (lastPos != output.Length)
-            {
-                // Odd number of vertices. Handle the last manually.
-                output[lastPos] = new DrawVertexUV2DColor(input[lastPos], new Vector2(0.5f, 0.5f), colorLinear);
+                output[i] = new DrawVertexUV2DColor(input[i], new Vector2(0.5f, 0.5f), colorLinear);
             }
         }
 

Robust.Client/Graphics/Drawing/DrawingHandleScreen.cs

@@ -2,7 +2,6 @@ using System;
 using System.Numerics;
 using System.Text;
 using Robust.Client.GameObjects;
-using Robust.Shared.Collections;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Graphics;
 using Robust.Shared.Maths;
@@ -15,79 +14,6 @@ namespace Robust.Client.Graphics
         {
         }
 
-        /// <summary>
-        /// Simialr to DrawLine but has dashes interspersed.
-        /// </summary>
-        /// <param name="offset">Offset from the start of the line.</param>
-        /// <param name="dashSize">How long a dash is.</param>
-        /// <param name="gapSize">How long the gap between dashes is.</param>
-        public void DrawDottedLine(Vector2 from, Vector2 to, Color color, float offset = 0f, float dashSize = 8f, float gapSize = 2f)
-        {
-            var lineVector = to - from;
-
-            // No drawing for you.
-            if (lineVector.LengthSquared() < 10f * float.Epsilon)
-                return;
-
-            var lineAndGap = gapSize + dashSize;
-            var lines = new ValueList<Vector2>();
-
-            // Minimum distance.
-            if (lineVector.Length() < lineAndGap)
-            {
-                lines.Add(from);
-                lines.Add(to);
-            }
-            else
-            {
-                var maxLength = lineVector.Length();
-                var normalizedLine = lineVector.Normalized();
-                var dashVector = normalizedLine * dashSize;
-                var gapVector = normalizedLine * gapSize;
-
-                var position = from;
-                offset %= (dashSize + gapSize);
-                var length = offset;
-                var dashLength = dashSize;
-
-                // If offset is less than gap size then start with a gap
-                // otherwise start with a partial line
-                if (offset > 0f)
-                {
-                    if (offset < gapSize)
-                    {
-                        position += normalizedLine * offset;
-                        length += offset;
-                    }
-                    else
-                    {
-                        dashLength = (offset - gapSize);
-                    }
-                }
-
-                while (length < maxLength)
-                {
-                    lines.Add(position);
-
-                    position += normalizedLine * dashLength;
-                    var lengthFromStart = (position - from).Length();
-
-                    // if over length then cap the thing.
-                    if (lengthFromStart > maxLength)
-                    {
-                        position = to;
-                    }
-
-                    lines.Add(position);
-                    dashLength = dashVector.Length();
-                    position += gapVector;
-                    length = (position - from).Length();
-                }
-            }
-
-            DrawPrimitives(DrawPrimitiveTopology.LineList, lines.Span, color);
-        }
-
         public abstract void DrawRect(UIBox2 rect, Color color, bool filled = true);
 
         public abstract void DrawTextureRectRegion(Texture texture, UIBox2 rect, UIBox2? subRegion = null, Color? modulate = null);

Robust.Client/Graphics/IRenderHandle.cs

@@ -6,10 +6,7 @@ using Robust.Shared.Maths;
 
 namespace Robust.Client.Graphics
 {
-    /// <remarks>
-    ///     Unstable API. Likely to break hard during renderer rewrite if you rely on it.
-    /// </remarks>
-    public interface IRenderHandle
+    internal interface IRenderHandle
     {
         DrawingHandleScreen DrawingHandleScreen { get; }
         DrawingHandleWorld DrawingHandleWorld { get; }

Robust.Client/Graphics/Shaders/ShaderPrototype.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Numerics;
 using Robust.Client.ResourceManagement;
@@ -69,7 +69,7 @@ namespace Robust.Client.Graphics
                     ShaderBlendMode? blend = null;
                     if (_rawBlendMode != null)
                     {
-                        if (!Enum.TryParse<ShaderBlendMode>(_rawBlendMode, true, out var parsed))
+                        if (!Enum.TryParse<ShaderBlendMode>(_rawBlendMode.ToUpper(), out var parsed))
                             Logger.Error($"invalid mode: {_rawBlendMode}");
                         else
                             blend = parsed;

Robust.Client/Input/IInputManager.cs

@@ -40,7 +40,7 @@ namespace Robust.Client.Input
         void KeyDown(KeyEventArgs e);
         void KeyUp(KeyEventArgs e);
 
-        IKeyBinding RegisterBinding(in KeyBindingRegistration reg, bool markModified=true, bool invalid=false);
+        IKeyBinding RegisterBinding(in KeyBindingRegistration reg, bool markModified=true);
 
         void RemoveBinding(IKeyBinding binding, bool markModified=true);
 

Robust.Client/Input/InputManager.cs

@@ -126,7 +126,7 @@ namespace Robust.Client.Input
             {
                 try
                 {
-                    LoadKeyFile(path, false, true);
+                    LoadKeyFile(path, true);
                 }
                 catch (Exception e)
                 {
@@ -136,7 +136,7 @@ namespace Robust.Client.Input
 
             if (_resourceMan.ContentFileExists(path))
             {
-                LoadKeyFile(path, true);
+                LoadKeyFile(path, false);
             }
         }
 
@@ -496,13 +496,7 @@ namespace Robust.Client.Input
             return true;
         }
 
-        /// <summary>
-        /// Loads a keybind file, configuring keybinds.
-        /// </summary>
-        /// <param name="file">File to load from the content package</param>
-        /// <param name="defaultRegistration">Whether or not this is a "default" keybind set. If it is, then it won't override the current configuration, only the defaults.</param>
-        /// <param name="userData">Whether or not to load from the user data directory instead of the content package.</param>
-        public void LoadKeyFile(ResPath file, bool defaultRegistration, bool userData = false)
+        private void LoadKeyFile(ResPath file, bool userData)
         {
             TextReader reader;
             if (userData)
@@ -523,19 +517,16 @@ namespace Robust.Client.Input
             {
                 var baseKeyRegs = _serialization.Read<KeyBindingRegistration[]>(BaseKeyRegsNode, notNullableOverride: true);
 
-
                 foreach (var reg in baseKeyRegs)
                 {
-                    var invalid = false;
-
                     if (reg.Type != KeyBindingType.Command && !NetworkBindMap.FunctionExists(reg.Function.FunctionName))
                     {
-                        Logger.DebugS("input", "Key function in {0} does not exist: '{1}'.", file,
+                        Logger.ErrorS("input", "Key function in {0} does not exist: '{1}'", file,
                             reg.Function);
-                        invalid = true;
+                        continue;
                     }
 
-                    if (defaultRegistration)
+                    if (!userData)
                     {
                         _defaultRegistrations.Add(reg);
 
@@ -547,24 +538,19 @@ namespace Robust.Client.Input
                         }
                     }
 
-                    RegisterBinding(reg, markModified: !defaultRegistration, invalid);
+                    RegisterBinding(reg, markModified: userData);
                 }
             }
 
-            if (!defaultRegistration && mapping.TryGet("leaveEmpty", out var node))
+            if (userData && mapping.TryGet("leaveEmpty", out var node))
             {
                 var leaveEmpty = _serialization.Read<BoundKeyFunction[]>(node, notNullableOverride: true);
 
-                foreach (var bind in leaveEmpty)
+                if (leaveEmpty.Length > 0)
                 {
                     // Adding to _modifiedKeyFunctions means that these keybinds won't be loaded from the base file.
                     // Because they've been explicitly cleared.
-                    _modifiedKeyFunctions.Add(bind);
-
-                    // Adding to bindingsByFunction because if the keybind is not valid(For example if it's from another
-                    // server then we will have problems saving the file)
-                    _bindingsByFunction.GetOrNew(bind);
-
+                    _modifiedKeyFunctions.UnionWith(leaveEmpty);
                 }
             }
         }
@@ -592,7 +578,7 @@ namespace Robust.Client.Input
             return binding;
         }
 
-        public IKeyBinding RegisterBinding(in KeyBindingRegistration reg, bool markModified = true, bool invalid = false)
+        public IKeyBinding RegisterBinding(in KeyBindingRegistration reg, bool markModified = true)
         {
             var binding = new KeyBinding(this, reg.Function.FunctionName, reg.Type, reg.BaseKey, reg.CanFocus, reg.CanRepeat,
                 reg.AllowSubCombs, reg.Priority, reg.Mod1, reg.Mod2, reg.Mod3);
@@ -623,7 +609,7 @@ namespace Robust.Client.Input
 
         public void InputModeChanged() => OnInputModeChanged?.Invoke();
 
-        private void RegisterBinding(KeyBinding binding, bool markModified = true, bool invalid = false)
+        private void RegisterBinding(KeyBinding binding, bool markModified = true)
         {
             // we sort larger combos first so they take priority over smaller (single key) combos,
             // so they get processed first in KeyDown and such.
@@ -638,8 +624,7 @@ namespace Robust.Client.Input
                 _modifiedKeyFunctions.Add(binding.Function);
             }
 
-            if (!invalid)
-                _bindings.Insert(pos, binding);
+            _bindings.Insert(pos, binding);
             _bindingsByFunction.GetOrNew(binding.Function).Add(binding);
             OnKeyBindingAdded?.Invoke(binding);
         }

Robust.Client/Map/TileEdgeOverlay.cs

@@ -37,9 +37,7 @@ public sealed class TileEdgeOverlay : GridOverlay
         var tileDimensions = new Vector2(tileSize, tileSize);
         var (_, _, worldMatrix, invMatrix) = xformSystem.GetWorldPositionRotationMatrixWithInv(Grid.Owner);
         args.WorldHandle.SetTransform(worldMatrix);
-        var bounds = args.WorldBounds;
-        bounds = new Box2Rotated(bounds.Box.Enlarged(1), bounds.Rotation, bounds.Origin);
-        var localAABB = invMatrix.TransformBox(bounds);
+        var localAABB = invMatrix.TransformBox(args.WorldBounds);
 
         var enumerator = mapSystem.GetLocalTilesEnumerator(Grid.Owner, Grid, localAABB, false);
 

Robust.Client/Placement/Modes/AlignSimilar.cs

@@ -34,7 +34,7 @@ namespace Robust.Client.Placement.Modes
 
             var snapToEntities = EntitySystem.Get<EntityLookupSystem>().GetEntitiesInRange(MouseCoords, SnapToRange)
                 .Where(entity => pManager.EntityManager.GetComponent<MetaDataComponent>(entity).EntityPrototype == pManager.CurrentPrototype && pManager.EntityManager.GetComponent<TransformComponent>(entity).MapID == mapId)
-                .OrderBy(entity => (pManager.EntityManager.GetComponent<TransformComponent>(entity).WorldPosition - MouseCoords.ToMapPos(pManager.EntityManager, pManager.EntityManager.System<SharedTransformSystem>())).LengthSquared())
+                .OrderBy(entity => (pManager.EntityManager.GetComponent<TransformComponent>(entity).WorldPosition - MouseCoords.ToMapPos(pManager.EntityManager)).LengthSquared())
                 .ToList();
 
             if (snapToEntities.Count == 0)

Robust.Client/Placement/Modes/AlignSnapgridBorder.cs

@@ -2,7 +2,6 @@ using System;
 using System.Numerics;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
 using Robust.Shared.Maths;
 
 namespace Robust.Client.Placement.Modes
@@ -25,7 +24,7 @@ namespace Robust.Client.Placement.Modes
             SnapSize = 1f;
             if (gridIdOpt is EntityUid gridId && gridId.IsValid())
             {
-                Grid = pManager.EntityManager.GetComponent<MapGridComponent>(gridId);
+                Grid = pManager.MapManager.GetGrid(gridId);
                 SnapSize = Grid.TileSize; //Find snap size for the grid.
             }
             else

Robust.Client/Placement/Modes/AlignSnapgridCenter.cs

@@ -56,7 +56,7 @@ namespace Robust.Client.Placement.Modes
             SnapSize = 1f;
             if (gridIdOpt is EntityUid gridId && gridId.IsValid())
             {
-                Grid = pManager.EntityManager.GetComponent<MapGridComponent>(gridId);
+                Grid = pManager.MapManager.GetGrid(gridId);
                 SnapSize = Grid.TileSize; //Find snap size for the grid.
             }
             else

Robust.Client/Placement/Modes/AlignTileAny.cs

@@ -1,6 +1,5 @@
 using System.Numerics;
 using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
 
 namespace Robust.Client.Placement.Modes
 {
@@ -20,7 +19,7 @@ namespace Robust.Client.Placement.Modes
 
             var gridId = MouseCoords.GetGridUid(pManager.EntityManager);
 
-            if (!pManager.EntityManager.TryGetComponent<MapGridComponent>(gridId, out var mapGrid))
+            if (!pManager.MapManager.TryGetGrid(gridId, out var mapGrid))
                 return;
 
             CurrentTile = mapGrid.GetTileRef(MouseCoords);

Robust.Client/Placement/Modes/AlignTileDense.cs

@@ -1,7 +1,6 @@
 using System.Numerics;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
 
 namespace Robust.Client.Placement.Modes
 {
@@ -21,7 +20,7 @@ namespace Robust.Client.Placement.Modes
 
             if (gridIdOpt is EntityUid gridId && gridId.IsValid())
             {
-                var mapGrid = pManager.EntityManager.GetComponent<MapGridComponent>(gridId);
+                var mapGrid = pManager.MapManager.GetGrid(gridId);
                 tileSize = mapGrid.TileSize; //convert from ushort to float
             }
 

Robust.Client/Placement/Modes/AlignTileEmpty.cs

@@ -2,7 +2,6 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
 using Robust.Shared.Maths;
 
 namespace Robust.Client.Placement.Modes
@@ -23,7 +22,7 @@ namespace Robust.Client.Placement.Modes
 
             if (gridIdOpt is EntityUid gridId && gridId.IsValid())
             {
-                var mapGrid = pManager.EntityManager.GetComponent<MapGridComponent>(gridId);
+                var mapGrid = pManager.MapManager.GetGrid(gridId);
                 CurrentTile = mapGrid.GetTileRef(MouseCoords);
                 tileSize = mapGrid.TileSize; //convert from ushort to float
             }

Robust.Client/Placement/Modes/AlignTileNonDense.cs

@@ -1,7 +1,6 @@
 using System.Numerics;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
 
 namespace Robust.Client.Placement.Modes
 {
@@ -21,7 +20,7 @@ namespace Robust.Client.Placement.Modes
             var gridIdOpt = MouseCoords.GetGridUid(pManager.EntityManager);
             if (gridIdOpt is EntityUid gridId && gridId.IsValid())
             {
-                var mapGrid = pManager.EntityManager.GetComponent<MapGridComponent>(gridId);
+                var mapGrid = pManager.MapManager.GetGrid(gridId);
                 tileSize = mapGrid.TileSize; //convert from ushort to float
             }
 

Robust.Client/Placement/PlacementManager.cs

@@ -21,7 +21,6 @@ using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using Robust.Shared.Log;
 using Direction = Robust.Shared.Maths.Direction;
-using Robust.Shared.Map.Components;
 
 namespace Robust.Client.Placement
 {
@@ -80,10 +79,6 @@ namespace Robust.Client.Placement
             private set
             {
                 _isActive = value;
-
-                if (CurrentPermission?.UseEditorContext is false)
-                    return;
-
                 SwitchEditorContext(value);
             }
         }
@@ -337,7 +332,7 @@ namespace Robust.Client.Placement
 
         private void HandleTileChanged(ref TileChangedEvent args)
         {
-            var coords = EntityManager.GetComponent<MapGridComponent>(args.NewTile.GridUid).GridTileToLocal(args.NewTile.GridIndices);
+            var coords = MapManager.GetGrid(args.NewTile.GridUid).GridTileToLocal(args.NewTile.GridIndices);
             _pendingTileChanges.RemoveAll(c => c.Item1 == coords);
         }
 
@@ -500,7 +495,7 @@ namespace Robust.Client.Placement
         {
             // Try to get current map.
             var map = MapId.Nullspace;
-            if (EntityManager.TryGetComponent(PlayerManager.LocalEntity, out TransformComponent? xform))
+            if (EntityManager.TryGetComponent(PlayerManager.LocalPlayer?.ControlledEntity, out TransformComponent? xform))
             {
                 map = xform.MapID;
             }
@@ -517,7 +512,7 @@ namespace Robust.Client.Placement
 
         private bool CurrentEraserMouseCoordinates(out EntityCoordinates coordinates)
         {
-            var ent = PlayerManager.LocalEntity ?? EntityUid.Invalid;
+            var ent = PlayerManager.LocalPlayer?.ControlledEntity ?? EntityUid.Invalid;
             if (ent == EntityUid.Invalid)
             {
                 coordinates = new EntityCoordinates();
@@ -645,7 +640,7 @@ namespace Robust.Client.Placement
 
             if (CurrentPermission is not {Range: > 0} ||
                 !CurrentMode.RangeRequired ||
-                PlayerManager.LocalEntity is not {Valid: true} controlled)
+                PlayerManager.LocalPlayer?.ControlledEntity is not {Valid: true} controlled)
                 return;
 
             var worldPos = EntityManager.GetComponent<TransformComponent>(controlled).WorldPosition;
@@ -758,7 +753,7 @@ namespace Robust.Client.Placement
                 // If we have actually placed something on a valid grid...
                 if (gridIdOpt is EntityUid gridId && gridId.IsValid())
                 {
-                    var grid = EntityManager.GetComponent<MapGridComponent>(gridId);
+                    var grid = MapManager.GetGrid(gridId);
 
                     // no point changing the tile to the same thing.
                     if (grid.GetTileRef(coordinates).Tile.TypeId == CurrentPermission.TileType)

Robust.Client/Placement/PlacementMode.cs

@@ -11,7 +11,6 @@ using Robust.Shared.Graphics;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Utility;
@@ -116,12 +115,11 @@ namespace Robust.Client.Placement
 
             var dirAng = pManager.Direction.ToAngle();
             var spriteSys = pManager.EntityManager.System<SpriteSystem>();
-            var transformSys = pManager.EntityManager.System<SharedTransformSystem>();
             foreach (var coordinate in locationcollection)
             {
                 if (!coordinate.IsValid(pManager.EntityManager))
                     return; // Just some paranoia just in case
-                var worldPos = coordinate.ToMapPos(pManager.EntityManager, transformSys);
+                var worldPos = coordinate.ToMapPos(pManager.EntityManager);
                 var worldRot = pManager.EntityManager.GetComponent<TransformComponent>(coordinate.EntityId).WorldRotation + dirAng;
 
                 sprite.Color = IsValidPosition(coordinate) ? ValidPlaceColor : InvalidPlaceColor;
@@ -138,12 +136,11 @@ namespace Robust.Client.Placement
         {
             var mouseScreen = pManager.InputManager.MouseScreenPosition;
             var mousePos = pManager.EyeManager.PixelToMap(mouseScreen);
-            var transformSys = pManager.EntityManager.System<SharedTransformSystem>();
 
             if (mousePos.MapId == MapId.Nullspace)
                 yield break;
 
-            var (_, (x, y)) = EntityCoordinates.FromMap(pManager.StartPoint.EntityId, mousePos, transformSys, pManager.EntityManager) - pManager.StartPoint;
+            var (_, (x, y)) = EntityCoordinates.FromMap(pManager.StartPoint.EntityId, mousePos, pManager.EntityManager) - pManager.StartPoint;
             float iterations;
             Vector2 distance;
             if (Math.Abs(x) > Math.Abs(y))
@@ -170,12 +167,11 @@ namespace Robust.Client.Placement
         {
             var mouseScreen = pManager.InputManager.MouseScreenPosition;
             var mousePos = pManager.EyeManager.PixelToMap(mouseScreen);
-            var transformSys = pManager.EntityManager.System<SharedTransformSystem>();
 
             if (mousePos.MapId == MapId.Nullspace)
                 yield break;
 
-            var placementdiff = EntityCoordinates.FromMap(pManager.StartPoint.EntityId, mousePos, transformSys, pManager.EntityManager) - pManager.StartPoint;
+            var placementdiff = EntityCoordinates.FromMap(pManager.StartPoint.EntityId, mousePos, pManager.EntityManager) - pManager.StartPoint;
 
             var xSign = Math.Sign(placementdiff.X);
             var ySign = Math.Sign(placementdiff.Y);
@@ -197,9 +193,9 @@ namespace Robust.Client.Placement
         public TileRef GetTileRef(EntityCoordinates coordinates)
         {
             var gridUidOpt = coordinates.GetGridUid(pManager.EntityManager);
-            return gridUidOpt is EntityUid gridUid && gridUid.IsValid() ? pManager.EntityManager.GetComponent<MapGridComponent>(gridUid).GetTileRef(MouseCoords)
+            return gridUidOpt is EntityUid gridUid && gridUid.IsValid() ? pManager.MapManager.GetGrid(gridUid).GetTileRef(MouseCoords)
                 : new TileRef(gridUidOpt ?? EntityUid.Invalid,
-                    MouseCoords.ToVector2i(pManager.EntityManager, pManager.MapManager, pManager.EntityManager.System<SharedTransformSystem>()), Tile.Empty);
+                    MouseCoords.ToVector2i(pManager.EntityManager, pManager.MapManager), Tile.Empty);
         }
 
         public TextureResource GetSprite(string key)
@@ -220,15 +216,14 @@ namespace Robust.Client.Placement
         {
             if (!RangeRequired)
                 return true;
-            var controlled = pManager.PlayerManager.LocalEntity ?? EntityUid.Invalid;
+            var controlled = pManager.PlayerManager.LocalPlayer?.ControlledEntity ?? EntityUid.Invalid;
             if (controlled == EntityUid.Invalid)
             {
                 return false;
             }
 
             var range = pManager.CurrentPermission!.Range;
-            var transformSys = pManager.EntityManager.System<SharedTransformSystem>();
-            if (range > 0 && !pManager.EntityManager.GetComponent<TransformComponent>(controlled).Coordinates.InRange(pManager.EntityManager, transformSys, coordinates, range))
+            if (range > 0 && !pManager.EntityManager.GetComponent<TransformComponent>(controlled).Coordinates.InRange(pManager.EntityManager, coordinates, range))
                 return false;
             return true;
         }
@@ -236,8 +231,7 @@ namespace Robust.Client.Placement
         public bool IsColliding(EntityCoordinates coordinates)
         {
             var bounds = pManager.ColliderAABB;
-            var transformSys = pManager.EntityManager.System<SharedTransformSystem>();
-            var mapCoords = coordinates.ToMap(pManager.EntityManager, transformSys);
+            var mapCoords = coordinates.ToMap(pManager.EntityManager);
             var (x, y) = mapCoords.Position;
 
             var collisionBox = Box2.FromDimensions(
@@ -267,8 +261,7 @@ namespace Robust.Client.Placement
                 return EntityCoordinates.FromMap(pManager.MapManager, mapCoords);
             }
 
-            var transformSys = pManager.EntityManager.System<SharedTransformSystem>();
-            return EntityCoordinates.FromMap(gridUid, mapCoords, transformSys, pManager.EntityManager);
+            return EntityCoordinates.FromMap(pManager.EntityManager, gridUid, mapCoords);
         }
     }
 }

Robust.Client/Player/FilterSystem.cs

@@ -10,13 +10,14 @@ namespace Robust.Client.Player
 
         public override Filter FromEntities(Filter filter, params EntityUid[] entities)
         {
-            if (_playerManager.LocalEntity is not {Valid: true} attachedUid)
+            if (_playerManager.LocalPlayer is not { } localPlayer
+                || localPlayer.Session.AttachedEntity is not {Valid: true} attachedUid)
                 return filter;
 
             foreach (var uid in entities)
             {
                 if (uid == attachedUid)
-                    filter.AddPlayer(_playerManager.LocalSession!);
+                    filter.AddPlayer(localPlayer.Session);
             }
 
             return filter;

Robust.Client/Replays/Loading/ReplayLoadManager.Read.cs

@@ -129,7 +129,7 @@ public sealed partial class ReplayLoadManager
         return parsed.FirstOrDefault()?.Root as MappingDataNode;
     }
 
-    private (MappingDataNode YamlData, HashSet<string> CVars, TimeSpan? Duration, TimeSpan StartTime, bool ClientSide)
+    private (MappingDataNode YamlData, HashSet<string> CVars, TimeSpan Duration, TimeSpan StartTime, bool ClientSide)
         LoadMetadata(IReplayFileReader fileReader)
     {
         _sawmill.Info($"Reading replay metadata");
@@ -137,16 +137,23 @@ public sealed partial class ReplayLoadManager
         if (data == null)
             throw new Exception("Failed to load yaml metadata");
 
+        TimeSpan duration;
         var finalData = LoadYamlFinalMetadata(fileReader);
-        TimeSpan? duration = finalData == null
-            ? null
-            : TimeSpan.Parse(((ValueDataNode) finalData[MetaFinalKeyDuration]).Value);
-
         if (finalData == null)
-            _sawmill.Warning("Failed to load final yaml metadata. Partial/incomplete replay?");
+        {
+            var msg = "Failed to load final yaml metadata";
+            if (!_confMan.GetCVar(CVars.ReplayIgnoreErrors))
+                throw new Exception(msg);
 
-        var typeHashString = ((ValueDataNode) data[MetaKeyTypeHash]).Value;
-        var typeHash = Convert.FromHexString(typeHashString);
+            _sawmill.Error(msg);
+            duration = TimeSpan.FromDays(1);
+        }
+        else
+        {
+            duration = TimeSpan.Parse(((ValueDataNode) finalData[MetaFinalKeyDuration]).Value);
+        }
+
+        var typeHash = Convert.FromHexString(((ValueDataNode) data[MetaKeyTypeHash]).Value);
         var stringHash = Convert.FromHexString(((ValueDataNode) data[MetaKeyStringHash]).Value);
         var startTick = ((ValueDataNode) data[MetaKeyStartTick]).Value;
         var timeBaseTick = ((ValueDataNode) data[MetaKeyBaseTick]).Value;
@@ -154,12 +161,7 @@ public sealed partial class ReplayLoadManager
         var clientSide = bool.Parse(((ValueDataNode) data[MetaKeyIsClientRecording]).Value);
 
         if (!typeHash.SequenceEqual(_serializer.GetSerializableTypesHash()))
-        {
-            if (!_confMan.GetCVar(CVars.ReplayIgnoreErrors))
-                throw new Exception($"RobustSerializer hash mismatch. do not match. Client hash: {_serializer.GetSerializableTypesHashString()}, replay hash: {typeHashString}.");
-
-            _sawmill.Warning($"RobustSerializer hash mismatch. Replay may fail to load!");
-        }
+            throw new Exception($"{nameof(IRobustSerializer)} hashes do not match. Loading replays using a bad replay-client version?");
 
         using var stringFile = fileReader.Open(FileStrings);
         var stringData = new byte[stringFile.Length];

Robust.Client/Replays/ReplayRecordingManager.cs

@@ -36,12 +36,12 @@ internal sealed class ReplayRecordingManager : SharedReplayRecordingManager
 
     private void OnRecordingStarted(MappingDataNode metadata, List<object> messages)
     {
-        if (_player.LocalSession == null)
+        if (_player.LocalPlayer == null)
             return;
 
         // Add information about the user doing the recording. This is used to set the default replay observer position
         // when playing back the replay.
-        var guid = _player.LocalUser.ToString();
+        var guid = _player.LocalPlayer.UserId.UserId.ToString();
         metadata[ReplayConstants.MetaKeyRecordedBy] = new ValueDataNode(guid);
     }
 

Robust.Client/Replays/UI/ReplayControlWidget.cs

@@ -90,7 +90,6 @@ public sealed partial class ReplayControlWidget : UIWidget // AKA Tardis - The f
         var maxIndex = Math.Max(1, replay.States.Count - 1);
         var state = replay.States[index];
         var replayTime = TimeSpan.FromSeconds(TickSlider.Value);
-        var end = replay.Duration == null ? "N/A" : replay.Duration.Value.ToString(TimeFormat);
 
         IndexLabel.Text = Loc.GetString("replay-time-box-index-label",
             ("current", index), ("total", maxIndex), ("percentage", percentage));
@@ -99,10 +98,10 @@ public sealed partial class ReplayControlWidget : UIWidget // AKA Tardis - The f
             ("current", state.ToSequence), ("total", replay.States[^1].ToSequence), ("percentage", percentage));
 
         TimeLabel.Text = Loc.GetString("replay-time-box-replay-time-label",
-            ("current", replayTime.ToString(TimeFormat)), ("end", end), ("percentage", percentage));
+            ("current", replayTime.ToString(TimeFormat)), ("end", replay.Duration.ToString(TimeFormat)), ("percentage", percentage));
 
         var serverTime = (replayTime + replay.StartTime).ToString(TimeFormat);
-        string duration = replay.Duration == null ? "N/A" : (replay.Duration + replay.StartTime).Value.ToString(TimeFormat);
+        var duration = (replay.Duration + replay.StartTime).ToString(TimeFormat);
         ServerTimeLabel.Text = Loc.GetString("replay-time-box-server-time-label",
             ("current", serverTime), ("end", duration), ("percentage", percentage));
 

Robust.Client/Robust.Client.csproj

@@ -23,7 +23,7 @@
     <PackageReference Include="Robust.Natives" />
     <PackageReference Include="System.Numerics.Vectors"  />
     <PackageReference Include="TerraFX.Interop.Windows" PrivateAssets="compile" />
-    <PackageReference Condition="'$(RobustToolsBuild)' == 'True'" Include="JetBrains.Profiler.Api" PrivateAssets="compile" />
+    <PackageReference Condition="'$(FullRelease)' != 'True'" Include="JetBrains.Profiler.Api" PrivateAssets="compile" />
     <PackageReference Include="SpaceWizards.Sodium" PrivateAssets="compile" />
     <PackageReference Include="Microsoft.NET.ILLink.Tasks" />
     <PackageReference Include="TerraFX.Interop.Xlib" />

Robust.Client/UserInterface/Control.Animations.cs

@@ -57,7 +57,7 @@ namespace Robust.Client.UserInterface
                 toRemove.Add(key);
             }
 
-            foreach (var key in toRemove.Span)
+            foreach (var key in toRemove)
             {
                 _playingAnimations.Remove(key);
                 AnimationCompleted?.Invoke(key);

Robust.Client/UserInterface/Control.Layout.Styling.cs

@@ -1,132 +0,0 @@
-using System;
-using System.Runtime.CompilerServices;
-
-namespace Robust.Client.UserInterface;
-
-public partial class Control
-{
-    private LayoutStyleProperties _layoutStyleOverride;
-    private LayoutStyleProperties _layoutStyleSheet;
-
-    private void UpdateLayoutStyleProperties()
-    {
-        var propertiesSet = LayoutStyleProperties.None;
-
-        // Assumed most controls will have little or no style properties,
-        // so iterating once is less expensive overall then checking 10+ properties.
-        // C# switch statements are compiled efficiently anyways.
-        foreach (var (key, value) in _styleProperties)
-        {
-            switch (key)
-            {
-                case nameof(SizeFlagsStretchRatio):
-                    UpdateField(ref _sizeFlagsStretchRatio, value, LayoutStyleProperties.StretchRatio);
-                    break;
-                case nameof(MinWidth):
-                    UpdateField(ref _minWidth, value, LayoutStyleProperties.MinWidth);
-                    break;
-                case nameof(MinHeight):
-                    UpdateField(ref _minHeight, value, LayoutStyleProperties.MinHeight);
-                    break;
-                case nameof(SetWidth):
-                    UpdateField(ref _setWidth, value, LayoutStyleProperties.SetWidth);
-                    break;
-                case nameof(SetHeight):
-                    UpdateField(ref _setHeight, value, LayoutStyleProperties.SetHeight);
-                    break;
-                case nameof(MaxWidth):
-                    UpdateField(ref _maxWidth, value, LayoutStyleProperties.MaxWidth);
-                    break;
-                case nameof(MaxHeight):
-                    UpdateField(ref _maxHeight, value, LayoutStyleProperties.MaxHeight);
-                    break;
-                case nameof(HorizontalExpand):
-                    UpdateField(ref _horizontalExpand, value, LayoutStyleProperties.HorizontalExpand);
-                    break;
-                case nameof(VerticalExpand):
-                    UpdateField(ref _verticalExpand, value, LayoutStyleProperties.VerticalExpand);
-                    break;
-                case nameof(HorizontalAlignment):
-                    UpdateField(ref _horizontalAlignment, value, LayoutStyleProperties.HorizontalAlignment);
-                    break;
-                case nameof(VerticalAlignment):
-                    UpdateField(ref _verticalAlignment, value, LayoutStyleProperties.VerticalAlignment);
-                    break;
-                case nameof(Margin):
-                    UpdateField(ref _margin, value, LayoutStyleProperties.Margin);
-                    break;
-            }
-        }
-
-        // Reset cleared properties back to defaults.
-        var toClear = _layoutStyleSheet & ~propertiesSet;
-        if (toClear != 0)
-        {
-            ClearField(ref _sizeFlagsStretchRatio, DefaultStretchRatio, LayoutStyleProperties.StretchRatio);
-            ClearField(ref _minWidth, 0, LayoutStyleProperties.MinWidth);
-            ClearField(ref _minHeight, 0, LayoutStyleProperties.MinHeight);
-            ClearField(ref _setWidth, DefaultSetSize, LayoutStyleProperties.SetWidth);
-            ClearField(ref _setHeight, DefaultSetSize, LayoutStyleProperties.SetHeight);
-            ClearField(ref _maxWidth, DefaultMaxSize, LayoutStyleProperties.MaxWidth);
-            ClearField(ref _maxHeight, DefaultMaxSize, LayoutStyleProperties.MaxHeight);
-            ClearField(ref _horizontalExpand, false, LayoutStyleProperties.HorizontalExpand);
-            ClearField(ref _verticalExpand, false, LayoutStyleProperties.VerticalExpand);
-            ClearField(ref _horizontalAlignment, DefaultHAlignment, LayoutStyleProperties.HorizontalAlignment);
-            ClearField(ref _verticalAlignment, DefaultVAlignment, LayoutStyleProperties.VerticalAlignment);
-            ClearField(ref _margin, default, LayoutStyleProperties.Margin);
-        }
-
-        _layoutStyleSheet = propertiesSet;
-
-        return;
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        void UpdateField<T>(ref T field, object value, LayoutStyleProperties flag)
-        {
-            if ((_layoutStyleOverride & flag) != 0)
-                return;
-
-            // TODO: Probably need better error handling...
-            if (value is not T valueCast)
-                return;
-
-            field = valueCast;
-            propertiesSet |= flag;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        void ClearField<T>(ref T field, T defaultValue, LayoutStyleProperties flag)
-        {
-            if ((toClear & flag) == 0)
-                return;
-
-            field = defaultValue;
-        }
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private void SetLayoutStyleProp(LayoutStyleProperties flag)
-    {
-        _layoutStyleOverride |= flag;
-    }
-
-    [Flags]
-    private enum LayoutStyleProperties : short
-    {
-        // @formatter:off
-        None                = 0,
-        Margin              = 1 << 0,
-        MinWidth            = 1 << 1,
-        MinHeight           = 1 << 2,
-        SetWidth            = 1 << 3,
-        SetHeight           = 1 << 4,
-        MaxWidth            = 1 << 5,
-        MaxHeight           = 1 << 6,
-        StretchRatio        = 1 << 7,
-        HorizontalExpand    = 1 << 8,
-        VerticalExpand      = 1 << 9,
-        HorizontalAlignment = 1 << 10,
-        VerticalAlignment   = 1 << 11,
-        // @formatter:on
-    }
-}

Robust.Client/UserInterface/Control.Layout.cs

@@ -12,30 +12,24 @@ namespace Robust.Client.UserInterface
 
     public partial class Control
     {
-        private const float DefaultStretchRatio = 1;
-        private const float DefaultSetSize = float.NaN;
-        private const float DefaultMaxSize = float.PositiveInfinity;
-        private const HAlignment DefaultHAlignment = HAlignment.Stretch;
-        private const VAlignment DefaultVAlignment = VAlignment.Stretch;
-
         private Vector2 _size;
 
         [ViewVariables] internal Vector2? PreviousMeasure;
         [ViewVariables] internal UIBox2? PreviousArrange;
 
-        private float _sizeFlagsStretchRatio = DefaultStretchRatio;
+        private float _sizeFlagsStretchRatio = 1;
 
         private float _minWidth;
         private float _minHeight;
-        private float _setWidth = DefaultSetSize;
-        private float _setHeight = DefaultSetSize;
-        private float _maxWidth = DefaultMaxSize;
-        private float _maxHeight = DefaultMaxSize;
+        private float _setWidth = float.NaN;
+        private float _setHeight = float.NaN;
+        private float _maxWidth = float.PositiveInfinity;
+        private float _maxHeight = float.PositiveInfinity;
 
         private bool _horizontalExpand;
         private bool _verticalExpand;
-        private HAlignment _horizontalAlignment = DefaultHAlignment;
-        private VAlignment _verticalAlignment = DefaultVAlignment;
+        private HAlignment _horizontalAlignment = HAlignment.Stretch;
+        private VAlignment _verticalAlignment = VAlignment.Stretch;
         private Thickness _margin;
         private bool _measuring;
         private bool _arranging;
@@ -59,7 +53,6 @@ namespace Robust.Client.UserInterface
             set
             {
                 _margin = value;
-                SetLayoutStyleProp(LayoutStyleProperties.Margin);
                 InvalidateMeasure();
             }
         }
@@ -233,10 +226,6 @@ namespace Robust.Client.UserInterface
         /// <seealso cref="Rect"/>
         public UIBox2i PixelRect => UIBox2i.FromDimensions(PixelPosition, PixelSize);
 
-        public UIBox2 GlobalRect => UIBox2.FromDimensions(GlobalPosition, _size);
-
-        public UIBox2i GlobalPixelRect => UIBox2i.FromDimensions(GlobalPixelPosition, PixelSize);
-
         /// <summary>
         /// Horizontal alignment mode.
         /// This determines how the control should be laid out horizontally
@@ -249,7 +238,6 @@ namespace Robust.Client.UserInterface
             set
             {
                 _horizontalAlignment = value;
-                SetLayoutStyleProp(LayoutStyleProperties.HorizontalAlignment);
                 InvalidateArrange();
             }
         }
@@ -266,7 +254,6 @@ namespace Robust.Client.UserInterface
             set
             {
                 _verticalAlignment = value;
-                SetLayoutStyleProp(LayoutStyleProperties.VerticalAlignment);
                 InvalidateArrange();
             }
         }
@@ -285,7 +272,6 @@ namespace Robust.Client.UserInterface
             set
             {
                 _horizontalExpand = value;
-                SetLayoutStyleProp(LayoutStyleProperties.HorizontalExpand);
                 Parent?.InvalidateMeasure();
             }
         }
@@ -304,7 +290,6 @@ namespace Robust.Client.UserInterface
             set
             {
                 _verticalExpand = value;
-                SetLayoutStyleProp(LayoutStyleProperties.VerticalExpand);
                 Parent?.InvalidateArrange();
             }
         }
@@ -329,7 +314,6 @@ namespace Robust.Client.UserInterface
 
                 _sizeFlagsStretchRatio = value;
 
-                SetLayoutStyleProp(LayoutStyleProperties.StretchRatio);
                 Parent?.InvalidateArrange();
             }
         }
@@ -406,7 +390,6 @@ namespace Robust.Client.UserInterface
             set
             {
                 _minWidth = value;
-                SetLayoutStyleProp(LayoutStyleProperties.MinWidth);
                 InvalidateMeasure();
             }
         }
@@ -421,7 +404,6 @@ namespace Robust.Client.UserInterface
             set
             {
                 _minHeight = value;
-                SetLayoutStyleProp(LayoutStyleProperties.MinHeight);
                 InvalidateMeasure();
             }
         }
@@ -436,7 +418,6 @@ namespace Robust.Client.UserInterface
             set
             {
                 _setWidth = value;
-                SetLayoutStyleProp(LayoutStyleProperties.SetWidth);
                 InvalidateMeasure();
             }
         }
@@ -451,7 +432,6 @@ namespace Robust.Client.UserInterface
             set
             {
                 _setHeight = value;
-                SetLayoutStyleProp(LayoutStyleProperties.SetHeight);
                 InvalidateMeasure();
             }
         }
@@ -466,7 +446,6 @@ namespace Robust.Client.UserInterface
             set
             {
                 _maxWidth = value;
-                SetLayoutStyleProp(LayoutStyleProperties.MaxWidth);
                 InvalidateMeasure();
             }
         }
@@ -481,19 +460,10 @@ namespace Robust.Client.UserInterface
             set
             {
                 _maxHeight = value;
-                SetLayoutStyleProp(LayoutStyleProperties.MaxHeight);
                 InvalidateMeasure();
             }
         }
 
-        /// <summary>
-        /// Gets the screen coordinates position relative to the control.
-        /// </summary>
-        public Vector2 GetLocalPosition(ScreenCoordinates coordinates)
-        {
-            return coordinates.Position - GlobalPixelPosition;
-        }
-
         /// <summary>
         /// Notify the layout system that this control's <see cref="Measure"/> result may have changed
         /// and must be recalculated.

Robust.Client/UserInterface/Control.Styling.cs

@@ -239,7 +239,6 @@ namespace Robust.Client.UserInterface
 
         protected virtual void StylePropertiesChanged()
         {
-            UpdateLayoutStyleProperties();
             InvalidateMeasure();
         }
 

Robust.Client/UserInterface/Control.cs

@@ -545,36 +545,6 @@ namespace Robust.Client.UserInterface
             Draw(renderHandle.DrawingHandleScreen);
         }
 
-        protected internal virtual void PreRenderChildren(ref ControlRenderArguments args)
-        {
-
-        }
-
-        protected internal virtual void PostRenderChildren(ref ControlRenderArguments args)
-        {
-
-        }
-
-        protected internal virtual void RenderChildOverride(ref ControlRenderArguments args, int childIndex, Vector2i position)
-        {
-            RenderControl(ref args, childIndex, position);
-        }
-
-        public ref struct ControlRenderArguments
-        {
-            public IRenderHandle Handle;
-            public ref int Total;
-            public Vector2i Position;
-            public Color Modulate;
-            public UIBox2i? ScissorBox;
-            public ref Matrix3 CoordinateTransform;
-        }
-
-        protected void RenderControl(ref ControlRenderArguments args, int childIndex, Vector2i position)
-        {
-            UserInterfaceManagerInternal.RenderControl(args.Handle, ref args.Total, GetChild(childIndex), position, args.Modulate, args.ScissorBox, args.CoordinateTransform);
-        }
-
         public void UpdateDraw()
         {
         }
@@ -641,11 +611,7 @@ namespace Robust.Client.UserInterface
 
             foreach (var child in Children.ToArray())
             {
-                // This checks fails in some obscure cases like using the element inspector in the dev window.
-                // Why? Well I could probably spend 15 minutes in a debugger to find out,
-                // but I'd probably still end up with this fix.
-                if (child.Parent == this)
-                    RemoveChild(child);
+                RemoveChild(child);
             }
         }
 

Robust.Client/UserInterface/Controls/BaseButton.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Robust.Client.Audio;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.ContentPack;
@@ -38,10 +37,8 @@ namespace Robust.Client.UserInterface.Controls
             get => _group;
             set
             {
-                if (value?.InternalButtons.Contains(this) ?? false)
-                    return; // No work to do.
                 // Remove from old group.
-                _group?.InternalButtons.Remove(this);
+                _group?.Buttons.Remove(this);
 
                 _group = value;
 
@@ -50,21 +47,11 @@ namespace Robust.Client.UserInterface.Controls
                     return;
                 }
 
-                value.InternalButtons.Add(this);
+                value.Buttons.Add(this);
                 ToggleMode = true;
 
-                if (value.IsNoneSetAllowed)
-                {
-                    // Still UNPRESS if there's another pressed button, but don't PRESS it otherwise.
-                    if (value.Pressed != this)
-                        _pressed = false;
-                }
-                else
-                {
-                    // Set us to pressed if we're the first button. Doesn't go through the setter to avoid setting off our own error check.
-                    _pressed = value.InternalButtons.Count == 1;
-                }
-                DrawModeChanged();
+                // Set us to pressed if we're the first button.
+                Pressed = value.Buttons.Count == 0;
             }
         }
 
@@ -108,7 +95,7 @@ namespace Robust.Client.UserInterface.Controls
                     return;
                 }
 
-                if (!value && Group is { IsNoneSetAllowed: false })
+                if (!value && Group != null)
                 {
                     throw new InvalidOperationException("Cannot directly unset a grouped button. Set another button in the group instead.");
                 }
@@ -339,7 +326,7 @@ namespace Robust.Client.UserInterface.Controls
                 return;
             }
 
-            foreach (var button in _group.InternalButtons)
+            foreach (var button in _group.Buttons)
             {
                 if (button != this && button.Pressed)
                 {
@@ -453,29 +440,6 @@ namespace Robust.Client.UserInterface.Controls
     /// </remarks>
     public sealed class ButtonGroup
     {
-        /// <summary>
-        /// Whether it is legal for this button group to have no selected button.
-        /// </summary>
-        /// <remarks>
-        /// If true, it's legal for no button in the group to be active.
-        /// This is then the initial state of a new group of buttons (no button is automatically selected),
-        /// and it becomes legal to manually clear the active button through code.
-        /// The user cannot manually unselect the active button regardless, only by selecting a difference button.
-        /// </remarks>
-        public bool IsNoneSetAllowed { get; }
-
-        /// <summary>
-        /// Create a new <see cref="ButtonGroup"/>
-        /// </summary>
-        /// <param name="isNoneSetAllowed">The value of <see cref="IsNoneSetAllowed"/> on the new button group.</param>
-        public ButtonGroup(bool isNoneSetAllowed = true)
-        {
-            IsNoneSetAllowed = isNoneSetAllowed;
-        }
-
-        internal readonly List<BaseButton> InternalButtons = new();
-        public IReadOnlyList<BaseButton> Buttons => InternalButtons;
-
-        public BaseButton? Pressed => InternalButtons.FirstOrDefault(x => x.Pressed);
+        internal readonly List<BaseButton> Buttons = new();
     }
 }

Robust.Client/UserInterface/Controls/CheckBox.cs

@@ -29,7 +29,6 @@ namespace Robust.Client.UserInterface.Controls
             TextureRect = new TextureRect
             {
                 StyleClasses = { StyleClassCheckBox },
-                VerticalAlignment = VAlignment.Center,
             };
             hBox.AddChild(TextureRect);
 

Robust.Client/UserInterface/Controls/Collapsible.cs

@@ -29,11 +29,9 @@ namespace Robust.Client.UserInterface.Controls
         }
 
         public Collapsible()
-        {
-            Orientation = LayoutOrientation.Vertical;
-        }
+        {}
 
-        public Collapsible(CollapsibleHeading header, CollapsibleBody body) : this()
+        public Collapsible(CollapsibleHeading header, CollapsibleBody body)
         {
             AddChild(header);
             AddChild(body);
@@ -41,9 +39,12 @@ namespace Robust.Client.UserInterface.Controls
             Initialize();
         }
 
-        public Collapsible(string title, CollapsibleBody body) : this(new CollapsibleHeading(title), body)
+        public Collapsible(string title, CollapsibleBody body)
         {
+            AddChild(new CollapsibleHeading(title));
+            AddChild(body);
 
+            Initialize();
         }
 
         protected internal override void Draw(DrawingHandleScreen handle)
@@ -104,15 +105,11 @@ namespace Robust.Client.UserInterface.Controls
             set => _chevron.Margin = value;
         }
 
-        /// <summary>
-        /// Exposes the label for this heading.
-        /// </summary>
-        public Label Label { get; }
-
+        private Label _title = new();
         public string? Title
         {
-            get => Label.Text;
-            set => Label.Text = value;
+            get => _title.Text;
+            set => _title.Text = value;
         }
 
         public CollapsibleHeading()
@@ -121,8 +118,8 @@ namespace Robust.Client.UserInterface.Controls
             var box = new BoxContainer();
             AddChild(box);
             box.AddChild(_chevron);
-            Label = new Label();
-            box.AddChild(Label);
+            _title = new Label();
+            box.AddChild(_title);
         }
 
         public CollapsibleHeading(string title) : this()

Robust.Client/UserInterface/Controls/ItemList.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
@@ -9,9 +9,6 @@ using Robust.Shared.Input;
 using Robust.Shared.Maths;
 using Timer = Robust.Shared.Timing.Timer;
 
-/// <summary>
-/// Represents a scrollable list of items in a user interface.
-/// </summary>
 namespace Robust.Client.UserInterface.Controls
 {
     [Virtual]
@@ -32,10 +29,6 @@ namespace Robust.Client.UserInterface.Controls
         public const string StylePropertySelectedItemBackground = "selected-item-background";
         public const string StylePropertyDisabledItemBackground = "disabled-item-background";
 
-        /// <summary>
-        /// Gets or sets the ItemSeparation of individual list items
-        /// </summary>
-        public int ItemSeparation { get; set; } = 0; // Default value is 0px
         public int Count => _itemList.Count;
         public bool IsReadOnly => false;
 
@@ -75,10 +68,8 @@ namespace Robust.Client.UserInterface.Controls
                 itemHeight += ActualItemBackground.MinimumSize.Y * UIScale;
 
                 _totalContentHeight += (int)Math.Ceiling(itemHeight);
-                _totalContentHeight += ItemSeparation;
             }
-            //Remove unneeded ItemSeparation on last item.
-            _totalContentHeight -= ItemSeparation;
+
             _scrollBar.MaxValue = Math.Max(_scrollBar.Page, _totalContentHeight);
             _updateScrollbarVisibility();
         }
@@ -399,9 +390,6 @@ namespace Robust.Client.UserInterface.Controls
                 }
 
                 offset += itemHeight;
-
-                // Add a ItemSeparation at the bottom of each item.
-                offset += ItemSeparation;
             }
         }
 
@@ -411,7 +399,7 @@ namespace Robust.Client.UserInterface.Controls
 
             var color = ActualFontColor;
             var offsetY = (int) (box.Height - font.GetHeight(UIScale)) / 2;
-            var baseLine = new Vector2i(5, offsetY + font.GetAscent(UIScale)) + box.TopLeft;
+            var baseLine = new Vector2i(0, offsetY + font.GetAscent(UIScale)) + box.TopLeft;
 
             foreach (var rune in text.EnumerateRunes())
             {

Robust.Client/UserInterface/Controls/LineEdit.cs

@@ -4,8 +4,6 @@ using System.Numerics;
 using System.Text;
 using JetBrains.Annotations;
 using Robust.Client.Graphics;
-using Robust.Shared;
-using Robust.Shared.Configuration;
 using Robust.Shared.Input;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
@@ -22,8 +20,6 @@ namespace Robust.Client.UserInterface.Controls
     public class LineEdit : Control
     {
         [Dependency] private readonly IClyde _clyde = default!;
-        [Dependency] private readonly IConfigurationManager _cfgManager = default!;
-        [Dependency] private readonly IGameTiming _timing = default!;
 
         private const float MouseScrollDelay = 0.001f;
 
@@ -50,9 +46,6 @@ namespace Robust.Client.UserInterface.Controls
         private bool _mouseSelectingText;
         private float _lastMousePosition;
 
-        private TimeSpan? _lastClickTime;
-        private Vector2? _lastClickPosition;
-
         private bool IsPlaceHolderVisible => string.IsNullOrEmpty(_text) && _placeHolder != null;
 
         public event Action<LineEditEventArgs>? OnTextChanged;
@@ -692,26 +685,8 @@ namespace Robust.Client.UserInterface.Controls
                     args.Handle();
                 }
             }
-            // Double-clicking. Clicks delay should be <= 250ms and the distance < 10 pixels.
-            else if (args.Function == EngineKeyFunctions.UIClick && _lastClickPosition != null && _lastClickTime != null
-                     && _timing.RealTime - _lastClickTime <= TimeSpan.FromMilliseconds(_cfgManager.GetCVar(CVars.DoubleClickDelay))
-                     && (_lastClickPosition.Value - args.PointerLocation.Position).IsShorterThan(_cfgManager.GetCVar(CVars.DoubleClickRange)))
-            {
-                _lastClickTime = _timing.RealTime;
-                _lastClickPosition = args.PointerLocation.Position;
-
-                _lastMousePosition = args.RelativePosition.X;
-
-                _selectionStart = TextEditShared.PrevWordPosition(_text, GetIndexAtPos(args.RelativePosition.X));
-                _cursorPosition = TextEditShared.EndWordPosition(_text, GetIndexAtPos(args.RelativePosition.X));
-
-                args.Handle();
-            }
             else
             {
-                _lastClickTime = _timing.RealTime;
-                _lastClickPosition = args.PointerLocation.Position;
-
                 _mouseSelectingText = true;
                 _lastMousePosition = args.RelativePosition.X;
 

Robust.Client/UserInterface/Controls/OptionButton.cs

@@ -12,7 +12,6 @@ namespace Robust.Client.UserInterface.Controls
     public class OptionButton : ContainerButton
     {
         public const string StyleClassOptionButton = "optionButton";
-        public const string StyleClassPopup = "optionButtonPopup";
         public const string StyleClassOptionTriangle = "optionTriangle";
         public readonly ScrollContainer OptionsScroll;
 
@@ -75,8 +74,7 @@ namespace Robust.Client.UserInterface.Controls
 
             _popup = new Popup()
             {
-                Children = { new PanelContainer(), OptionsScroll },
-                StyleClasses = { StyleClassPopup }
+                Children = { OptionsScroll }
             };
             _popup.OnPopupHide += OnPopupHide;
 
@@ -101,11 +99,6 @@ namespace Robust.Client.UserInterface.Controls
             AddItem(label, id);
         }
 
-        public virtual void ButtonOverride(Button button)
-        {
-
-        }
-
         public void AddItem(string label, int? id = null)
         {
             if (id == null)
@@ -139,8 +132,6 @@ namespace Robust.Client.UserInterface.Controls
             {
                 Select(0);
             }
-
-            ButtonOverride(button);
         }
 
         private void TogglePopup(bool show)
@@ -148,8 +139,6 @@ namespace Robust.Client.UserInterface.Controls
             if (show)
             {
                 var globalPos = GlobalPosition;
-                globalPos.Y += Size.Y + 1; // Place it below us, with a safety margin.
-                globalPos.Y -= Margin.SumVertical;
                 OptionsScroll.Measure(Window?.Size ?? Vector2Helpers.Infinity);
                 var (minX, minY) = OptionsScroll.DesiredSize;
                 var box = UIBox2.FromDimensions(globalPos, new Vector2(Math.Max(minX, Width), minY));

Robust.Client/UserInterface/Controls/PanelContainer.cs

@@ -15,13 +15,13 @@ namespace Robust.Client.UserInterface.Controls
         {
             base.Draw(handle);
 
-            var style = GetStyleBox();
+            var style = _getStyleBox();
             style?.Draw(handle, PixelSizeBox, UIScale);
         }
 
         protected override Vector2 MeasureOverride(Vector2 availableSize)
         {
-            var styleSize = GetStyleBox()?.MinimumSize ?? Vector2.Zero;
+            var styleSize = _getStyleBox()?.MinimumSize ?? Vector2.Zero;
             var measureSize = Vector2.Max(availableSize - styleSize, Vector2.Zero);
             var childSize = Vector2.Zero;
             foreach (var child in Children)
@@ -36,7 +36,7 @@ namespace Robust.Client.UserInterface.Controls
         protected override Vector2 ArrangeOverride(Vector2 finalSize)
         {
             var ourSize = UIBox2.FromDimensions(Vector2.Zero, finalSize);
-            var contentBox = GetStyleBox()?.GetContentBox(ourSize, 1) ?? ourSize;
+            var contentBox = _getStyleBox()?.GetContentBox(ourSize, 1) ?? ourSize;
 
             foreach (var child in Children)
             {
@@ -47,7 +47,7 @@ namespace Robust.Client.UserInterface.Controls
         }
 
         [System.Diagnostics.Contracts.Pure]
-        protected StyleBox? GetStyleBox()
+        private StyleBox? _getStyleBox()
         {
             if (PanelOverride != null)
             {

Robust.Client/UserInterface/Controls/Range.cs

@@ -13,7 +13,6 @@ namespace Robust.Client.UserInterface.Controls
         private float _value;
         private float _page;
         private bool _rounded;
-        private int _roundingDecimals = 0;
 
         public event Action<Range>? OnValueChanged;
 
@@ -87,17 +86,6 @@ namespace Robust.Client.UserInterface.Controls
             }
         }
 
-        [ViewVariables]
-        public int RoundingDecimals
-        {
-            get => _roundingDecimals;
-            set
-            {
-                _roundingDecimals = value;
-                _ensureValueClamped();
-            }
-        }
-
         public virtual void SetValueWithoutEvent(float newValue)
         {
             newValue = ClampValue(newValue);
@@ -119,7 +107,7 @@ namespace Robust.Client.UserInterface.Controls
         {
             if (_rounded)
             {
-                value = MathF.Round(value, _roundingDecimals);
+                value = MathF.Round(value);
             }
             return MathHelper.Clamp(value, _minValue, _maxValue-_page);
         }

Robust.Client/UserInterface/Controls/RichTextLabel.cs

@@ -6,7 +6,6 @@ using Robust.Client.UserInterface.RichText;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
-using Robust.Shared.ViewVariables;
 
 namespace Robust.Client.UserInterface.Controls
 {
@@ -17,26 +16,6 @@ namespace Robust.Client.UserInterface.Controls
 
         private FormattedMessage? _message;
         private RichTextEntry _entry;
-        private float _lineHeightScale = 1;
-        private bool _lineHeightOverride;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        public float LineHeightScale
-        {
-            get
-            {
-                if (!_lineHeightOverride && TryGetStyleProperty(nameof(LineHeightScale), out float value))
-                    return value;
-
-                return _lineHeightScale;
-            }
-            set
-            {
-                _lineHeightScale = value;
-                _lineHeightOverride = true;
-                InvalidateMeasure();
-            }
-        }
 
         public RichTextLabel()
         {
@@ -68,7 +47,7 @@ namespace Robust.Client.UserInterface.Controls
             }
 
             var font = _getFont();
-            _entry.Update(font, availableSize.X * UIScale, UIScale, LineHeightScale);
+            _entry.Update(font, availableSize.X * UIScale, UIScale);
 
             return new Vector2(_entry.Width / UIScale, _entry.Height / UIScale);
         }
@@ -82,7 +61,7 @@ namespace Robust.Client.UserInterface.Controls
                 return;
             }
 
-            _entry.Draw(handle, _getFont(), SizeBox, 0, new MarkupDrawingContext(), UIScale, LineHeightScale);
+            _entry.Draw(handle, _getFont(), SizeBox, 0, new MarkupDrawingContext(), UIScale);
         }
 
         [Pure]

Robust.Client/UserInterface/Controls/ScrollContainer.cs

@@ -20,11 +20,6 @@ namespace Robust.Client.UserInterface.Controls
 
         private bool _suppressScrollValueChanged;
 
-        /// <summary>
-        /// If true then if we have a y-axis scroll it will convert it to an x-axis scroll.
-        /// </summary>
-        public bool FallbackDeltaScroll { get; set; } = true;
-
         public int ScrollSpeedX { get; set; } = 50;
         public int ScrollSpeedY { get; set; } = 50;
 
@@ -123,10 +118,10 @@ namespace Robust.Client.UserInterface.Controls
             if (!ReturnMeasure)
                 return Vector2.Zero;
 
-            if (_vScrollEnabled && size.Y >= availableSize.Y)
+            if (_vScrollEnabled)
                 size.X += _vScrollBar.DesiredSize.X;
 
-            if (_hScrollEnabled && size.X >= availableSize.X)
+            if (_hScrollEnabled)
                 size.Y += _hScrollBar.DesiredSize.Y;
 
             return size;
@@ -251,19 +246,9 @@ namespace Robust.Client.UserInterface.Controls
 
             if (_hScrollEnabled)
             {
-                var delta =
-                    args.Delta.X == 0f &&
-                    !_vScrollEnabled &&
-                    FallbackDeltaScroll ?
-                        -args.Delta.Y :
-                        args.Delta.X;
-
-                _hScrollBar.ValueTarget += delta * ScrollSpeedX;
+                _hScrollBar.ValueTarget += args.Delta.X * ScrollSpeedX;
             }
 
-            if (!_vScrollVisible && !_hScrollVisible)
-                return;
-
             args.Handle();
         }
 

Robust.Client/UserInterface/Controls/Slider.cs

@@ -2,7 +2,6 @@
 using System.Numerics;
 using Robust.Client.Graphics;
 using Robust.Shared.Input;
-using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using static Robust.Client.UserInterface.Controls.LayoutContainer;
 
@@ -33,11 +32,6 @@ namespace Robust.Client.UserInterface.Controls
 
         public bool Grabbed => _grabbed;
 
-        /// <summary>
-        /// Whether the slider can be adjusted.
-        /// </summary>
-        public bool Disabled { get; set; }
-
         public StyleBox? ForegroundStyleBoxOverride
         {
             get => _foregroundStyleBoxOverride;
@@ -138,7 +132,7 @@ namespace Robust.Client.UserInterface.Controls
         {
             base.KeyBindDown(args);
 
-            if (args.Function != EngineKeyFunctions.UIClick || Disabled)
+            if (args.Function != EngineKeyFunctions.UIClick)
             {
                 return;
             }
@@ -152,7 +146,7 @@ namespace Robust.Client.UserInterface.Controls
         {
             base.KeyBindUp(args);
 
-            if (args.Function != EngineKeyFunctions.UIClick || !_grabbed) return;
+            if (args.Function != EngineKeyFunctions.UIClick) return;
 
             _grabbed = false;
             OnReleased?.Invoke(this);

Robust.Client/UserInterface/Controls/SpriteView.cs

@@ -16,7 +16,7 @@ namespace Robust.Client.UserInterface.Controls
     {
         private SpriteSystem? _sprite;
         private SharedTransformSystem? _transform;
-        private readonly IEntityManager _entMan;
+        IEntityManager _entMan;
 
         [ViewVariables]
         public SpriteComponent? Sprite => Entity?.Comp1;
@@ -143,8 +143,6 @@ namespace Robust.Client.UserInterface.Controls
             if (netEnt == NetEnt)
                 return;
 
-            // The Entity is getting set later in the ResolveEntity method
-            // because the client may not have received it yet.
             Entity = null;
             NetEnt = netEnt;
         }
@@ -258,19 +256,28 @@ namespace Robust.Client.UserInterface.Controls
             [NotNullWhen(true)] out SpriteComponent? sprite,
             [NotNullWhen(true)] out TransformComponent? xform)
         {
-            if (NetEnt != null && Entity == null && _entMan.TryGetEntity(NetEnt, out var ent))
-                SetEntity(ent);
-
             if (Entity != null)
             {
                 (uid, sprite, xform) = Entity.Value;
-                return !_entMan.Deleted(uid);
+                return true;
             }
 
             sprite = null;
             xform = null;
             uid = default;
-            return false;
+
+            if (NetEnt == null)
+                return false;
+
+            if (!_entMan.TryGetEntity(NetEnt, out var ent))
+                return false;
+
+            SetEntity(ent);
+            if (Entity == null)
+                return false;
+
+            (uid, sprite, xform) = Entity.Value;
+            return true;
         }
     }
 }

Robust.Client/UserInterface/Controls/TextEdit.cs

@@ -576,7 +576,7 @@ public sealed class TextEdit : Control
 
                 var newPos = CursorShiftedLeft();
                 // Explicit newlines work kinda funny with bias, so keep it at top there.
-                var bias = _cursorPosition.Index == TextLength || Rope.Index(TextRope, newPos) == '\n'
+                var bias = Rope.Index(TextRope, newPos) == '\n'
                     ? LineBreakBias.Top
                     : LineBreakBias.Bottom;
 
@@ -940,13 +940,6 @@ public sealed class TextEdit : Control
 
     private CursorPos GetIndexAtHorizontalPos(int line, float horizontalPos)
     {
-        // If the placeholder is visible, this function does not return correct results because it looks at TextRope,
-        // but _lineBreaks is configured for the display rope.
-        // Bail out early in this case, the function is not currently used in any situation in any location
-        // where something else is desired if the placeholder is visible.
-        if (IsPlaceholderVisible)
-            return default;
-
         var contentBox = PixelSizeBox;
         var font = GetFont();
         var uiScale = UIScale;

Robust.Client/UserInterface/Controls/TextureRect.cs

@@ -17,9 +17,6 @@ namespace Robust.Client.UserInterface.Controls
     {
         public const string StylePropertyTexture = "texture";
         public const string StylePropertyShader = "shader";
-        public const string StylePropertyTextureStretch = "texture-stretch";
-        public const string StylePropertyTextureScale = "texture-scale";
-        public const string StylePropertyTextureSizeTarget = "texture-size-target";
 
         private bool _canShrink;
         private Texture? _texture;
@@ -32,18 +29,7 @@ namespace Robust.Client.UserInterface.Controls
         /// </summary>
         public Texture? Texture
         {
-            get
-            {
-                if (_texture is null)
-                {
-                    if (TryGetStyleProperty(StylePropertyTexture, out Texture? texture))
-                    {
-                        return texture;
-                    }
-                }
-
-                return _texture;
-            }
+            get => _texture;
             set
             {
                 var oldSize = _texture?.Size;
@@ -57,7 +43,6 @@ namespace Robust.Client.UserInterface.Controls
         }
 
         private string? _texturePath;
-        private StretchMode _stretch = StretchMode.Keep;
 
         public string TexturePath
         {
@@ -69,45 +54,21 @@ namespace Robust.Client.UserInterface.Controls
 
         }
 
-        protected override void StylePropertiesChanged()
-        {
-            base.StylePropertiesChanged();
-            InvalidateMeasure();
-        }
-
         protected override void OnThemeUpdated()
         {
             if (_texturePath != null) Texture = Theme.ResolveTexture(_texturePath);
             base.OnThemeUpdated();
         }
 
-        public Vector2 TextureSizeTarget
-        {
-            get
-            {
-                if (!TryGetStyleProperty(StylePropertyTextureSizeTarget, out Vector2 target))
-                    target = _textureScale * Texture?.Size ?? Vector2.Zero;
-
-                return target;
-            }
-        }
-
         /// <summary>
         ///     Scales the texture displayed.
         /// </summary>
         /// <remarks>
         ///     This does not apply to the following stretch modes: <see cref="StretchMode.Scale"/>.
-        ///     This additionally does not apply if a size target is set.
         /// </remarks>
         public Vector2 TextureScale
         {
-            get
-            {
-                if (!TryGetStyleProperty(StylePropertyTextureScale, out Vector2 scale))
-                    scale = _textureScale;
-
-                return scale;
-            }
+            get => _textureScale;
             set
             {
                 _textureScale = value;
@@ -135,28 +96,24 @@ namespace Robust.Client.UserInterface.Controls
         /// <summary>
         ///     Controls how the texture should be drawn if the control is larger than the size of the texture.
         /// </summary>
-        public StretchMode Stretch
-        {
-            get
-            {
-                if (!TryGetStyleProperty(StylePropertyTextureStretch, out StretchMode stretch))
-                    stretch = _stretch;
-                return stretch;
-            }
-            set => _stretch = value;
-        }
+        public StretchMode Stretch { get; set; } = StretchMode.Keep;
 
         protected internal override void Draw(DrawingHandleScreen handle)
         {
             base.Draw(handle);
 
-            var texture = Texture;
-
-            if (texture is null)
-                return;
-
+            var texture = _texture;
             ShaderInstance? shader = null;
 
+            if (texture == null)
+            {
+                TryGetStyleProperty(StylePropertyTexture, out texture);
+                if (texture == null)
+                {
+                    return;
+                }
+            }
+
             if (ShaderOverride != null)
             {
                 shader = ShaderOverride;
@@ -210,17 +167,17 @@ namespace Robust.Client.UserInterface.Controls
                 case StretchMode.Tile:
                 // TODO: Implement Tile.
                 case StretchMode.Keep:
-                    return UIBox2.FromDimensions(Vector2.Zero, TextureSizeTarget * UIScale);
+                    return UIBox2.FromDimensions(Vector2.Zero, texture.Size * _textureScale * UIScale);
                 case StretchMode.KeepCentered:
                 {
-                    var position = (Size - TextureSizeTarget) / 2;
-                    return UIBox2.FromDimensions(position, TextureSizeTarget * UIScale);
+                    var position = (PixelSize - texture.Size * _textureScale * UIScale) / 2;
+                    return UIBox2.FromDimensions(position, texture.Size * _textureScale * UIScale);
                 }
 
                 case StretchMode.KeepAspect:
                 case StretchMode.KeepAspectCentered:
                 {
-                    var (texWidth, texHeight) = TextureSizeTarget;
+                    var (texWidth, texHeight) = texture.Size * _textureScale;
                     var width = texWidth * (PixelSize.Y / texHeight);
                     var height = (float)PixelSize.Y;
                     if (width > PixelSize.X)
@@ -240,7 +197,7 @@ namespace Robust.Client.UserInterface.Controls
                 }
 
                 case StretchMode.KeepAspectCovered:
-                    var texSize = TextureSizeTarget;
+                    var texSize = texture.Size * _textureScale;
                     // Calculate the scale necessary to fit width and height to control size.
                     var (scaleX, scaleY) = PixelSize / texSize;
                     // Use whichever scale is greater.
@@ -302,10 +259,19 @@ namespace Robust.Client.UserInterface.Controls
 
         protected override Vector2 MeasureOverride(Vector2 availableSize)
         {
-            if (CanShrink || Texture == null)
-                return Vector2.Zero;
+            var texture = _texture;
 
-            return TextureSizeTarget;
+            if (texture == null)
+            {
+                TryGetStyleProperty(StylePropertyTexture, out texture);
+            }
+
+            if (texture == null || CanShrink)
+            {
+                return Vector2.Zero;
+            }
+
+            return texture.Size * TextureScale;
         }
     }
 }

Robust.Client/UserInterface/Controls/VerticalTabContainer.xaml

@@ -1,34 +0,0 @@
-<!-- Organised with tabs in a vertical list to the left and the contents to the right -->
-<BoxContainer Name="Container" xmlns="https://spacestation14.io"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:graphics="clr-namespace:Robust.Client.Graphics"
-              Orientation="Horizontal"
-              MouseFilter="Pass">
-    <ScrollContainer VerticalExpand="True"
-                     HScrollEnabled="False"
-                     ReturnMeasure="True"
-                     Margin="5 5 0 5">
-        <PanelContainer Margin="5" VerticalExpand="False"
-                        VerticalAlignment="Top">
-            <PanelContainer.PanelOverride>
-                <graphics:StyleBoxFlat BackgroundColor="#1B1B1E" />
-            </PanelContainer.PanelOverride>
-            <BoxContainer Name="TabContainer" Margin="5" Orientation="Vertical"/>
-        </PanelContainer>
-        </ScrollContainer>
-    <ScrollContainer VerticalExpand="True"
-                     HScrollEnabled="False"
-                     HorizontalAlignment="Stretch"
-                     HorizontalExpand="True"
-                     ReturnMeasure="True"
-                     Margin="0 5 5 5">
-        <PanelContainer Margin="5" HorizontalExpand="True" HorizontalAlignment="Stretch">
-            <PanelContainer.PanelOverride>
-                <graphics:StyleBoxFlat BackgroundColor="#1B1B1E" />
-            </PanelContainer.PanelOverride>
-            <BoxContainer Margin="5"
-                          Orientation="Vertical"
-                          Name="ContentsContainer"/>
-        </PanelContainer>
-    </ScrollContainer>
-</BoxContainer>

Robust.Client/UserInterface/Controls/VerticalTabContainer.xaml.cs

@@ -1,97 +0,0 @@
-using System.Collections.Generic;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Maths;
-
-namespace Robust.Client.UserInterface.Controls;
-
-[GenerateTypedNameReferences]
-public sealed partial class VerticalTabContainer : BoxContainer
-{
-    private readonly Dictionary<Control, BaseButton> _tabs = new();
-
-    // Just used to order controls in case one gets removed.
-    private readonly List<Control> _controls = new();
-
-    private readonly ButtonGroup _tabGroup = new(false);
-
-    private Control? _currentControl;
-
-    public VerticalTabContainer()
-    {
-        RobustXamlLoader.Load(this);
-    }
-
-    public int AddTab(Control control, string title)
-    {
-        var button = new Button()
-        {
-            Text = title,
-            Group = _tabGroup,
-        };
-
-        TabContainer.AddChild(button);
-        ContentsContainer.AddChild(control);
-        var index = ChildCount - 1;
-        button.OnPressed += args =>
-        {
-            SelectTab(control);
-        };
-
-        _controls.Add(control);
-        _tabs.Add(control, button);
-
-        // Existing tabs
-        if (ContentsContainer.ChildCount > 1)
-        {
-            control.Visible = false;
-        }
-        // First tab
-        else
-        {
-            SelectTab(control);
-        }
-
-        return index;
-    }
-
-    protected override void ChildRemoved(Control child)
-    {
-        if (_tabs.Remove(child, out var button))
-        {
-            button.Dispose();
-        }
-
-        // Set the current tab to a different control
-        if (_currentControl == child)
-        {
-            var previous = _controls.IndexOf(child) - 1;
-
-            if (previous > -1)
-            {
-                var setControl = _controls[previous];
-                SelectTab(setControl);
-            }
-            else
-            {
-                _currentControl = null;
-            }
-        }
-
-        _controls.Remove(child);
-        base.ChildRemoved(child);
-    }
-
-    private void SelectTab(Control control)
-    {
-        if (_currentControl != null)
-        {
-            _currentControl.Visible = false;
-        }
-
-        var button = _tabs[control];
-        button.Pressed = true;
-        control.Visible = true;
-        _currentControl = control;
-    }
-}