Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Felinid fixes and stuff. (#524)

Browse Source 
* - add: Felinid fixes and stuff.

* - fix: Fix felinids disappearing.
This commit is contained in:
Aviu00
2024-08-01 00:36:09 +00:00
committed by GitHub
parent 537417d39f
commit c8548f8dd6
6 changed files with 113 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,7 +227,7 @@ public abstract class SharedStorageSystem : EntitySystem
if (TryComp<VirtualItemComponent>(args.Used, out var virtualItem)) // WD
{
RaiseLocalEvent(uid, new PseudoItemInteractEvent(virtualItem.BlockingEntity, args.User));
RaiseLocalEvent(uid, new PseudoItemInteractEvent(virtualItem.BlockingEntity, args.User, args.Used));
return;
}
@@ -517,6 +517,9 @@ public abstract class SharedStorageSystem : EntitySystem
if (!ActionBlocker.CanInteract(player, itemEnt))
return;
if (HasComp<PseudoItemComponent>(itemEnt)) // WD
return;
TransformSystem.DropNextTo(itemEnt, player);
Audio.PlayPredicted(storageComp.StorageRemoveSound, storageEnt, player);
}
@@ -681,6 +684,8 @@ public abstract class SharedStorageSystem : EntitySystem
foreach (var entity in entities.ToArray())
{
if (HasComp<PseudoItemComponent>(entity)) // WD
continue;
Insert(target, entity, out _, user: user, targetComp, playSound: false);
}