diff --git a/Content.Client/Atmos/Visualizers/GasAnalyzerVisualizer.cs b/Content.Client/Atmos/Visualizers/GasAnalyzerVisualizer.cs index 9bca8ed708..b57d3fb7c7 100644 --- a/Content.Client/Atmos/Visualizers/GasAnalyzerVisualizer.cs +++ b/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 diff --git a/Content.Client/Atmos/Visualizers/ScrubberVisualizer.cs b/Content.Client/Atmos/Visualizers/ScrubberVisualizer.cs index e58b0bf8e7..7c5906bafc 100644 --- a/Content.Client/Atmos/Visualizers/ScrubberVisualizer.cs +++ b/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 { diff --git a/Content.Client/Atmos/Visualizers/VentPumpVisualizer.cs b/Content.Client/Atmos/Visualizers/VentPumpVisualizer.cs index cecc544b57..e1d3d51196 100644 --- a/Content.Client/Atmos/Visualizers/VentPumpVisualizer.cs +++ b/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 { diff --git a/Content.Client/Buckle/BuckleVisualizer.cs b/Content.Client/Buckle/BuckleVisualizer.cs index 7d748cca5f..d53dea6bd3 100644 --- a/Content.Client/Buckle/BuckleVisualizer.cs +++ b/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 diff --git a/Content.Client/Chemistry/Visualizers/FoamVisualizer.cs b/Content.Client/Chemistry/Visualizers/FoamVisualizer.cs index fcf756af77..99a2dd3d80 100644 --- a/Content.Client/Chemistry/Visualizers/FoamVisualizer.cs +++ b/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; diff --git a/Content.Client/Chemistry/Visualizers/SmokeVisualizer.cs b/Content.Client/Chemistry/Visualizers/SmokeVisualizer.cs index bfc386948b..89c2d2fd18 100644 --- a/Content.Client/Chemistry/Visualizers/SmokeVisualizer.cs +++ b/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 diff --git a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualizer.cs b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualizer.cs index 117abef592..1911fe6bae 100644 --- a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualizer.cs +++ b/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; diff --git a/Content.Client/Chemistry/Visualizers/VaporVisualizer.cs b/Content.Client/Chemistry/Visualizers/VaporVisualizer.cs index a30bdb4717..83192c5709 100644 --- a/Content.Client/Chemistry/Visualizers/VaporVisualizer.cs +++ b/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; diff --git a/Content.Client/Construction/MachineFrameVisualizer.cs b/Content.Client/Construction/MachineFrameVisualizer.cs index ddd6f7147a..86a3d9ce17 100644 --- a/Content.Client/Construction/MachineFrameVisualizer.cs +++ b/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 { diff --git a/Content.Client/Conveyor/Visualizers/ConveyorVisualizer.cs b/Content.Client/Conveyor/Visualizers/ConveyorVisualizer.cs index 04ffc65b7f..6f025b6395 100644 --- a/Content.Client/Conveyor/Visualizers/ConveyorVisualizer.cs +++ b/Content.Client/Conveyor/Visualizers/ConveyorVisualizer.cs @@ -44,7 +44,7 @@ namespace Content.Client.Conveyor.Visualizers { base.InitializeEntity(entity); - var appearance = entity.EnsureComponent(); + var appearance = entity.EnsureComponent(); ChangeState(appearance); } diff --git a/Content.Client/Conveyor/Visualizers/TwoWayLeverVisualizer.cs b/Content.Client/Conveyor/Visualizers/TwoWayLeverVisualizer.cs index 1f2742d4ec..bea07cbcc6 100644 --- a/Content.Client/Conveyor/Visualizers/TwoWayLeverVisualizer.cs +++ b/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(); + var appearance = entity.EnsureComponent(); ChangeState(appearance); } diff --git a/Content.Client/Crayon/CrayonDecalVisualizer.cs b/Content.Client/Crayon/CrayonDecalVisualizer.cs index e886225b1e..964792a56e 100644 --- a/Content.Client/Crayon/CrayonDecalVisualizer.cs +++ b/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 diff --git a/Content.Client/Damage/DamageVisualizer.cs b/Content.Client/Damage/DamageVisualizer.cs index dd11555117..d5d4728172 100644 --- a/Content.Client/Damage/DamageVisualizer.cs +++ b/Content.Client/Damage/DamageVisualizer.cs @@ -293,7 +293,7 @@ namespace Content.Client.Damage { if (!entity.TryGetComponent(out SpriteComponent? spriteComponent) || !entity.TryGetComponent(out var damageComponent) - || !entity.TryGetComponent(out var appearanceComponent)) + || !entity.HasComponent()) return; _thresholds.Add(FixedPoint2.Zero); diff --git a/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs b/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs index 264dfd64cb..59e3d282d7 100644 --- a/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs +++ b/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs @@ -148,7 +148,7 @@ namespace Content.Client.Disposal.Visualizers base.InitializeEntity(entity); entity.EnsureComponent(); - var appearance = entity.EnsureComponent(); + var appearance = entity.EnsureComponent(); ChangeState(appearance); } diff --git a/Content.Client/Disposal/Visualizers/DisposalVisualizer.cs b/Content.Client/Disposal/Visualizers/DisposalVisualizer.cs index 202129f7b8..fe774d945e 100644 --- a/Content.Client/Disposal/Visualizers/DisposalVisualizer.cs +++ b/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(); + var appearance = entity.EnsureComponent(); ChangeState(appearance); } diff --git a/Content.Client/Explosion/ClusterFlashVisualizer.cs b/Content.Client/Explosion/ClusterFlashVisualizer.cs index 25e5fe00e3..7ca1c02e11 100644 --- a/Content.Client/Explosion/ClusterFlashVisualizer.cs +++ b/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 diff --git a/Content.Client/Extinguisher/FireExtinguisherVisualizer.cs b/Content.Client/Extinguisher/FireExtinguisherVisualizer.cs index ddeeb510ab..ea414509c2 100644 --- a/Content.Client/Extinguisher/FireExtinguisherVisualizer.cs +++ b/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 diff --git a/Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs b/Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs index 5160d88ae4..7abc3509ca 100644 --- a/Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs +++ b/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 diff --git a/Content.Client/Light/Visualizers/EmergencyLightVisualizer.cs b/Content.Client/Light/Visualizers/EmergencyLightVisualizer.cs index 4c7ed5db08..f02c3ce7d5 100644 --- a/Content.Client/Light/Visualizers/EmergencyLightVisualizer.cs +++ b/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 diff --git a/Content.Client/Light/Visualizers/ExpendableLightVisualizer.cs b/Content.Client/Light/Visualizers/ExpendableLightVisualizer.cs index 18c8cf1ce2..6c978ae310 100644 --- a/Content.Client/Light/Visualizers/ExpendableLightVisualizer.cs +++ b/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 diff --git a/Content.Client/Light/Visualizers/LightBulbVisualizer.cs b/Content.Client/Light/Visualizers/LightBulbVisualizer.cs index cb4c5f5f17..bfa594f419 100644 --- a/Content.Client/Light/Visualizers/LightBulbVisualizer.cs +++ b/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 diff --git a/Content.Client/MedicalScanner/MedicalScannerVisualizer.cs b/Content.Client/MedicalScanner/MedicalScannerVisualizer.cs index fd86dcceec..3b4786a54a 100644 --- a/Content.Client/MedicalScanner/MedicalScannerVisualizer.cs +++ b/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; diff --git a/Content.Client/MobState/DamageStateVisualizer.cs b/Content.Client/MobState/DamageStateVisualizer.cs index 6aba63f85d..8586a9dbcc 100644 --- a/Content.Client/MobState/DamageStateVisualizer.cs +++ b/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 { diff --git a/Content.Client/MobState/States/DeadMobState.cs b/Content.Client/MobState/States/DeadMobState.cs index 93c3264951..7cda4dad2c 100644 --- a/Content.Client/MobState/States/DeadMobState.cs +++ b/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 diff --git a/Content.Client/Morgue/Visualizers/BodyBagVisualizer.cs b/Content.Client/Morgue/Visualizers/BodyBagVisualizer.cs index e8063689f3..cefa9bea45 100644 --- a/Content.Client/Morgue/Visualizers/BodyBagVisualizer.cs +++ b/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 { diff --git a/Content.Client/Morgue/Visualizers/CrematoriumVisualizer.cs b/Content.Client/Morgue/Visualizers/CrematoriumVisualizer.cs index 48824e4a07..a930b71c2e 100644 --- a/Content.Client/Morgue/Visualizers/CrematoriumVisualizer.cs +++ b/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 diff --git a/Content.Client/Morgue/Visualizers/MorgueVisualizer.cs b/Content.Client/Morgue/Visualizers/MorgueVisualizer.cs index cf1d385831..f7df0ce6bb 100644 --- a/Content.Client/Morgue/Visualizers/MorgueVisualizer.cs +++ b/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 diff --git a/Content.Client/Nutrition/Visualizers/DrinkCanVisualizer.cs b/Content.Client/Nutrition/Visualizers/DrinkCanVisualizer.cs index 37671a38c3..94df14440d 100644 --- a/Content.Client/Nutrition/Visualizers/DrinkCanVisualizer.cs +++ b/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 diff --git a/Content.Client/Pinpointer/PinpointerVisualizer.cs b/Content.Client/Pinpointer/PinpointerVisualizer.cs index 28d3d918ee..6cf214f5e1 100644 --- a/Content.Client/Pinpointer/PinpointerVisualizer.cs +++ b/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 diff --git a/Content.Client/PneumaticCannon/PneumaticCannonVisualizer.cs b/Content.Client/PneumaticCannon/PneumaticCannonVisualizer.cs index de7d6a3068..b88d04f227 100644 --- a/Content.Client/PneumaticCannon/PneumaticCannonVisualizer.cs +++ b/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 { diff --git a/Content.Client/Pointing/RoguePointingArrowVisualizer.cs b/Content.Client/Pointing/RoguePointingArrowVisualizer.cs index 2f396e602a..2f675d49fb 100644 --- a/Content.Client/Pointing/RoguePointingArrowVisualizer.cs +++ b/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 diff --git a/Content.Client/Power/Visualizers/CableVisualizer.cs b/Content.Client/Power/Visualizers/CableVisualizer.cs index b5c09c7ebc..7d151d1c6d 100644 --- a/Content.Client/Power/Visualizers/CableVisualizer.cs +++ b/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 diff --git a/Content.Client/Power/Visualizers/PowerDeviceVisualizer.cs b/Content.Client/Power/Visualizers/PowerDeviceVisualizer.cs index 44dd5ac8b8..e8aed1b15d 100644 --- a/Content.Client/Power/Visualizers/PowerDeviceVisualizer.cs +++ b/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 { diff --git a/Content.Client/Recycling/RecyclerVisualizer.cs b/Content.Client/Recycling/RecyclerVisualizer.cs index d7a3974a15..5d584582d8 100644 --- a/Content.Client/Recycling/RecyclerVisualizer.cs +++ b/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; diff --git a/Content.Client/Rotation/RotationVisualizer.cs b/Content.Client/Rotation/RotationVisualizer.cs index 5e99489efa..05e5a852de 100644 --- a/Content.Client/Rotation/RotationVisualizer.cs +++ b/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 diff --git a/Content.Client/Security/DeployableBarrierVisualizer.cs b/Content.Client/Security/DeployableBarrierVisualizer.cs index 5ac29a3643..9b0799f0d7 100644 --- a/Content.Client/Security/DeployableBarrierVisualizer.cs +++ b/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 { diff --git a/Content.Client/Shuttles/ThrusterVisualizer.cs b/Content.Client/Shuttles/ThrusterVisualizer.cs index 6bc2ae6a6e..904035539b 100644 --- a/Content.Client/Shuttles/ThrusterVisualizer.cs +++ b/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 { diff --git a/Content.Client/Singularity/Visualizers/EmitterVisualizer.cs b/Content.Client/Singularity/Visualizers/EmitterVisualizer.cs index a9efc7abc1..5bc71fee3f 100644 --- a/Content.Client/Singularity/Visualizers/EmitterVisualizer.cs +++ b/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 { diff --git a/Content.Client/Smoking/BurnStateVisualizer.cs b/Content.Client/Smoking/BurnStateVisualizer.cs index 8472381440..f144eb5b02 100644 --- a/Content.Client/Smoking/BurnStateVisualizer.cs +++ b/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 diff --git a/Content.Client/SubFloor/SubFloorShowLayerVisualizer.cs b/Content.Client/SubFloor/SubFloorShowLayerVisualizer.cs index e16e7b22e8..e3958a59c8 100644 --- a/Content.Client/SubFloor/SubFloorShowLayerVisualizer.cs +++ b/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 { diff --git a/Content.Client/Tabletop/TabletopSystem.cs b/Content.Client/Tabletop/TabletopSystem.cs index 13ce66372d..81d9070cc4 100644 --- a/Content.Client/Tabletop/TabletopSystem.cs +++ b/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; diff --git a/Content.Client/Tabletop/Visualizers/TabletopItemVisualizer.cs b/Content.Client/Tabletop/Visualizers/TabletopItemVisualizer.cs index 4c64921a85..1febac6a49 100644 --- a/Content.Client/Tabletop/Visualizers/TabletopItemVisualizer.cs +++ b/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 diff --git a/Content.Client/Toilet/ToiletVisualizer.cs b/Content.Client/Toilet/ToiletVisualizer.cs index 1d850f3732..e714b0cbcf 100644 --- a/Content.Client/Toilet/ToiletVisualizer.cs +++ b/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 { diff --git a/Content.Client/Visualizer/GenericEnumVisualizer.cs b/Content.Client/Visualizer/GenericEnumVisualizer.cs index 27faff66b7..06df062ea8 100644 --- a/Content.Client/Visualizer/GenericEnumVisualizer.cs +++ b/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; diff --git a/Content.Client/Wall/ReinforcedWallVisualizer.cs b/Content.Client/Wall/ReinforcedWallVisualizer.cs index 9a0d4765f5..ca23401cf4 100644 --- a/Content.Client/Wall/ReinforcedWallVisualizer.cs +++ b/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 { diff --git a/Content.Client/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs b/Content.Client/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs index 257527b3f9..e4beb23ea2 100644 --- a/Content.Client/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs +++ b/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 { diff --git a/Content.Client/Wires/Visualizers/WiresVisualizer.cs b/Content.Client/Wires/Visualizers/WiresVisualizer.cs index 2ad300e436..713329abfb 100644 --- a/Content.Client/Wires/Visualizers/WiresVisualizer.cs +++ b/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 diff --git a/Content.Server/Atmos/Components/AtmosPlaqueComponent.cs b/Content.Server/Atmos/Components/AtmosPlaqueComponent.cs index 1cd6090528..4709f9712b 100644 --- a/Content.Server/Atmos/Components/AtmosPlaqueComponent.cs +++ b/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; diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs index e3a3174574..2bfb1feb35 100644 --- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs +++ b/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; diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasDualPortVentPumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasDualPortVentPumpSystem.cs index 076e4084a2..5018ae8203 100644 --- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasDualPortVentPumpSystem.cs +++ b/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; diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs index 019b21426b..7f5f997775 100644 --- a/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs +++ b/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; diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs index bf0a6164a9..bdb5e1ec55 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs +++ b/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; diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs index f20124c797..2eef750ef9 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs +++ b/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; diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs index 1dd758192d..6cedebe94c 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs +++ b/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; diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs index 5385245ece..c59f60aefa 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs +++ b/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; diff --git a/Content.Server/Cabinet/ItemCabinetSystem.cs b/Content.Server/Cabinet/ItemCabinetSystem.cs index a53b5ff738..628cf32005 100644 --- a/Content.Server/Cabinet/ItemCabinetSystem.cs +++ b/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; diff --git a/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs b/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs index 1375b44f61..22e847cc0c 100644 --- a/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs +++ b/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; diff --git a/Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs b/Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs index 89add6753e..4de92e9e4e 100644 --- a/Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs +++ b/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 diff --git a/Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs index 3dac2e5285..665bacecd1 100644 --- a/Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs +++ b/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)) diff --git a/Content.Server/Computer/ComputerComponent.cs b/Content.Server/Computer/ComputerComponent.cs index 055ad41447..8985fcd82e 100644 --- a/Content.Server/Computer/ComputerComponent.cs +++ b/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; diff --git a/Content.Server/Construction/Completions/VisualizerDataInt.cs b/Content.Server/Construction/Completions/VisualizerDataInt.cs index d13696559f..b8228f53d5 100644 --- a/Content.Server/Construction/Completions/VisualizerDataInt.cs +++ b/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; diff --git a/Content.Server/Construction/Components/MachineFrameComponent.cs b/Content.Server/Construction/Components/MachineFrameComponent.cs index 73c8c7217f..7dfe524b50 100644 --- a/Content.Server/Construction/Components/MachineFrameComponent.cs +++ b/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; diff --git a/Content.Server/Conveyor/ConveyorSystem.cs b/Content.Server/Conveyor/ConveyorSystem.cs index 9d7ffbe1dc..da8301be7b 100644 --- a/Content.Server/Conveyor/ConveyorSystem.cs +++ b/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; diff --git a/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs index 15bafa3a78..31ea796118 100644 --- a/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs +++ b/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; diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs index 97580c1c0b..b4b7fff3de 100644 --- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs +++ b/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; } diff --git a/Content.Server/Doors/Components/AirlockComponent.cs b/Content.Server/Doors/Components/AirlockComponent.cs index a38aa0bb90..06fafb4818 100644 --- a/Content.Server/Doors/Components/AirlockComponent.cs +++ b/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; diff --git a/Content.Server/Explosion/Components/ClusterFlashComponent.cs b/Content.Server/Explosion/Components/ClusterFlashComponent.cs index 064ef79611..e458726def 100644 --- a/Content.Server/Explosion/Components/ClusterFlashComponent.cs +++ b/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; diff --git a/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs b/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs index 79463b2180..4268139833 100644 --- a/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs +++ b/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; diff --git a/Content.Server/Extinguisher/FireExtinguisherComponent.cs b/Content.Server/Extinguisher/FireExtinguisherComponent.cs index ed5f6282de..6a88316af5 100644 --- a/Content.Server/Extinguisher/FireExtinguisherComponent.cs +++ b/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; diff --git a/Content.Server/Fluids/Components/SprayComponent.cs b/Content.Server/Fluids/Components/SprayComponent.cs index da81ff0246..f2d5f96d53 100644 --- a/Content.Server/Fluids/Components/SprayComponent.cs +++ b/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; diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs index b271435bc4..1be9a87859 100644 --- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs +++ b/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(uid, out var appearanceComponent)) + !EntityManager.TryGetComponent(uid, out var appearanceComponent)) { return; } diff --git a/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs b/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs index 23b3d31ed3..0b140ff68d 100644 --- a/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs +++ b/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; diff --git a/Content.Server/Labels/Label/LabelSystem.cs b/Content.Server/Labels/Label/LabelSystem.cs index 0cf535f0e4..9d14a5d92c 100644 --- a/Content.Server/Labels/Label/LabelSystem.cs +++ b/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); diff --git a/Content.Server/Light/EntitySystems/LightBulbSystem.cs b/Content.Server/Light/EntitySystems/LightBulbSystem.cs index cb1105fd3b..b4e2880b28 100644 --- a/Content.Server/Light/EntitySystems/LightBulbSystem.cs +++ b/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; diff --git a/Content.Server/Light/EntitySystems/MatchstickSystem.cs b/Content.Server/Light/EntitySystems/MatchstickSystem.cs index e4967a51c0..33b9bf17a9 100644 --- a/Content.Server/Light/EntitySystems/MatchstickSystem.cs +++ b/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; diff --git a/Content.Server/Lock/LockSystem.cs b/Content.Server/Lock/LockSystem.cs index cafd9b5c30..13adfb1466 100644 --- a/Content.Server/Lock/LockSystem.cs +++ b/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; diff --git a/Content.Server/MachineLinking/System/TwoWayLeverSystem.cs b/Content.Server/MachineLinking/System/TwoWayLeverSystem.cs index 33316e6d3a..69bb55cf73 100644 --- a/Content.Server/MachineLinking/System/TwoWayLeverSystem.cs +++ b/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; diff --git a/Content.Server/Mining/Components/AsteroidRockComponent.cs b/Content.Server/Mining/Components/AsteroidRockComponent.cs index d1a88ddab2..10b1bb731c 100644 --- a/Content.Server/Mining/Components/AsteroidRockComponent.cs +++ b/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; diff --git a/Content.Server/NodeContainer/Nodes/PipeNode.cs b/Content.Server/NodeContainer/Nodes/PipeNode.cs index 4588d7d555..af13370149 100644 --- a/Content.Server/NodeContainer/Nodes/PipeNode.cs +++ b/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; diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs index f732b2b007..ad6ae769d2 100644 --- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs +++ b/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; diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs index 3a70812bc3..56bcb73e5d 100644 --- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs +++ b/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; diff --git a/Content.Server/PAI/PAISystem.cs b/Content.Server/PAI/PAISystem.cs index 5c5aabd409..190c3c7910 100644 --- a/Content.Server/PAI/PAISystem.cs +++ b/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; diff --git a/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs b/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs index 773290053b..75e79f1366 100644 --- a/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs +++ b/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; diff --git a/Content.Server/Power/Components/ApcPowerReceiverComponent.cs b/Content.Server/Power/Components/ApcPowerReceiverComponent.cs index 133867bb0b..6e36108e5f 100644 --- a/Content.Server/Power/Components/ApcPowerReceiverComponent.cs +++ b/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; diff --git a/Content.Server/Power/Components/BaseCharger.cs b/Content.Server/Power/Components/BaseCharger.cs index 14be7bf44f..55f14c121e 100644 --- a/Content.Server/Power/Components/BaseCharger.cs +++ b/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; diff --git a/Content.Server/Power/EntitySystems/CableVisSystem.cs b/Content.Server/Power/EntitySystems/CableVisSystem.cs index 326101d89e..65bfdeeebc 100644 --- a/Content.Server/Power/EntitySystems/CableVisSystem.cs +++ b/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; diff --git a/Content.Server/Power/SMES/SmesComponent.cs b/Content.Server/Power/SMES/SmesComponent.cs index fbb51b3d3d..8115975b50 100644 --- a/Content.Server/Power/SMES/SmesComponent.cs +++ b/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(); + Owner.EnsureComponentWarn(); } public void OnUpdate() diff --git a/Content.Server/PowerCell/Components/PowerCellComponent.cs b/Content.Server/PowerCell/Components/PowerCellComponent.cs index 5b4509bb05..4603d11b68 100644 --- a/Content.Server/PowerCell/Components/PowerCellComponent.cs +++ b/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; diff --git a/Content.Server/Recycling/RecyclerSystem.cs b/Content.Server/Recycling/RecyclerSystem.cs index f66adecb48..a57e8f4538 100644 --- a/Content.Server/Recycling/RecyclerSystem.cs +++ b/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); } diff --git a/Content.Server/Shuttles/EntitySystems/ThrusterSystem.cs b/Content.Server/Shuttles/EntitySystems/ThrusterSystem.cs index e0ac302e65..31d6fb989b 100644 --- a/Content.Server/Shuttles/EntitySystems/ThrusterSystem.cs +++ b/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; diff --git a/Content.Server/Singularity/Components/RadiationCollectorComponent.cs b/Content.Server/Singularity/Components/RadiationCollectorComponent.cs index 157ee949ec..a1f0e2642a 100644 --- a/Content.Server/Singularity/Components/RadiationCollectorComponent.cs +++ b/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; diff --git a/Content.Server/Storage/Components/EntityStorageComponent.cs b/Content.Server/Storage/Components/EntityStorageComponent.cs index b6f0f091ac..2c6926d9c4 100644 --- a/Content.Server/Storage/Components/EntityStorageComponent.cs +++ b/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; diff --git a/Content.Server/Stunnable/StunOnCollideSystem.cs b/Content.Server/Stunnable/StunOnCollideSystem.cs index 4360464dbf..fc39a999c7 100644 --- a/Content.Server/Stunnable/StunOnCollideSystem.cs +++ b/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; diff --git a/Content.Server/Tabletop/TabletopSystem.Draggable.cs b/Content.Server/Tabletop/TabletopSystem.Draggable.cs index 5d259d4ac3..d5267bac15 100644 --- a/Content.Server/Tabletop/TabletopSystem.Draggable.cs +++ b/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; diff --git a/Content.Server/Toilet/ToiletComponent.cs b/Content.Server/Toilet/ToiletComponent.cs index 5fd045cab8..c9b51b017a 100644 --- a/Content.Server/Toilet/ToiletComponent.cs +++ b/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; diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs index 4fd4f20736..94191507b5 100644 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs +++ b/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; diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs index 23598865f6..6a2039c973 100644 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs +++ b/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; diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs index c0c761532d..b4ffb19ad2 100644 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs +++ b/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; diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs index b31d56a36b..bb059d7ff2 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs +++ b/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; diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs index f60a93a650..50509cf1b3 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs +++ b/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; diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs index 07edfe1e6a..ef47085f2b 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.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; diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs index a3878c5349..d3706bbd67 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs @@ -7,7 +7,6 @@ using Content.Server.Projectiles.Components; using Content.Shared.Interaction; 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; diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs index c708cfd0ed..0ffdb708ce 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs @@ -10,7 +10,6 @@ using Content.Shared.Popups; using Content.Shared.Sound; using Content.Shared.Weapons.Ranged; using Content.Shared.Weapons.Ranged.Barrels.Components; -using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Damage/Systems/DamageableSystem.cs b/Content.Shared/Damage/Systems/DamageableSystem.cs index ab29607352..d757cb4616 100644 --- a/Content.Shared/Damage/Systems/DamageableSystem.cs +++ b/Content.Shared/Damage/Systems/DamageableSystem.cs @@ -119,7 +119,7 @@ namespace Content.Shared.Damage SetTotalDamage(component, component.Damage.Total); component.Dirty(); - if (EntityManager.TryGetComponent(component.OwnerUid, out var appearance) && damageDelta != null) + if (EntityManager.TryGetComponent(component.OwnerUid, out var appearance) && damageDelta != null) appearance.SetData(DamageVisualizerKeys.DamageUpdateGroups, damageDelta.GetDamagePerGroup().Keys.ToList()); RaiseLocalEvent(component.OwnerUid, new DamageChangedEvent(component, damageDelta, interruptsDoAfters), false); } diff --git a/Content.Shared/Doors/SharedDoorComponent.cs b/Content.Shared/Doors/SharedDoorComponent.cs index 812043d6ea..dbf0ad3aa5 100644 --- a/Content.Shared/Doors/SharedDoorComponent.cs +++ b/Content.Shared/Doors/SharedDoorComponent.cs @@ -17,7 +17,7 @@ namespace Content.Shared.Doors public override string Name => "Door"; [ComponentDependency] - protected readonly SharedAppearanceComponent? AppearanceComponent = null; + protected readonly AppearanceComponent? AppearanceComponent = null; [ComponentDependency] protected readonly IPhysBody? PhysicsComponent = null; diff --git a/Content.Shared/Hands/Components/SharedHandsComponent.cs b/Content.Shared/Hands/Components/SharedHandsComponent.cs index a47c7f4581..bbd3ad1776 100644 --- a/Content.Shared/Hands/Components/SharedHandsComponent.cs +++ b/Content.Shared/Hands/Components/SharedHandsComponent.cs @@ -100,7 +100,7 @@ namespace Content.Shared.Hands.Components public void UpdateHandVisualizer() { - if (!Owner.TryGetComponent(out SharedAppearanceComponent? appearance)) + if (!Owner.TryGetComponent(out AppearanceComponent? appearance)) return; var hands = new List(); diff --git a/Content.Shared/MobState/State/SharedCriticalMobState.cs b/Content.Shared/MobState/State/SharedCriticalMobState.cs index 0962cc3ca8..4da171f79a 100644 --- a/Content.Shared/MobState/State/SharedCriticalMobState.cs +++ b/Content.Shared/MobState/State/SharedCriticalMobState.cs @@ -22,7 +22,7 @@ namespace Content.Shared.MobState.State EntitySystem.Get().Down(uid); - if (entityManager.TryGetComponent(uid, out SharedAppearanceComponent? appearance)) + if (entityManager.TryGetComponent(uid, out AppearanceComponent? appearance)) { appearance.SetData(DamageStateVisuals.State, DamageState.Critical); } diff --git a/Content.Shared/MobState/State/SharedDeadMobState.cs b/Content.Shared/MobState/State/SharedDeadMobState.cs index 9f2b6e4198..55cc2932d3 100644 --- a/Content.Shared/MobState/State/SharedDeadMobState.cs +++ b/Content.Shared/MobState/State/SharedDeadMobState.cs @@ -21,7 +21,7 @@ namespace Content.Shared.MobState.State physics.CanCollide = false; } - if (entityManager.TryGetComponent(uid, out SharedAppearanceComponent? appearance)) + if (entityManager.TryGetComponent(uid, out AppearanceComponent? appearance)) { appearance.SetData(DamageStateVisuals.State, DamageState.Dead); } diff --git a/Content.Shared/MobState/State/SharedNormalMobState.cs b/Content.Shared/MobState/State/SharedNormalMobState.cs index f90c40d823..0a0f0d3a22 100644 --- a/Content.Shared/MobState/State/SharedNormalMobState.cs +++ b/Content.Shared/MobState/State/SharedNormalMobState.cs @@ -16,7 +16,7 @@ namespace Content.Shared.MobState.State base.EnterState(uid, entityManager); EntitySystem.Get().Stand(uid); - if (entityManager.TryGetComponent(uid, out SharedAppearanceComponent? appearance)) + if (entityManager.TryGetComponent(uid, out AppearanceComponent? appearance)) { appearance.SetData(DamageStateVisuals.State, DamageState.Alive); } diff --git a/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs b/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs index 23f309f3cb..51da449a78 100644 --- a/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs @@ -44,7 +44,7 @@ namespace Content.Shared.Nutrition.EntitySystems creamPied.CreamPied = value; - if (EntityManager.TryGetComponent(uid, out SharedAppearanceComponent? appearance)) + if (EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance)) { appearance.SetData(CreamPiedVisuals.Creamed, value); } diff --git a/Content.Shared/Singularity/SharedSingularitySystem.cs b/Content.Shared/Singularity/SharedSingularitySystem.cs index e7c706ed46..c374c76e31 100644 --- a/Content.Shared/Singularity/SharedSingularitySystem.cs +++ b/Content.Shared/Singularity/SharedSingularitySystem.cs @@ -69,7 +69,7 @@ namespace Content.Shared.Singularity pulse.RadsPerSecond = 10 * value; } - if (singularity.Owner.TryGetComponent(out SharedAppearanceComponent? appearance)) + if (singularity.Owner.TryGetComponent(out AppearanceComponent? appearance)) { appearance.SetData(SingularityVisuals.Level, value); } diff --git a/Content.Shared/Stacks/SharedStackSystem.cs b/Content.Shared/Stacks/SharedStackSystem.cs index 6ca7a99e6d..0993b077a7 100644 --- a/Content.Shared/Stacks/SharedStackSystem.cs +++ b/Content.Shared/Stacks/SharedStackSystem.cs @@ -51,7 +51,7 @@ namespace Content.Shared.Stacks EntityManager.QueueDeleteEntity(uid); // Change appearance data. - if (EntityManager.TryGetComponent(uid, out SharedAppearanceComponent? appearance)) + if (EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance)) appearance.SetData(StackVisuals.Actual, component.Count); RaiseLocalEvent(uid, new StackCountChangedEvent(old, component.Count), false); @@ -83,7 +83,7 @@ namespace Content.Shared.Stacks private void OnStackStarted(EntityUid uid, SharedStackComponent component, ComponentStartup args) { - if (!EntityManager.TryGetComponent(uid, out SharedAppearanceComponent? appearance)) + if (!EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance)) return; appearance.SetData(StackVisuals.Actual, component.Count); diff --git a/Content.Shared/Standing/StandingStateSystem.cs b/Content.Shared/Standing/StandingStateSystem.cs index f12f51a465..7e5c3758e0 100644 --- a/Content.Shared/Standing/StandingStateSystem.cs +++ b/Content.Shared/Standing/StandingStateSystem.cs @@ -24,7 +24,7 @@ namespace Content.Shared.Standing public bool Down(EntityUid uid, bool playSound = true, bool dropHeldItems = true, StandingStateComponent? standingState = null, - SharedAppearanceComponent? appearance = null, + AppearanceComponent? appearance = null, SharedHandsComponent? hands = null) { // TODO: This should actually log missing comps... @@ -70,7 +70,7 @@ namespace Content.Shared.Standing public bool Stand(EntityUid uid, StandingStateComponent? standingState = null, - SharedAppearanceComponent? appearance = null) + AppearanceComponent? appearance = null) { // TODO: This should actually log missing comps... if (!Resolve(uid, ref standingState, false)) diff --git a/Content.Shared/Storage/EntitySystems/SharedItemCounterSystem.cs b/Content.Shared/Storage/EntitySystems/SharedItemCounterSystem.cs index 66dec9829c..018962581e 100644 --- a/Content.Shared/Storage/EntitySystems/SharedItemCounterSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedItemCounterSystem.cs @@ -20,7 +20,7 @@ namespace Content.Shared.Storage.EntitySystems private void CounterEntityInserted(EntityUid uid, ItemCounterComponent itemCounter, EntInsertedIntoContainerMessage args) { - if (!itemCounter.Owner.TryGetComponent(out SharedAppearanceComponent? appearanceComponent)) return; + if (!itemCounter.Owner.TryGetComponent(out AppearanceComponent? appearanceComponent)) return; var count = GetCount(args, itemCounter); if (count == null) @@ -35,7 +35,7 @@ namespace Content.Shared.Storage.EntitySystems private void CounterEntityRemoved(EntityUid uid, ItemCounterComponent itemCounter, EntRemovedFromContainerMessage args) { - if (!itemCounter.Owner.TryGetComponent(out SharedAppearanceComponent? appearanceComponent)) return; + if (!itemCounter.Owner.TryGetComponent(out AppearanceComponent? appearanceComponent)) return; var count = GetCount(args, itemCounter); if (count == null) diff --git a/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs b/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs index 5e257906d4..9609387567 100644 --- a/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs @@ -20,7 +20,7 @@ namespace Content.Shared.Storage.EntitySystems private void InitLayers(EntityUid uid, ItemMapperComponent component, ComponentInit args) { - if (component.Owner.TryGetComponent(out SharedAppearanceComponent? appearanceComponent)) + if (component.Owner.TryGetComponent(out AppearanceComponent? appearanceComponent)) { var list = new List(component.MapLayers.Keys); appearanceComponent.SetData(StorageMapVisuals.InitLayers, new ShowLayerData(list)); @@ -30,7 +30,7 @@ namespace Content.Shared.Storage.EntitySystems private void MapperEntityRemoved(EntityUid uid, ItemMapperComponent itemMapper, EntRemovedFromContainerMessage args) { - if (itemMapper.Owner.TryGetComponent(out SharedAppearanceComponent? appearanceComponent) + if (itemMapper.Owner.TryGetComponent(out AppearanceComponent? appearanceComponent) && TryGetLayers(args, itemMapper, out var containedLayers)) { appearanceComponent.SetData(StorageMapVisuals.LayerChanged, new ShowLayerData(containedLayers)); @@ -40,7 +40,7 @@ namespace Content.Shared.Storage.EntitySystems private void MapperEntityInserted(EntityUid uid, ItemMapperComponent itemMapper, EntInsertedIntoContainerMessage args) { - if (itemMapper.Owner.TryGetComponent(out SharedAppearanceComponent? appearanceComponent) + if (itemMapper.Owner.TryGetComponent(out AppearanceComponent? appearanceComponent) && TryGetLayers(args, itemMapper, out var containedLayers)) { appearanceComponent.SetData(StorageMapVisuals.LayerChanged, new ShowLayerData(containedLayers)); diff --git a/Content.Shared/SubFloor/SubFloorHideSystem.cs b/Content.Shared/SubFloor/SubFloorHideSystem.cs index de1b9092b4..f31402e800 100644 --- a/Content.Shared/SubFloor/SubFloorHideSystem.cs +++ b/Content.Shared/SubFloor/SubFloorHideSystem.cs @@ -192,7 +192,7 @@ namespace Content.Shared.SubFloor } // Set an appearance data value so visualizers can use this as needed. - if (EntityManager.TryGetComponent(uid, out SharedAppearanceComponent? appearanceComponent)) + if (EntityManager.TryGetComponent(uid, out AppearanceComponent? appearanceComponent)) { appearanceComponent.SetData(SubFloorVisuals.SubFloor, subFloorVisible); }