AppearanceComponent API Changes (#5446)

Content.Client/Atmos/Visualizers/GasAnalyzerVisualizer.cs

@@ -1,6 +1,7 @@
 using Content.Shared.Atmos.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.Atmos.Visualizers

Content.Client/Atmos/Visualizers/ScrubberVisualizer.cs

@@ -1,6 +1,7 @@
 using Content.Shared.Atmos.Piping.Unary.Visuals;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Client.Atmos.Visualizers
 {

Content.Client/Atmos/Visualizers/VentPumpVisualizer.cs

@@ -1,6 +1,7 @@
 using Content.Shared.Atmos.Visuals;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Client.Atmos.Visualizers
 {

Content.Client/Buckle/BuckleVisualizer.cs

@@ -4,6 +4,7 @@ using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
 namespace Content.Client.Buckle

Content.Client/Chemistry/Visualizers/FoamVisualizer.cs

@@ -3,6 +3,7 @@ using Content.Shared.Foam;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;

Content.Client/Chemistry/Visualizers/SmokeVisualizer.cs

@@ -1,6 +1,7 @@
 using Content.Shared.Smoking;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
 namespace Content.Client.Chemistry.Visualizers

Content.Client/Chemistry/Visualizers/SolutionContainerVisualizer.cs

@@ -2,6 +2,7 @@ using System;
 using Content.Shared.Chemistry;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization.Manager.Attributes;
 

Content.Client/Chemistry/Visualizers/VaporVisualizer.cs

@@ -3,6 +3,7 @@ using Content.Shared.Vapor;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;

Content.Client/Construction/MachineFrameVisualizer.cs

@@ -1,6 +1,7 @@
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Client.Construction
 {

Content.Client/Conveyor/Visualizers/ConveyorVisualizer.cs

@@ -44,7 +44,7 @@ namespace Content.Client.Conveyor.Visualizers
         {
             base.InitializeEntity(entity);
 
-            var appearance = entity.EnsureComponent<AppearanceComponent>();
+            var appearance = entity.EnsureComponent<ClientAppearanceComponent>();
             ChangeState(appearance);
         }
 

Content.Client/Conveyor/Visualizers/TwoWayLeverVisualizer.cs

@@ -1,4 +1,4 @@
-using Content.Shared.MachineLinking;
+using Content.Shared.MachineLinking;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
@@ -42,7 +42,7 @@ namespace Content.Client.Conveyor.Visualizers
         {
             base.InitializeEntity(entity);
 
-            var appearance = entity.EnsureComponent<AppearanceComponent>();
+            var appearance = entity.EnsureComponent<ClientAppearanceComponent>();
             ChangeState(appearance);
         }
 

Content.Client/Crayon/CrayonDecalVisualizer.cs

@@ -1,6 +1,7 @@
 using Content.Shared.Crayon;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
 namespace Content.Client.Crayon

Content.Client/Damage/DamageVisualizer.cs

@@ -293,7 +293,7 @@ namespace Content.Client.Damage
         {
             if (!entity.TryGetComponent<SpriteComponent>(out SpriteComponent? spriteComponent)
                 || !entity.TryGetComponent<DamageableComponent>(out var damageComponent)
-                || !entity.TryGetComponent<AppearanceComponent>(out var appearanceComponent))
+                || !entity.HasComponent<AppearanceComponent>())
                 return;
 
             _thresholds.Add(FixedPoint2.Zero);

Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs

@@ -148,7 +148,7 @@ namespace Content.Client.Disposal.Visualizers
             base.InitializeEntity(entity);
 
             entity.EnsureComponent<AnimationPlayerComponent>();
-            var appearance = entity.EnsureComponent<AppearanceComponent>();
+            var appearance = entity.EnsureComponent<ClientAppearanceComponent>();
 
             ChangeState(appearance);
         }

Content.Client/Disposal/Visualizers/DisposalVisualizer.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Content.Shared.Disposal.Components;
 using Content.Shared.SubFloor;
 using JetBrains.Annotations;
@@ -56,7 +56,7 @@ namespace Content.Client.Disposal.Visualizers
         {
             base.InitializeEntity(entity);
 
-            var appearance = entity.EnsureComponent<AppearanceComponent>();
+            var appearance = entity.EnsureComponent<ClientAppearanceComponent>();
             ChangeState(appearance);
         }
 

Content.Client/Explosion/ClusterFlashVisualizer.cs

@@ -1,6 +1,7 @@
 using Content.Shared.Explosion;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.Explosion

Content.Client/Extinguisher/FireExtinguisherVisualizer.cs

@@ -1,6 +1,7 @@
 using Content.Shared.Extinguisher;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.Extinguisher

Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs

@@ -1,4 +1,5 @@
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using static Content.Shared.Kitchen.Components.SharedReagentGrinderComponent;
 
 namespace Content.Client.Kitchen.Visualizers

Content.Client/Light/Visualizers/EmergencyLightVisualizer.cs

@@ -1,5 +1,6 @@
 using Content.Shared.Light.Component;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.Light.Visualizers

Content.Client/Light/Visualizers/ExpendableLightVisualizer.cs

@@ -4,6 +4,7 @@ using Content.Shared.Light.Component;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Audio;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Player;
 
 namespace Content.Client.Light.Visualizers

Content.Client/Light/Visualizers/LightBulbVisualizer.cs

@@ -1,6 +1,7 @@
 using Content.Shared.Light;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
 namespace Content.Client.Light.Visualizers

Content.Client/MedicalScanner/MedicalScannerVisualizer.cs

@@ -1,6 +1,7 @@
 using System;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using static Content.Shared.MedicalScanner.SharedMedicalScannerComponent;
 using static Content.Shared.MedicalScanner.SharedMedicalScannerComponent.MedicalScannerStatus;
 

Content.Client/MobState/DamageStateVisualizer.cs

@@ -1,10 +1,11 @@
 using System.Collections.Generic;
-using Content.Shared.DrawDepth;
 using Content.Shared.MobState;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
+using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
 
 namespace Content.Client.MobState
 {

Content.Client/MobState/States/DeadMobState.cs

@@ -1,7 +1,5 @@
-using Content.Shared.MobState;
+using Content.Shared.MobState;
 using Content.Shared.MobState.State;
-using Content.Shared.Standing;
-using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 
 namespace Content.Client.MobState.States

Content.Client/Morgue/Visualizers/BodyBagVisualizer.cs

@@ -1,6 +1,7 @@
 using Content.Shared.Labels;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Client.Morgue.Visualizers
 {

Content.Client/Morgue/Visualizers/CrematoriumVisualizer.cs

@@ -1,6 +1,7 @@
 using Content.Shared.Morgue;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.Morgue.Visualizers

Content.Client/Morgue/Visualizers/MorgueVisualizer.cs

@@ -1,5 +1,6 @@
 using Content.Shared.Morgue;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.Morgue.Visualizers

Content.Client/Nutrition/Visualizers/DrinkCanVisualizer.cs

@@ -1,6 +1,7 @@
 using Content.Shared.Nutrition.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.Nutrition.Visualizers

Content.Client/Pinpointer/PinpointerVisualizer.cs

@@ -1,6 +1,7 @@
 using Content.Shared.Pinpointer;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
 namespace Content.Client.Pinpointer

Content.Client/PneumaticCannon/PneumaticCannonVisualizer.cs

@@ -1,5 +1,6 @@
 using Content.Shared.PneumaticCannon;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Client.PneumaticCannon
 {

Content.Client/Pointing/RoguePointingArrowVisualizer.cs

@@ -4,6 +4,7 @@ using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
 namespace Content.Client.Pointing

Content.Client/Power/Visualizers/CableVisualizer.cs

@@ -1,5 +1,6 @@
 using Content.Shared.Wires;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.Power

Content.Client/Power/Visualizers/PowerDeviceVisualizer.cs

@@ -1,6 +1,7 @@
 using Content.Shared.Power;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Client.Power
 {

Content.Client/Recycling/RecyclerVisualizer.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Conveyor;
+using Content.Shared.Conveyor;
 using Content.Shared.Recycling;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;

Content.Client/Rotation/RotationVisualizer.cs

@@ -4,6 +4,7 @@ using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
 namespace Content.Client.Rotation

Content.Client/Security/DeployableBarrierVisualizer.cs

@@ -1,6 +1,7 @@
 using Content.Shared.Security;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Client.Security
 {

Content.Client/Shuttles/ThrusterVisualizer.cs

@@ -1,5 +1,6 @@
 using Content.Shared.Shuttles.Components;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Client.Shuttles
 {

Content.Client/Singularity/Visualizers/EmitterVisualizer.cs

@@ -3,6 +3,7 @@ using Content.Shared.Singularity.Components;
 using Content.Shared.Storage;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Client.Singularity.Visualizers
 {

Content.Client/Smoking/BurnStateVisualizer.cs

@@ -2,6 +2,7 @@
 using Content.Shared.Smoking;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.Smoking

Content.Client/SubFloor/SubFloorShowLayerVisualizer.cs

@@ -1,6 +1,7 @@
 using Content.Shared.SubFloor;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Client.SubFloor
 {

Content.Client/Tabletop/TabletopSystem.cs

@@ -1,4 +1,4 @@
-using Content.Client.Tabletop.Components;
+using Content.Client.Tabletop.Components;
 using Content.Client.Tabletop.UI;
 using Content.Client.Viewport;
 using Content.Shared.Tabletop;

Content.Client/Tabletop/Visualizers/TabletopItemVisualizer.cs

@@ -1,6 +1,7 @@
-using Content.Shared.Tabletop;
+using Content.Shared.Tabletop;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
 namespace Content.Client.Tabletop.Visualizers

Content.Client/Toilet/ToiletVisualizer.cs

@@ -1,5 +1,6 @@
 using Content.Shared.Toilet;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Client.Toilet
 {

Content.Client/Visualizer/GenericEnumVisualizer.cs

@@ -3,6 +3,7 @@ using System.Linq;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Reflection;

Content.Client/Wall/ReinforcedWallVisualizer.cs

@@ -1,6 +1,7 @@
 using Content.Shared.Wall;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Client.Wall
 {

Content.Client/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs

@@ -1,6 +1,7 @@
 using Content.Shared.Weapons.Ranged.Barrels.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 
 namespace Content.Client.Weapons.Ranged.Barrels.Visualizers
 {

Content.Client/Wires/Visualizers/WiresVisualizer.cs

@@ -1,4 +1,5 @@
 using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using static Content.Shared.Wires.SharedWiresComponent;
 
 namespace Content.Client.Wires.Visualizers

Content.Server/Atmos/Components/AtmosPlaqueComponent.cs

@@ -1,5 +1,4 @@
 using Content.Shared.Atmos.Visuals;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Random;

Content.Server/Atmos/EntitySystems/FlammableSystem.cs

@@ -11,7 +11,6 @@ using Content.Shared.Damage;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Temperature;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;

Content.Server/Atmos/Piping/Binary/EntitySystems/GasDualPortVentPumpSystem.cs

@@ -8,7 +8,6 @@ using Content.Server.NodeContainer.Nodes;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Visuals;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 

Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs

@@ -1,6 +1,5 @@
 using Content.Server.Atmos.Piping.Components;
 using Content.Shared.Atmos.Piping;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 

Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs

@@ -6,7 +6,6 @@ using Content.Server.NodeContainer;
 using Content.Server.NodeContainer.Nodes;
 using Content.Shared.Atmos.Piping.Unary.Components;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;

Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs

@@ -5,7 +5,6 @@ using Content.Server.NodeContainer;
 using Content.Server.NodeContainer.Nodes;
 using Content.Shared.Atmos.Piping;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 

Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs

@@ -7,7 +7,6 @@ using Content.Server.NodeContainer.Nodes;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Visuals;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 

Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs

@@ -7,7 +7,6 @@ using Content.Server.NodeContainer.Nodes;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Piping.Unary.Visuals;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;

Content.Server/Cabinet/ItemCabinetSystem.cs

@@ -48,7 +48,7 @@ namespace Content.Server.Cabinet
 
         private void UpdateAppearance(EntityUid uid,
             ItemCabinetComponent? cabinet = null,
-            SharedAppearanceComponent? appearance = null)
+            AppearanceComponent? appearance = null)
         {
             if (!Resolve(uid, ref cabinet, ref appearance, false))
                 return;

Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs

@@ -5,7 +5,6 @@ using Content.Server.Items;
 using Content.Shared.FixedPoint;
 using Content.Shared.Foam;
 using Content.Shared.Inventory;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 

Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs

@@ -4,7 +4,6 @@ using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using Content.Shared.Smoking;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.Chemistry.Components

Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs

@@ -99,7 +99,7 @@ namespace Content.Server.Chemistry.EntitySystems
         }
 
         private void UpdateAppearance(EntityUid uid, Solution solution,
-            SharedAppearanceComponent? appearanceComponent = null)
+            AppearanceComponent? appearanceComponent = null)
         {
             if (!EntityManager.EntityExists(uid)
                 || !Resolve(uid, ref appearanceComponent, false))

Content.Server/Computer/ComputerComponent.cs

@@ -3,7 +3,6 @@ using Content.Server.Construction;
 using Content.Server.Construction.Components;
 using Content.Server.Power.Components;
 using Content.Shared.Computer;
-using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;

Content.Server/Construction/Completions/VisualizerDataInt.cs

@@ -1,7 +1,6 @@
 using System.Threading.Tasks;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Reflection;

Content.Server/Construction/Components/MachineFrameComponent.cs

@@ -4,7 +4,6 @@ using Content.Server.Stack;
 using Content.Shared.Construction;
 using Content.Shared.Interaction;
 using Content.Shared.Tag;
-using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;

Content.Server/Conveyor/ConveyorSystem.cs

@@ -11,7 +11,6 @@ using Content.Shared.MachineLinking;
 using Content.Shared.Movement.Components;
 using Content.Shared.Popups;
 using Content.Shared.Stunnable;
-using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;

Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs

@@ -8,7 +8,6 @@ using Content.Shared.Popups;
 using Content.Shared.Sound;
 using Content.Shared.Verbs;
 using Robust.Server.Console;
-using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;

Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs

@@ -501,7 +501,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
 
         public void UpdateVisualState(DisposalUnitComponent component, bool flush)
         {
-            if (!component.Owner.TryGetComponent(out SharedAppearanceComponent? appearance))
+            if (!component.Owner.TryGetComponent(out AppearanceComponent? appearance))
             {
                 return;
             }

Content.Server/Doors/Components/AirlockComponent.cs

@@ -28,7 +28,7 @@ namespace Content.Server.Doors.Components
         public readonly ServerDoorComponent? DoorComponent = null;
 
         [ComponentDependency]
-        public readonly SharedAppearanceComponent? AppearanceComponent = null;
+        public readonly AppearanceComponent? AppearanceComponent = null;
 
         [ComponentDependency]
         public readonly ApcPowerReceiverComponent? ReceiverComponent = null;

Content.Server/Explosion/Components/ClusterFlashComponent.cs

@@ -6,7 +6,6 @@ using Content.Server.Flash.Components;
 using Content.Server.Throwing;
 using Content.Shared.Explosion;
 using Content.Shared.Interaction;
-using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;

Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs

@@ -2,7 +2,6 @@
 using Content.Server.Explosion.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Trigger;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 

Content.Server/Extinguisher/FireExtinguisherComponent.cs

@@ -10,7 +10,6 @@ using Content.Shared.Popups;
 using Content.Shared.Sound;
 using Content.Shared.Extinguisher;
 using Content.Shared.FixedPoint;
-using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;

Content.Server/Fluids/Components/SprayComponent.cs

@@ -12,7 +12,6 @@ using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Sound;
 using Content.Shared.Vapor;
-using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;

Content.Server/Fluids/EntitySystems/PuddleSystem.cs

@@ -59,7 +59,7 @@ namespace Content.Server.Fluids.EntitySystems
         private void UpdateVisuals(EntityUid uid, PuddleComponent puddleComponent)
         {
             if (puddleComponent.Owner.Deleted || EmptyHolder(uid, puddleComponent) ||
-                !EntityManager.TryGetComponent<SharedAppearanceComponent>(uid, out var appearanceComponent))
+                !EntityManager.TryGetComponent<AppearanceComponent>(uid, out var appearanceComponent))
             {
                 return;
             }

Content.Server/Kitchen/Components/KitchenSpikeComponent.cs

@@ -10,7 +10,6 @@ using Content.Shared.Kitchen.Components;
 using Content.Shared.MobState.Components;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Popups;
-using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;

Content.Server/Labels/Label/LabelSystem.cs

@@ -36,7 +36,7 @@ namespace Content.Server.Labels
         {
             _itemSlotsSystem.AddItemSlot(uid, component.Name, component.LabelSlot);
 
-            if (!EntityManager.TryGetComponent(uid, out SharedAppearanceComponent appearance))
+            if (!EntityManager.TryGetComponent(uid, out AppearanceComponent appearance))
                 return;
 
             appearance.SetData(PaperLabelVisuals.HasLabel, false);
@@ -92,7 +92,7 @@ namespace Content.Server.Labels
             if (args.Container.ID != label.LabelSlot.ID)
                 return;
 
-            if (!EntityManager.TryGetComponent(uid, out SharedAppearanceComponent appearance))
+            if (!EntityManager.TryGetComponent(uid, out AppearanceComponent appearance))
                 return;
 
             appearance.SetData(PaperLabelVisuals.HasLabel, label.LabelSlot.HasItem);

Content.Server/Light/EntitySystems/LightBulbSystem.cs

@@ -2,7 +2,6 @@ using Content.Server.Light.Components;
 using Content.Server.Light.Events;
 using Content.Shared.Light;
 using Content.Shared.Throwing;
-using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;

Content.Server/Light/EntitySystems/MatchstickSystem.cs

@@ -6,7 +6,6 @@ using Content.Shared.Audio;
 using Content.Shared.Interaction;
 using Content.Shared.Smoking;
 using Content.Shared.Temperature;
-using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;

Content.Server/Lock/LockSystem.cs

@@ -7,7 +7,6 @@ using Content.Shared.Popups;
 using Content.Shared.Storage;
 using Content.Shared.Verbs;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;

Content.Server/MachineLinking/System/TwoWayLeverSystem.cs

@@ -3,7 +3,6 @@ using Content.Server.MachineLinking.Components;
 using Content.Server.MachineLinking.Events;
 using Content.Shared.Interaction;
 using Content.Shared.MachineLinking;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 

Content.Server/Mining/Components/AsteroidRockComponent.cs

@@ -3,7 +3,6 @@ using Content.Server.Weapon.Melee.Components;
 using Content.Shared.Damage;
 using Content.Shared.Interaction;
 using Content.Shared.Mining;
-using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;

Content.Server/NodeContainer/Nodes/PipeNode.cs

@@ -4,7 +4,6 @@ using Content.Server.Atmos.EntitySystems;
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.NodeContainer.NodeGroups;
 using Content.Shared.Atmos;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;

Content.Server/Nutrition/EntitySystems/DrinkSystem.cs

@@ -17,7 +17,6 @@ using Content.Shared.Nutrition.Components;
 using Content.Shared.Popups;
 using Content.Shared.Throwing;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;

Content.Server/Nutrition/EntitySystems/SmokingSystem.cs

@@ -8,7 +8,6 @@ using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using Content.Shared.Smoking;
 using Content.Shared.Temperature;
-using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;

Content.Server/PAI/PAISystem.cs

@@ -5,7 +5,6 @@ using Content.Shared.Verbs;
 using Content.Server.Popups;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Mind.Components;
-using Robust.Server.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.GameObjects;

Content.Server/PneumaticCannon/PneumaticCannonSystem.cs

@@ -13,7 +13,6 @@ using Content.Server.Stunnable;
 using Content.Server.Stunnable.Components;
 using Content.Shared.Interaction;
 using Content.Shared.PneumaticCannon;
-using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;

Content.Server/Power/Components/ApcPowerReceiverComponent.cs

@@ -4,7 +4,6 @@ using Content.Server.Power.NodeGroups;
 using Content.Server.Power.Pow3r;
 using Content.Shared.Examine;
 using Content.Shared.Power;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;

Content.Server/Power/Components/BaseCharger.cs

@@ -6,7 +6,6 @@ using Content.Server.Weapon.Ranged.Barrels.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Power;
-using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;

Content.Server/Power/EntitySystems/CableVisSystem.cs

@@ -5,7 +5,6 @@ using Content.Server.Power.Components;
 using Content.Server.Power.Nodes;
 using Content.Shared.Wires;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;

Content.Server/Power/SMES/SmesComponent.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Content.Server.Power.Components;
 using Content.Shared.Power;
 using Content.Shared.Rounding;
@@ -36,7 +36,7 @@ namespace Content.Server.Power.SMES
         {
             base.Initialize();
 
-            Owner.EnsureComponentWarn<AppearanceComponent>();
+            Owner.EnsureComponentWarn<ServerAppearanceComponent>();
         }
 
         public void OnUpdate()

Content.Server/PowerCell/Components/PowerCellComponent.cs

@@ -4,7 +4,6 @@ using Content.Server.Power.Components;
 using Content.Shared.Examine;
 using Content.Shared.PowerCell;
 using Content.Shared.Rounding;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;

Content.Server/Recycling/RecyclerSystem.cs

@@ -51,7 +51,7 @@ namespace Content.Server.Recycling
 
         public void Bloodstain(RecyclerComponent component)
         {
-            if (component.Owner.TryGetComponent(out SharedAppearanceComponent? appearance))
+            if (component.Owner.TryGetComponent(out AppearanceComponent? appearance))
             {
                 appearance.SetData(RecyclerVisuals.Bloody, true);
             }

Content.Server/Shuttles/EntitySystems/ThrusterSystem.cs

@@ -250,7 +250,7 @@ namespace Content.Server.Shuttles.EntitySystems
                     throw new ArgumentOutOfRangeException();
             }
 
-            if (EntityManager.TryGetComponent(uid, out SharedAppearanceComponent? appearanceComponent))
+            if (EntityManager.TryGetComponent(uid, out AppearanceComponent? appearanceComponent))
             {
                 appearanceComponent.SetData(ThrusterVisualState.State, true);
             }
@@ -295,7 +295,7 @@ namespace Content.Server.Shuttles.EntitySystems
                     throw new ArgumentOutOfRangeException();
             }
 
-            if (EntityManager.TryGetComponent(uid, out SharedAppearanceComponent? appearanceComponent))
+            if (EntityManager.TryGetComponent(uid, out AppearanceComponent? appearanceComponent))
             {
                 appearanceComponent.SetData(ThrusterVisualState.State, false);
             }
@@ -398,7 +398,7 @@ namespace Content.Server.Shuttles.EntitySystems
                     case ShuttleMode.Cruise:
                         foreach (var comp in component.AngularThrusters)
                         {
-                            if (!EntityManager.TryGetComponent(comp.OwnerUid, out SharedAppearanceComponent? appearanceComponent))
+                            if (!EntityManager.TryGetComponent(comp.OwnerUid, out AppearanceComponent? appearanceComponent))
                                 continue;
 
                             comp.Firing = true;
@@ -410,7 +410,7 @@ namespace Content.Server.Shuttles.EntitySystems
 
                         foreach (var comp in component.LinearThrusters[index])
                         {
-                            if (!EntityManager.TryGetComponent(comp.OwnerUid, out SharedAppearanceComponent? appearanceComponent))
+                            if (!EntityManager.TryGetComponent(comp.OwnerUid, out AppearanceComponent? appearanceComponent))
                                 continue;
 
                             comp.Firing = true;
@@ -426,7 +426,7 @@ namespace Content.Server.Shuttles.EntitySystems
 
                 foreach (var comp in component.LinearThrusters[index])
                 {
-                    if (!EntityManager.TryGetComponent(comp.OwnerUid, out SharedAppearanceComponent? appearanceComponent))
+                    if (!EntityManager.TryGetComponent(comp.OwnerUid, out AppearanceComponent? appearanceComponent))
                         continue;
 
                     comp.Firing = true;
@@ -451,7 +451,7 @@ namespace Content.Server.Shuttles.EntitySystems
                     case ShuttleMode.Cruise:
                         foreach (var comp in component.AngularThrusters)
                         {
-                            if (!EntityManager.TryGetComponent(comp.OwnerUid, out SharedAppearanceComponent? appearanceComponent))
+                            if (!EntityManager.TryGetComponent(comp.OwnerUid, out AppearanceComponent? appearanceComponent))
                                 continue;
 
                             comp.Firing = false;
@@ -463,7 +463,7 @@ namespace Content.Server.Shuttles.EntitySystems
 
                         foreach (var comp in component.LinearThrusters[index])
                         {
-                            if (!EntityManager.TryGetComponent(comp.OwnerUid, out SharedAppearanceComponent? appearanceComponent))
+                            if (!EntityManager.TryGetComponent(comp.OwnerUid, out AppearanceComponent? appearanceComponent))
                                 continue;
 
                             comp.Firing = false;
@@ -479,7 +479,7 @@ namespace Content.Server.Shuttles.EntitySystems
 
                 foreach (var comp in component.LinearThrusters[index])
                 {
-                    if (!EntityManager.TryGetComponent(comp.OwnerUid, out SharedAppearanceComponent? appearanceComponent))
+                    if (!EntityManager.TryGetComponent(comp.OwnerUid, out AppearanceComponent? appearanceComponent))
                         continue;
 
                     comp.Firing = false;

Content.Server/Singularity/Components/RadiationCollectorComponent.cs

@@ -4,7 +4,6 @@ using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Radiation;
 using Content.Shared.Singularity.Components;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;

Content.Server/Storage/Components/EntityStorageComponent.cs

@@ -18,7 +18,6 @@ using Content.Shared.Storage;
 using Content.Shared.Tools;
 using Content.Shared.Tools.Components;
 using Content.Shared.Verbs;
-using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;

Content.Server/Stunnable/StunOnCollideSystem.cs

@@ -7,7 +7,6 @@ using Content.Shared.Standing;
 using Content.Shared.StatusEffect;
 using Content.Shared.Stunnable;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Physics.Dynamics;

Content.Server/Tabletop/TabletopSystem.Draggable.cs

@@ -1,7 +1,6 @@
 using Content.Server.Tabletop.Components;
 using Content.Shared.Tabletop;
 using Content.Shared.Tabletop.Events;
-using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;

Content.Server/Toilet/ToiletComponent.cs

@@ -16,7 +16,6 @@ using Content.Shared.Sound;
 using Content.Shared.Toilet;
 using Content.Shared.Tools;
 using Content.Shared.Tools.Components;
-using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;

Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs

@@ -8,7 +8,6 @@ using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Weapons.Ranged.Barrels.Components;
-using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;

Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs

@@ -8,7 +8,6 @@ using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Weapons.Ranged.Barrels.Components;
-using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;

Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs

@@ -6,7 +6,6 @@ using Content.Server.Weapon.Ranged.Barrels.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Weapons.Ranged.Barrels.Components;
-using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;

Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs

@@ -6,7 +6,6 @@ using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Sound;
 using Content.Shared.Weapons.Ranged.Barrels.Components;
-using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;

Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs

@@ -5,7 +5,6 @@ using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Sound;
 using Content.Shared.Weapons.Ranged.Barrels.Components;
-using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;