diff --git a/Content.Client/Commands/HideMechanismsCommand.cs b/Content.Client/Commands/HideMechanismsCommand.cs index 5f9afc78b9..97d792628a 100644 --- a/Content.Client/Commands/HideMechanismsCommand.cs +++ b/Content.Client/Commands/HideMechanismsCommand.cs @@ -30,7 +30,7 @@ public sealed class HideMechanismsCommand : LocalizedCommands sprite.ContainerOccluded = false; var tempParent = uid; - while (containerSys.TryGetContainingContainer(tempParent, out var container)) + while (containerSys.TryGetContainingContainer((tempParent, null, null), out var container)) { if (!container.ShowContents) { diff --git a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs index fc863648d7..9b14e01fb5 100644 --- a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs +++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs @@ -206,7 +206,7 @@ namespace Content.Client.Instruments.UI var container = _entManager.System(); // If we're a handheld instrument, we might be in a container. Get it just in case. - container.TryGetContainingContainer(Entity, out var conMan); + container.TryGetContainingContainer((Entity, null, null), out var conMan); // If the instrument is handheld and we're not holding it, we return. if (instrument.Handheld && (conMan == null || conMan.Owner != localEntity)) diff --git a/Content.Client/Items/Systems/ItemSystem.cs b/Content.Client/Items/Systems/ItemSystem.cs index 5e60d06d0c..2b5a41c6ce 100644 --- a/Content.Client/Items/Systems/ItemSystem.cs +++ b/Content.Client/Items/Systems/ItemSystem.cs @@ -43,7 +43,7 @@ public sealed class ItemSystem : SharedItemSystem public override void VisualsChanged(EntityUid uid) { // if the item is in a container, it might be equipped to hands or inventory slots --> update visuals. - if (Container.TryGetContainingContainer(uid, out var container)) + if (Container.TryGetContainingContainer((uid, null, null), out var container)) RaiseLocalEvent(container.Owner, new VisualsChangedEvent(GetNetEntity(uid), container.ID)); } diff --git a/Content.Client/Movement/Systems/JetpackSystem.cs b/Content.Client/Movement/Systems/JetpackSystem.cs index e25300d44c..2954140d79 100644 --- a/Content.Client/Movement/Systems/JetpackSystem.cs +++ b/Content.Client/Movement/Systems/JetpackSystem.cs @@ -64,15 +64,15 @@ public sealed class JetpackSystem : SharedJetpackSystem private void CreateParticles(EntityUid uid) { + var uidXform = Transform(uid); // Don't show particles unless the user is moving. - if (Container.TryGetContainingContainer(uid, out var container) && + if (Container.TryGetContainingContainer((uid, uidXform, null), out var container) && TryComp(container.Owner, out var body) && body.LinearVelocity.LengthSquared() < 1f) { return; } - var uidXform = Transform(uid); var coordinates = uidXform.Coordinates; var gridUid = _transform.GetGrid(coordinates); diff --git a/Content.Server/Atmos/Rotting/RottingSystem.cs b/Content.Server/Atmos/Rotting/RottingSystem.cs index 5070b3f197..43dddce4a4 100644 --- a/Content.Server/Atmos/Rotting/RottingSystem.cs +++ b/Content.Server/Atmos/Rotting/RottingSystem.cs @@ -34,7 +34,7 @@ public sealed class RottingSystem : SharedRottingSystem if (!TryComp(uid, out var perishable)) return; - var molsToDump = perishable.MolsPerSecondPerUnitMass * physics.FixturesMass * (float) component.TotalRotTime.TotalSeconds; + var molsToDump = perishable.MolsPerSecondPerUnitMass * physics.FixturesMass * (float)component.TotalRotTime.TotalSeconds; var tileMix = _atmosphere.GetTileMixture(uid, excite: true); tileMix?.AdjustMoles(Gas.Ammonia, molsToDump); } @@ -54,7 +54,7 @@ public sealed class RottingSystem : SharedRottingSystem /// private float GetRotRate(EntityUid uid) { - if (_container.TryGetContainingContainer(uid, out var container) && + if (_container.TryGetContainingContainer((uid, null, null), out var container) && TryComp(container.Owner, out var rotContainer)) { return rotContainer.DecayModifier; @@ -124,7 +124,7 @@ public sealed class RottingSystem : SharedRottingSystem continue; // We need a way to get the mass of the mob alone without armor etc in the future // or just remove the mass mechanics altogether because they aren't good. - var molRate = perishable.MolsPerSecondPerUnitMass * (float) rotting.RotUpdateRate.TotalSeconds; + var molRate = perishable.MolsPerSecondPerUnitMass * (float)rotting.RotUpdateRate.TotalSeconds; var tileMix = _atmosphere.GetTileMixture(uid, excite: true); tileMix?.AdjustMoles(Gas.Ammonia, molRate * physics.FixturesMass); } diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs index 4cbf2e63be..89c4635b0c 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs @@ -138,7 +138,7 @@ public sealed partial class CargoSystem return; // make sure this label was actually applied to a crate. - if (!_container.TryGetContainingContainer(uid, out var container) || container.ID != LabelSystem.ContainerName) + if (!_container.TryGetContainingContainer((uid, null, null), out var container) || container.ID != LabelSystem.ContainerName) return; if (component.AssociatedStationId is not { } station || !TryComp(station, out var database)) diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs index a33c944c99..7f8253efed 100644 --- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs @@ -142,7 +142,7 @@ namespace Content.Server.Nutrition.EntitySystems // This is awful. I hate this so much. // TODO: Please, someone refactor containers and free me from this bullshit. - if (!_container.TryGetContainingContainer(uid, out var containerManager) || + if (!_container.TryGetContainingContainer((uid, null, null), out var containerManager) || !(_inventorySystem.TryGetSlotEntity(containerManager.Owner, "mask", out var inMaskSlotUid) && inMaskSlotUid == uid) || !TryComp(containerManager.Owner, out BloodstreamComponent? bloodstream)) { diff --git a/Content.Server/PDA/PdaSystem.cs b/Content.Server/PDA/PdaSystem.cs index 43bf571eb4..691d024ecd 100644 --- a/Content.Server/PDA/PdaSystem.cs +++ b/Content.Server/PDA/PdaSystem.cs @@ -123,7 +123,7 @@ namespace Content.Server.PDA { _ringer.RingerPlayRingtone(ent.Owner); - if (!_containerSystem.TryGetContainingContainer(ent, out var container) + if (!_containerSystem.TryGetContainingContainer((ent, null, null), out var container) || !TryComp(container.Owner, out var actor)) return; diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.cs index d4a9159d44..daff200982 100644 --- a/Content.Server/Polymorph/Systems/PolymorphSystem.cs +++ b/Content.Server/Polymorph/Systems/PolymorphSystem.cs @@ -211,7 +211,7 @@ public sealed partial class PolymorphSystem : EntitySystem var childXform = Transform(child); _transform.SetLocalRotation(child, targetTransformComp.LocalRotation, childXform); - if (_container.TryGetContainingContainer(uid, out var cont)) + if (_container.TryGetContainingContainer((uid, targetTransformComp, null), out var cont)) _container.Insert(child, cont); //Transfers all damage from the original to the new one diff --git a/Content.Server/PowerCell/PowerCellSystem.cs b/Content.Server/PowerCell/PowerCellSystem.cs index 0d2d9012bc..f7b4cf0249 100644 --- a/Content.Server/PowerCell/PowerCellSystem.cs +++ b/Content.Server/PowerCell/PowerCellSystem.cs @@ -64,11 +64,11 @@ public sealed partial class PowerCellSystem : SharedPowerCellSystem } var frac = args.Charge / args.MaxCharge; - var level = (byte) ContentHelpers.RoundToNearestLevels(frac, 1, PowerCellComponent.PowerCellVisualsLevels); + var level = (byte)ContentHelpers.RoundToNearestLevels(frac, 1, PowerCellComponent.PowerCellVisualsLevels); _sharedAppearanceSystem.SetData(uid, PowerCellVisuals.ChargeLevel, level); // If this power cell is inside a cell-slot, inform that entity that the power has changed (for updating visuals n such). - if (_containerSystem.TryGetContainingContainer(uid, out var container) + if (_containerSystem.TryGetContainingContainer((uid, null, null), out var container) && TryComp(container.Owner, out PowerCellSlotComponent? slot) && _itemSlotsSystem.TryGetSlot(container.Owner, slot.CellSlotId, out var itemSlot)) { diff --git a/Content.Server/Resist/EscapeInventorySystem.cs b/Content.Server/Resist/EscapeInventorySystem.cs index 35c7d0bc65..041257d78d 100644 --- a/Content.Server/Resist/EscapeInventorySystem.cs +++ b/Content.Server/Resist/EscapeInventorySystem.cs @@ -34,7 +34,7 @@ public sealed class EscapeInventorySystem : EntitySystem if (!args.HasDirectionalMovement) return; - if (!_containerSystem.TryGetContainingContainer(uid, out var container) || !_actionBlockerSystem.CanInteract(uid, container.Owner)) + if (!_containerSystem.TryGetContainingContainer((uid, null, null), out var container) || !_actionBlockerSystem.CanInteract(uid, container.Owner)) return; // Make sure there's nothing stopped the removal (like being glued) diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs index e6c627f353..6e3d9e9251 100644 --- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs +++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs @@ -95,7 +95,7 @@ public sealed class EventHorizonSystem : SharedEventHorizonSystem return; // Handle singularities some admin smited into a locker. - if (_containerSystem.TryGetContainingContainer(uid, out var container, transform: xform) + if (_containerSystem.TryGetContainingContainer((uid, xform, null), out var container) && !AttemptConsumeEntity(uid, container.Owner, eventHorizon)) { // Locker is indestructible. Consume everything else in the locker instead of magically teleporting out. @@ -214,7 +214,7 @@ public sealed class EventHorizonSystem : SharedEventHorizonSystem if (_containerSystem.Insert(entity, target_container)) break; - _containerSystem.TryGetContainingContainer(target_container.Owner, out target_container); + _containerSystem.TryGetContainingContainer((target_container.Owner, null, null), out target_container); } // If we couldn't or there was no container to insert into just dump them to the map/grid. @@ -470,7 +470,7 @@ public sealed class EventHorizonSystem : SharedEventHorizonSystem { var drop_container = args.Container; if (drop_container is null) - _containerSystem.TryGetContainingContainer(uid, out drop_container); + _containerSystem.TryGetContainingContainer((uid, null, null), out drop_container); foreach (var container in comp.GetAllContainers()) { diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs index 1c315869c8..f83dd50c99 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs @@ -124,7 +124,7 @@ public partial class SharedBodySystem /// public bool RemoveOrgan(EntityUid organId, OrganComponent? organ = null) { - if (!Containers.TryGetContainingContainer(organId, out var container)) + if (!Containers.TryGetContainingContainer((organId, null, null), out var container)) return false; var parent = container.Owner; diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs index ee79faa0b8..0917197e29 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs @@ -189,7 +189,7 @@ public partial class SharedBodySystem /// public EntityUid? GetParentPartOrNull(EntityUid uid) { - if (!Containers.TryGetContainingContainer(uid, out var container)) + if (!Containers.TryGetContainingContainer((uid, null, null), out var container)) return null; var parent = container.Owner; @@ -205,7 +205,7 @@ public partial class SharedBodySystem /// public (EntityUid Parent, string Slot)? GetParentPartAndSlotOrNull(EntityUid uid) { - if (!Containers.TryGetContainingContainer(uid, out var container)) + if (!Containers.TryGetContainingContainer((uid, null, null), out var container)) return null; var slotId = GetPartSlotContainerIdFromContainer(container.ID); @@ -235,7 +235,7 @@ public partial class SharedBodySystem parentUid = null; parentComponent = null; - if (Containers.TryGetContainingContainer(partUid, out var container) && + if (Containers.TryGetContainingContainer((partUid, null, null), out var container) && TryComp(container.Owner, out parentComponent)) { parentUid = container.Owner; diff --git a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs index 897f379156..21afd4e591 100644 --- a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs +++ b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs @@ -48,7 +48,7 @@ public sealed class ClothingSpeedModifierSystem : EntitySystem // Avoid raising the event for the container if nothing changed. // We'll still set the values in case they're slightly different but within tolerance. - if (diff && _container.TryGetContainingContainer(uid, out var container)) + if (diff && _container.TryGetContainingContainer((uid, null, null), out var container)) { _movementSpeed.RefreshMovementSpeedModifiers(container.Owner); } @@ -112,7 +112,7 @@ public sealed class ClothingSpeedModifierSystem : EntitySystem // make sentient boots slow or fast too _movementSpeed.RefreshMovementSpeedModifiers(ent); - if (_container.TryGetContainingContainer(ent.Owner, out var container)) + if (_container.TryGetContainingContainer((ent.Owner, null, null), out var container)) { // inventory system will automatically hook into the event raised by this and update accordingly _movementSpeed.RefreshMovementSpeedModifiers(container.Owner); diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs index 14137b3836..082b040a32 100644 --- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs @@ -162,7 +162,7 @@ public abstract class ClothingSystem : EntitySystem if (args.Current is ClothingComponentState state) { SetEquippedPrefix(uid, state.EquippedPrefix, component); - if (component.InSlot != null && _containerSys.TryGetContainingContainer(uid, out var container)) + if (component.InSlot != null && _containerSys.TryGetContainingContainer((uid, null, null), out var container)) { CheckEquipmentForLayerHide(uid, container.Owner); } diff --git a/Content.Shared/Clothing/MagbootsSystem.cs b/Content.Shared/Clothing/MagbootsSystem.cs index 88d987aae1..d41f27fefb 100644 --- a/Content.Shared/Clothing/MagbootsSystem.cs +++ b/Content.Shared/Clothing/MagbootsSystem.cs @@ -36,7 +36,7 @@ public sealed class SharedMagbootsSystem : EntitySystem { var (uid, comp) = ent; // only stick to the floor if being worn in the correct slot - if (_container.TryGetContainingContainer(uid, out var container) && + if (_container.TryGetContainingContainer((uid, null, null), out var container) && _inventory.TryGetSlotEntity(container.Owner, comp.Slot, out var worn) && uid == worn) { diff --git a/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs b/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs index c13ec0a1b9..78e86f5ab4 100644 --- a/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs +++ b/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs @@ -37,7 +37,7 @@ public sealed class DamageOnHoldingSystem : EntitySystem { if (!component.Enabled || component.NextDamage > _timing.CurTime) continue; - if (_container.TryGetContainingContainer(uid, out var container)) + if (_container.TryGetContainingContainer((uid, null, null), out var container)) { _damageableSystem.TryChangeDamage(container.Owner, component.Damage, origin: uid); } diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index a57796d87c..972fa389e4 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -1171,7 +1171,7 @@ namespace Content.Shared.Interaction /// public bool CanAccessViaStorage(EntityUid user, EntityUid target) { - if (!_containerSystem.TryGetContainingContainer(target, out var container)) + if (!_containerSystem.TryGetContainingContainer((target, null, null), out var container)) return false; return CanAccessViaStorage(user, target, container); @@ -1197,7 +1197,7 @@ namespace Content.Shared.Interaction if (Deleted(target)) return false; - if (!_containerSystem.TryGetContainingContainer(target, out var container)) + if (!_containerSystem.TryGetContainingContainer((target, null, null), out var container)) return false; var wearer = container.Owner; diff --git a/Content.Shared/Item/SharedItemSystem.cs b/Content.Shared/Item/SharedItemSystem.cs index 5eaa25f484..a058cb8658 100644 --- a/Content.Shared/Item/SharedItemSystem.cs +++ b/Content.Shared/Item/SharedItemSystem.cs @@ -110,8 +110,8 @@ public abstract class SharedItemSystem : EntitySystem // if the item already in a container (that is not the same as the user's), then change the text. // this occurs when the item is in their inventory or in an open backpack - Container.TryGetContainingContainer(args.User, out var userContainer); - if (Container.TryGetContainingContainer(args.Target, out var container) && container != userContainer) + Container.TryGetContainingContainer((args.User, null, null), out var userContainer); + if (Container.TryGetContainingContainer((args.Target, null, null), out var container) && container != userContainer) verb.Text = Loc.GetString("pick-up-verb-get-data-text-inventory"); else verb.Text = Loc.GetString("pick-up-verb-get-data-text"); diff --git a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs index 9a7da17d48..866148b113 100644 --- a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs +++ b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs @@ -97,7 +97,7 @@ public abstract class SharedMaterialReclaimerSystem : EntitySystem _whitelistSystem.IsBlacklistPass(component.Blacklist, item)) return false; - if (Container.TryGetContainingContainer(item, out _) && !Container.TryRemoveFromContainer(item)) + if (Container.TryGetContainingContainer((item, null, null), out _) && !Container.TryRemoveFromContainer(item)) return false; if (user != null) diff --git a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs index 724eca682f..276aa62032 100644 --- a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs +++ b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs @@ -13,12 +13,12 @@ namespace Content.Shared.Movement.Systems; public abstract class SharedJetpackSystem : EntitySystem { - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; - [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; + [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; + [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; [Dependency] protected readonly SharedContainerSystem Container = default!; - [Dependency] private readonly SharedMoverController _mover = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private readonly SharedMoverController _mover = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly SharedPhysicsSystem _physics = default!; [Dependency] private readonly ActionContainerSystem _actionContainer = default!; public override void Initialize() @@ -158,7 +158,7 @@ public abstract class SharedJetpackSystem : EntitySystem if (user == null) { - Container.TryGetContainingContainer(uid, out var container); + Container.TryGetContainingContainer((uid, null, null), out var container); user = container?.Owner; } diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs index 7a207fb47c..cac3b86ad6 100644 --- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs @@ -1431,7 +1431,7 @@ public abstract class SharedStorageSystem : EntitySystem private void OnStackCountChanged(EntityUid uid, MetaDataComponent component, StackCountChangedEvent args) { - if (_containerSystem.TryGetContainingContainer(uid, out var container, component) && + if (_containerSystem.TryGetContainingContainer((uid, null, component), out var container) && container.ID == StorageComponent.ContainerId) { UpdateAppearance(container.Owner); diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs index d4aa024f4c..7ef57df539 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs @@ -33,7 +33,7 @@ public partial class SharedGunSystem { slotEntity = null; - if (!Containers.TryGetContainingContainer(uid, out var container)) + if (!Containers.TryGetContainingContainer((uid, null, null), out var container)) return false; var user = container.Owner;