diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs index 2e56c85070..ec98dd115e 100644 --- a/Content.Client/Clothing/ClientClothingSystem.cs +++ b/Content.Client/Clothing/ClientClothingSystem.cs @@ -219,8 +219,7 @@ public sealed class ClientClothingSystem : ClothingSystem if (slot == "jumpsuit" && sprite.LayerMapTryGet(HumanoidVisualLayers.StencilMask, out var suitLayer)) { - if (_appearance.TryGetData(equipee, HumanoidVisualizerKey.Key, out object? obj) - && obj is HumanoidVisualizerData data + if (_appearance.TryGetData(equipee, HumanoidVisualizerKey.Key, out var data) && data.Sex == Sex.Female) { sprite.LayerSetState(suitLayer, clothingComponent.FemaleMask switch diff --git a/Content.Client/VendingMachines/VendingMachineSystem.cs b/Content.Client/VendingMachines/VendingMachineSystem.cs index c18c29fc27..1da408254c 100644 --- a/Content.Client/VendingMachines/VendingMachineSystem.cs +++ b/Content.Client/VendingMachines/VendingMachineSystem.cs @@ -23,8 +23,7 @@ public sealed class VendingMachineSystem : SharedVendingMachineSystem return; if (!TryComp(uid, out var appearance) || - !_appearanceSystem.TryGetData(uid, VendingMachineVisuals.VisualState, out var visualStateObject, appearance) || - visualStateObject is not VendingMachineVisualState visualState) + !_appearanceSystem.TryGetData(uid, VendingMachineVisuals.VisualState, out var visualState, appearance)) { visualState = VendingMachineVisualState.Normal; } @@ -147,7 +146,7 @@ public enum VendingMachineVisualLayers : byte Base, /// /// Normal / Deny / Eject - /// + /// BaseUnshaded, /// /// Screens that are persistent (where the machine is not off or broken) diff --git a/Content.Client/Xenoarchaeology/XenoArtifacts/RandomArtifactSpriteSystem.cs b/Content.Client/Xenoarchaeology/XenoArtifacts/RandomArtifactSpriteSystem.cs index 0345c0cdce..3be9b02748 100644 --- a/Content.Client/Xenoarchaeology/XenoArtifacts/RandomArtifactSpriteSystem.cs +++ b/Content.Client/Xenoarchaeology/XenoArtifacts/RandomArtifactSpriteSystem.cs @@ -10,12 +10,10 @@ public sealed class RandomArtifactSpriteSystem : VisualizerSystem(uid, SharedArtifactsVisuals.SpriteIndex, out var spriteIndex, args.Component)) return; - if (!AppearanceSystem.TryGetData(uid, SharedArtifactsVisuals.IsActivated, out var act, args.Component) - || act is not bool isActivated) + if (!AppearanceSystem.TryGetData(uid, SharedArtifactsVisuals.IsActivated, out var isActivated, args.Component)) isActivated = false; var spriteIndexStr = spriteIndex.ToString("D2");