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

Merge remote-tracking branch 'upstream/master' into ed-27-09-2024-upstream

Browse Source 
# Conflicts:
#	Content.Server/Explosion/EntitySystems/TriggerSystem.cs
This commit is contained in:
Ed
2024-09-27 10:22:05 +03:00
parent c2704165d3 0d26bb0320
commit 1df3ed177b
373 changed files with 47135 additions and 26244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
View File

@@ -368,7 +368,9 @@ public abstract class SharedStorageSystem : EntitySystem
if (args.Handled || !CanInteract(args.User, (uid, storageComp), storageComp.ClickInsert, false))
return;
if (HasComp<PlaceableSurfaceComponent>(uid))
var attemptEv = new StorageInteractUsingAttemptEvent();
RaiseLocalEvent(uid, ref attemptEv);
if (attemptEv.Cancelled)
return;
if (_whitelistSystem.IsWhitelistPass(storageComp.CP14Ignorelist, args.Used))
@@ -458,7 +460,7 @@ public abstract class SharedStorageSystem : EntitySystem
}
//If there's only one then let's be generous
if (_entList.Count > 1)
if (_entList.Count >= 1)
{
var doAfterArgs = new DoAfterArgs(EntityManager, args.User, delay, new AreaPickupDoAfterEvent(GetNetEntityList(_entList)), uid, target: uid)
{
@@ -552,7 +554,7 @@ public abstract class SharedStorageSystem : EntitySystem
var angle = targetXform.LocalRotation;
if (PlayerInsertEntityInWorld((uid, component), args.Args.User, entity))
if (PlayerInsertEntityInWorld((uid, component), args.Args.User, entity, playSound: false))
{
successfullyInserted.Add(entity);
successfullyInsertedPositions.Add(position);
@@ -1045,12 +1047,12 @@ public abstract class SharedStorageSystem : EntitySystem
/// <param name="player">The player to insert an entity with</param>
/// <param name="toInsert"></param>
/// <returns>true if inserted, false otherwise</returns>
public bool PlayerInsertEntityInWorld(Entity<StorageComponent?> uid, EntityUid player, EntityUid toInsert)
public bool PlayerInsertEntityInWorld(Entity<StorageComponent?> uid, EntityUid player, EntityUid toInsert, bool playSound = true)
{
if (!Resolve(uid, ref uid.Comp) || !_interactionSystem.InRangeUnobstructed(player, uid.Owner))
return false;
if (!Insert(uid, toInsert, out _, user: player, uid.Comp))
if (!Insert(uid, toInsert, out _, user: player, uid.Comp, playSound: playSound))
{
_popupSystem.PopupClient(Loc.GetString("comp-storage-cant-insert"), uid, player);
return false;