tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement SmartFridge functionality (#38648)

Browse Source 
* Add SmartFridge

* my nit so pick

* my access so expanded and my whitelist so both

* list -> hashset
This commit is contained in:
pathetic meowmeow
2025-07-20 23:21:28 -04:00
committed by GitHub
parent 99b431cafd
commit d2ddbcbcda
17 changed files with 719 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
Content.Shared/Storage/EntitySystems/DumpableSystem.cs
View File

@@ -1,11 +1,7 @@
using System.Linq;
using Content.Shared.Disposal;
using Content.Shared.Disposal.Components;
using Content.Shared.Disposal.Unit;
using Content.Shared.DoAfter;
using Content.Shared.Interaction;
using Content.Shared.Item;
using Content.Shared.Placeable;
using Content.Shared.Storage.Components;
using Content.Shared.Verbs;
using Robust.Shared.Audio.Systems;
@@ -21,7 +17,6 @@ public sealed class DumpableSystem : EntitySystem
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedDisposalUnitSystem _disposalUnitSystem = default!;
[Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
[Dependency] private readonly SharedTransformSystem _transformSystem = default!;
@@ -39,10 +34,12 @@ public sealed class DumpableSystem : EntitySystem
private void OnAfterInteract(EntityUid uid, DumpableComponent component, AfterInteractEvent args)
{
if (!args.CanReach || args.Handled)
if (!args.CanReach || args.Handled || args.Target is not { } target)
return;
if (!HasComp<DisposalUnitComponent>(args.Target) && !HasComp<PlaceableSurfaceComponent>(args.Target))
var evt = new GetDumpableVerbEvent(args.User, null);
RaiseLocalEvent(target, ref evt);
if (evt.Verb is null)
return;
if (!TryComp<StorageComponent>(uid, out var storage))
@@ -51,7 +48,7 @@ public sealed class DumpableSystem : EntitySystem
if (!storage.Container.ContainedEntities.Any())
return;
StartDoAfter(uid, args.Target.Value, args.User, component);
StartDoAfter(uid, target, args.User, component);
args.Handled = true;
}
@@ -83,33 +80,22 @@ public sealed class DumpableSystem : EntitySystem
if (!TryComp<StorageComponent>(uid, out var storage) || !storage.Container.ContainedEntities.Any())
return;
if (HasComp<DisposalUnitComponent>(args.Target))
{
UtilityVerb verb = new()
{
Act = () =>
{
StartDoAfter(uid, args.Target, args.User, dumpable);
},
Text = Loc.GetString("dump-disposal-verb-name", ("unit", args.Target)),
IconEntity = GetNetEntity(uid)
};
args.Verbs.Add(verb);
}
var evt = new GetDumpableVerbEvent(args.User, null);
RaiseLocalEvent(args.Target, ref evt);
if (HasComp<PlaceableSurfaceComponent>(args.Target))
if (evt.Verb is not { } verbText)
return;
UtilityVerb verb = new()
{
UtilityVerb verb = new()
Act = () =>
{
Act = () =>
{
StartDoAfter(uid, args.Target, args.User, dumpable);
},
Text = Loc.GetString("dump-placeable-verb-name", ("surface", args.Target)),
IconEntity = GetNetEntity(uid)
};
args.Verbs.Add(verb);
}
StartDoAfter(uid, args.Target, args.User, dumpable);
},
Text = verbText,
IconEntity = GetNetEntity(uid)
};
args.Verbs.Add(verb);
}
private void StartDoAfter(EntityUid storageUid, EntityUid targetUid, EntityUid userUid, DumpableComponent dumpable)
@@ -141,34 +127,15 @@ public sealed class DumpableSystem : EntitySystem
private void OnDoAfter(EntityUid uid, DumpableComponent component, DumpableDoAfterEvent args)
{
if (args.Handled || args.Cancelled || !TryComp<StorageComponent>(uid, out var storage) || storage.Container.ContainedEntities.Count == 0)
if (args.Handled || args.Cancelled || !TryComp<StorageComponent>(uid, out var storage) || storage.Container.ContainedEntities.Count == 0 || args.Args.Target is not { } target)
return;
var dumpQueue = new Queue<EntityUid>(storage.Container.ContainedEntities);
var dumped = false;
var evt = new DumpEvent(dumpQueue, args.Args.User, false, false);
RaiseLocalEvent(target, ref evt);
if (HasComp<DisposalUnitComponent>(args.Args.Target))
{
dumped = true;
foreach (var entity in dumpQueue)
{
_disposalUnitSystem.DoInsertDisposalUnit(args.Args.Target.Value, entity, args.Args.User);
}
}
else if (HasComp<PlaceableSurfaceComponent>(args.Args.Target))
{
dumped = true;
var (targetPos, targetRot) = _transformSystem.GetWorldPositionRotation(args.Args.Target.Value);
foreach (var entity in dumpQueue)
{
_transformSystem.SetWorldPositionRotation(entity, targetPos + _random.NextVector2Box() / 4, targetRot);
}
}
else
if (!evt.Handled)
{
var targetPos = _transformSystem.GetWorldPosition(uid);
@@ -177,9 +144,11 @@ public sealed class DumpableSystem : EntitySystem
var transform = Transform(entity);
_transformSystem.SetWorldPositionRotation(entity, targetPos + _random.NextVector2Box() / 4, _random.NextAngle(), transform);
}
return;
}
if (dumped)
if (evt.PlaySound)
{
_audio.PlayPredicted(component.DumpSound, uid, args.User);
}