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

Add face bandanas (#24597)

Browse Source 
* add face bandanas

* oops

* make face bandanas butcherable, also one bite

* oops

* Add mouth IdentityBlocker to bandanas

* refactor to use foldablecomponent

* remove some leftover bits

* remove HamsterWearable until face sprite updated

* oops

* review changes

* remove a few unneeded bits
This commit is contained in:
themias
2024-02-03 19:52:44 -05:00
committed by GitHub
parent 494af9ac68
commit b503fe5864
31 changed files with 309 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Content.Shared/Foldable/FoldableSystem.cs
View File

@@ -3,7 +3,6 @@ using Content.Shared.Buckle.Components;
using Content.Shared.Storage.Components;
using Content.Shared.Verbs;
using Robust.Shared.Containers;
using Robust.Shared.GameStates;
using Robust.Shared.Serialization;
using Robust.Shared.Utility;
@@ -20,8 +19,7 @@ public sealed class FoldableSystem : EntitySystem
base.Initialize();
SubscribeLocalEvent<FoldableComponent, GetVerbsEvent<AlternativeVerb>>(AddFoldVerb);
SubscribeLocalEvent<FoldableComponent, ComponentGetState>(OnGetState);
SubscribeLocalEvent<FoldableComponent, ComponentHandleState>(OnHandleState);
SubscribeLocalEvent<FoldableComponent, AfterAutoHandleStateEvent>(OnHandleState);
SubscribeLocalEvent<FoldableComponent, ComponentInit>(OnFoldableInit);
SubscribeLocalEvent<FoldableComponent, ContainerGettingInsertedAttemptEvent>(OnInsertEvent);
@@ -31,18 +29,9 @@ public sealed class FoldableSystem : EntitySystem
SubscribeLocalEvent<FoldableComponent, BuckleAttemptEvent>(OnBuckleAttempt);
}
private void OnGetState(EntityUid uid, FoldableComponent component, ref ComponentGetState args)
private void OnHandleState(EntityUid uid, FoldableComponent component, ref AfterAutoHandleStateEvent args)
{
args.State = new FoldableComponentState(component.IsFolded);
}
private void OnHandleState(EntityUid uid, FoldableComponent component, ref ComponentHandleState args)
{
if (args.Current is not FoldableComponentState state)
return;
if (state.IsFolded != component.IsFolded)
SetFolded(uid, component, state.IsFolded);
SetFolded(uid, component, component.IsFolded);
}
private void OnFoldableInit(EntityUid uid, FoldableComponent component, ComponentInit args)
@@ -90,11 +79,14 @@ public sealed class FoldableSystem : EntitySystem
Dirty(uid, component);
_appearance.SetData(uid, FoldedVisuals.State, folded);
_buckle.StrapSetEnabled(uid, !component.IsFolded);
var ev = new FoldedEvent(folded);
RaiseLocalEvent(uid, ref ev);
}
private void OnInsertEvent(EntityUid uid, FoldableComponent component, ContainerGettingInsertedAttemptEvent args)
{
if (!component.IsFolded)
if (!component.IsFolded && !component.CanFoldInsideContainer)
args.Cancel();
}
@@ -108,8 +100,8 @@ public sealed class FoldableSystem : EntitySystem
if (!Resolve(uid, ref fold))
return false;
// Can't un-fold in any container (locker, hands, inventory, whatever).
if (_container.IsEntityInContainer(uid))
// Can't un-fold in any container unless enabled (locker, hands, inventory, whatever).
if (_container.IsEntityInContainer(uid) && !fold.CanFoldInsideContainer)
return false;
var ev = new FoldAttemptEvent();
@@ -167,3 +159,10 @@ public sealed class FoldableSystem : EntitySystem
/// <param name="Cancelled"></param>
[ByRefEvent]
public record struct FoldAttemptEvent(bool Cancelled = false);
/// <summary>
/// Event raised on an entity after it has been folded.
/// </summary>
/// <param name="IsFolded"></param>
[ByRefEvent]
public readonly record struct FoldedEvent(bool IsFolded);