juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'space-station-14/master' into ed-02-06-2024-upstream

Browse Source
This commit is contained in:
Ed
2024-06-02 11:01:34 +03:00
parent b032c38917 ba04f94e48
commit 6a5fae3403
518 changed files with 20010 additions and 13172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
View File

@@ -109,7 +109,7 @@ public sealed class BluespaceLockerSystem : EntitySystem
// Move contained air
if (component.BehaviorProperties.TransportGas)
{
entityStorageComponent.Air.CopyFromMutable(target.Value.storageComponent.Air);
entityStorageComponent.Air.CopyFrom(target.Value.storageComponent.Air);
target.Value.storageComponent.Air.Clear();
}
@@ -326,7 +326,7 @@ public sealed class BluespaceLockerSystem : EntitySystem
// Move contained air
if (component.BehaviorProperties.TransportGas)
{
target.Value.storageComponent.Air.CopyFromMutable(entityStorageComponent.Air);
target.Value.storageComponent.Air.CopyFrom(entityStorageComponent.Air);
entityStorageComponent.Air.Clear();
}

6
Content.Server/Storage/EntitySystems/PickRandomSystem.cs
View File

@@ -4,6 +4,7 @@ using Content.Shared.Database;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Storage;
using Content.Shared.Verbs;
using Content.Shared.Whitelist;
using Robust.Shared.Containers;
using Robust.Shared.Random;
@@ -15,6 +16,7 @@ public sealed class PickRandomSystem : EntitySystem
[Dependency] private readonly SharedContainerSystem _container = default!;
[Dependency] private readonly SharedHandsSystem _hands = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
public override void Initialize()
{
@@ -30,7 +32,7 @@ public sealed class PickRandomSystem : EntitySystem
var user = args.User;
var enabled = storage.Container.ContainedEntities.Any(item => comp.Whitelist?.IsValid(item, EntityManager) ?? true);
var enabled = storage.Container.ContainedEntities.Any(item => _whitelistSystem.IsWhitelistPassOrNull(comp.Whitelist, item));
// alt-click / alt-z to pick an item
args.Verbs.Add(new AlternativeVerb
@@ -48,7 +50,7 @@ public sealed class PickRandomSystem : EntitySystem
private void TryPick(EntityUid uid, PickRandomComponent comp, StorageComponent storage, EntityUid user)
{
var entities = storage.Container.ContainedEntities.Where(item => comp.Whitelist?.IsValid(item, EntityManager) ?? true).ToArray();
var entities = storage.Container.ContainedEntities.Where(item => _whitelistSystem.IsWhitelistPassOrNull(comp.Whitelist, item)).ToArray();
if (!entities.Any())
return;