mirror of
https://github.com/DeltaV-Station/Delta-v.git
synced 2026-09-30 16:17:27 +00:00
+24









Debug
deltanedas
metalgearsloth
Nemanja
PJBot
Psychpsyo
deltanedas
metalgearsloth
ravage
Pieter-Jan Briers
LEVELcat
Repo
nikthechampiongr
Doru991
DrSmugleaf
Skarletto
NULL882
lunarcomets
Miro Kavaliou
Kara
Kacper Urbańczyk
TsjipTsjip
daerSeebaer
Fluffiest Floofers
Flareguy
Leon Friedrich
Kevin Zheng
drteaspoon420
Ubaser
Nim
Kacper Urbańczyk
Tox Cruize
Ed
Michael Cu
fd2cc8570d
* Automatic changelog update * Make NPC names proper nouns & fix some genders (#20534) * Proper names & genders * Uppercase proper names * Make Smile female * fix bingus wrinkly head (#20531) * rouny meat and steak (#20526) * lost friendship flavor * add rouny steak * rouny special meat * rouny meat textures --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Wearable Wet Floor Sign and 'Janitorial Suicide Vest' (#20311) * Explosive wet floor sign & janitorial suicide vest * fix attributions * Remove name & desc from explosive wet floor sign * Make wet floor sign chameleonable * Automatic changelog update * Minor slippery stuff (#20535) * Update submodule to 162.2.0 (#20570) * Predicted armor (#20560) * clean up some lines in smile the slime prototype (#20552) * Revert "Use full file path for temp replays (#19002)" (#20545) * Add EyesGlasses into ClothesMate (#20523) * Automatic changelog update * Fix Punpun crew monitor sensor (#20484) * Automatic changelog update * EasyPry airlocks for arrivals. Now also prying refactor I guess (#19394) Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Automatic changelog update * Make arcades hackable again (#20555) * Automatic changelog update * Health alert tweaks (#20557) * Automatic changelog update * Add active and ended game rule components, generic TryRoundStartAttempt and minPlayers field (#20564) * Improve active game rule querying, add generic try round start attempt method, move minPlayers to GameRuleComponent * Nukeops todo and cleanup * Remove Active field * Add EndedGameRuleComponent * bartender suit (#20521) * give me a drink bartender * guh * aARG * Necropolis and mine walls (#20578) * Automatic changelog update * archaic accent tweaks (#20567) * Automatic changelog update * Add confirmation to kick and respawn in the admin player actions panel (#20542) * Remove windows-latest CI runs, remove unused build-test-release.yml (#20540) * Change .editorconfig to keep existing attribute arrangement (#20538) * Automatic changelog update * Catch replay start and end errors on round restarts (#20565) * Update trivial components to use auto comp states (#20539) * Fix role unbans not applying in real time (#20547) * Disable AHelp buttons when no player is selected, update button styling (#20568) * Automatic changelog update * Added a toggle fullscreen button (default F11) (#20272) * Added a toggle fullscreen button (default F11) * Removed un-needed comments * Review Requested Changes * Fixed Acidental Spacing Change * bwoink, removed extraneous code * nothing, litterally * Automatic changelog update * Fix not networking markings (#20588) * Automatic changelog update * Update RobustToolbox to v162.2.1 (#20590) * Automatic changelog update * Glorfcode (force say on damage/stun/crit) (#20562) * Automatic changelog update * Fix AHelp progressively showing more AHelp panels (#20591) * Automatic changelog update * caninsert entitystorage tweaks (#20589) * Automatic changelog update * Fix mapping actions crashing on load (#20592) * Fix loading a map with a ThirstComponent crashing the game (#20594) * Fix electrocution displaying real name of disguised players (#20603) * Organ fixes (#20488) * Automatic changelog update * Kettle medical rework (#20435) * Initial try at medical rework for kettle * Re-add decal decorations to Kettle's medical * Add more lockers to kettle's med * Actually upload kettle's map, not its proto * Automatic changelog update * Added blocked visuals to volumetric pump (#20610) * Automatic changelog update * Move TimedDespawn to engine (#20515) * Update submodule to 163.0.0 (#20616) * Remove v0.1 version number from local main menu screen (#20617) * Remove cloneData parameter from AutoNetworkedField (#20596) * Update submodule to 164.0.0 (#20618) * fix cognizine ghost role (#20632) Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Move ID layer one pixel to correct alignment (#20630) * Update nukie hardsuit descriptions (#20529) * Make holofans destructable (#20445) * Automatic changelog update * bowl is open (#20453) Co-authored-by: deltanedas <@deltanedas:kde.org> * Add TestPair.WaitCommand() (#20615) * Rename ThreatPrototype and mark fields as required (#20611) * Adjust hard bomb shape (#20608) * dragon refactor, objectives and use GenericAntag (#20201) Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Added generic empty liquids tank (#20563) * Move view variables verb to the top of the list with no category and localize it (#20546) * saltern update (#20325) Co-authored-by: deltanedas <@deltanedas:kde.org> * Fix followers leaking (#20643) * Add Winter Boots (#20622) * add * fix prototype * Add QM mantle (#20621) * add * fix prototype * Automatic changelog update * Slime mobs breathe nitrogen and resprite their organs (#20577) * Slimes breathe nitrogen and resprite their organs * ups * mmm * Automatic changelog update * Fix the new lizard horn's consistency + issue (#20620) * fix * add * Revert "add" This reverts commit a054a3204a8f185a94ceb80b1bd3bc9f30423711. * Add RandomHumanoidAppearance component to for space ninjas (#20605) * Automatic changelog update * Space cat breathes space (#20550) * Space cat breathes space Made Space Cat lungs ROBUST * Made Space Cat's lungs ROBUST 2.0 * Automatic changelog update * Wide anomaly locator (#20581) * Add files via upload * Add files via upload * Add files via upload * Add files via upload * add textures * fix encoding * fix 2 * Automatic changelog update * Fixed Telescopic Shield Lighting (#20650) * Fixed Telescopic Shield Lighting Bug fix #20199 * no need for these at all --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> * Automatic changelog update * Add a special hardsuit for nukie medic (#20471) * Automatic changelog update * Carry over other mutations when doing species mutation (#20551) * Automatic changelog update * Add Spanish accent to poncho and sombrero (#20377) --------- Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: LEVELcat <68501903+LEVELcat@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: Doru991 <75124791+Doru991@users.noreply.github.com> Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> Co-authored-by: Skarletto <122584947+Skarletto@users.noreply.github.com> Co-authored-by: NULL882 <104377798+NULL882@users.noreply.github.com> Co-authored-by: lunarcomets <140772713+lunarcomets@users.noreply.github.com> Co-authored-by: Miro Kavaliou <miraslauk@gmail.com> Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: Kacper Urbańczyk <kacperjaroslawurbanczyk@gmail.com> Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Co-authored-by: daerSeebaer <61566539+daerSeebaer@users.noreply.github.com> Co-authored-by: Fluffiest Floofers <thebluewulf@gmail.com> Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: Kevin Zheng <kevinz5000@gmail.com> Co-authored-by: drteaspoon420 <87363733+drteaspoon420@users.noreply.github.com> Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com> Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com> Co-authored-by: Kacper Urbańczyk <mikrel071204@gmail.com> Co-authored-by: Tox Cruize <141375638+TexCruize@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: Michael Cu <43478115+michaelcu@users.noreply.github.com>
316 lines
12 KiB
C#
316 lines
12 KiB
C#
using System.Linq;
|
|
using Content.Shared.Buckle.Components;
|
|
using Content.Shared.Destructible;
|
|
using Content.Shared.DragDrop;
|
|
using Content.Shared.Foldable;
|
|
using Content.Shared.Interaction;
|
|
using Content.Shared.Storage;
|
|
using Content.Shared.Verbs;
|
|
using Robust.Shared.Containers;
|
|
|
|
namespace Content.Shared.Buckle;
|
|
|
|
public abstract partial class SharedBuckleSystem
|
|
{
|
|
private void InitializeStrap()
|
|
{
|
|
SubscribeLocalEvent<StrapComponent, ComponentStartup>(OnStrapStartup);
|
|
SubscribeLocalEvent<StrapComponent, ComponentShutdown>(OnStrapShutdown);
|
|
SubscribeLocalEvent<StrapComponent, ComponentRemove>((_, c, _) => StrapRemoveAll(c));
|
|
|
|
SubscribeLocalEvent<StrapComponent, EntInsertedIntoContainerMessage>(OnStrapEntModifiedFromContainer);
|
|
SubscribeLocalEvent<StrapComponent, EntRemovedFromContainerMessage>(OnStrapEntModifiedFromContainer);
|
|
SubscribeLocalEvent<StrapComponent, GetVerbsEvent<InteractionVerb>>(AddStrapVerbs);
|
|
SubscribeLocalEvent<StrapComponent, ContainerGettingInsertedAttemptEvent>(OnStrapContainerGettingInsertedAttempt);
|
|
SubscribeLocalEvent<StrapComponent, InteractHandEvent>(OnStrapInteractHand);
|
|
SubscribeLocalEvent<StrapComponent, DestructionEventArgs>((_,c,_) => StrapRemoveAll(c));
|
|
SubscribeLocalEvent<StrapComponent, BreakageEventArgs>((_, c, _) => StrapRemoveAll(c));
|
|
|
|
SubscribeLocalEvent<StrapComponent, DragDropTargetEvent>(OnStrapDragDropTarget);
|
|
SubscribeLocalEvent<StrapComponent, CanDropTargetEvent>(OnCanDropTarget);
|
|
SubscribeLocalEvent<StrapComponent, FoldAttemptEvent>(OnAttemptFold);
|
|
|
|
SubscribeLocalEvent<StrapComponent, MoveEvent>(OnStrapMoveEvent);
|
|
}
|
|
|
|
private void OnStrapStartup(EntityUid uid, StrapComponent component, ComponentStartup args)
|
|
{
|
|
Appearance.SetData(uid, StrapVisuals.State, component.BuckledEntities.Count != 0);
|
|
}
|
|
|
|
private void OnStrapShutdown(EntityUid uid, StrapComponent component, ComponentShutdown args)
|
|
{
|
|
if (LifeStage(uid) > EntityLifeStage.MapInitialized)
|
|
return;
|
|
|
|
StrapRemoveAll(component);
|
|
}
|
|
|
|
private void OnStrapEntModifiedFromContainer(EntityUid uid, StrapComponent component, ContainerModifiedMessage message)
|
|
{
|
|
if (_gameTiming.ApplyingState)
|
|
return;
|
|
|
|
foreach (var buckledEntity in component.BuckledEntities)
|
|
{
|
|
if (!TryComp<BuckleComponent>(buckledEntity, out var buckleComp))
|
|
{
|
|
continue;
|
|
}
|
|
|
|
ContainerModifiedReAttach(buckledEntity, uid, buckleComp, component);
|
|
}
|
|
}
|
|
|
|
private void ContainerModifiedReAttach(EntityUid buckleUid, EntityUid strapUid, BuckleComponent? buckleComp = null, StrapComponent? strapComp = null)
|
|
{
|
|
if (!Resolve(buckleUid, ref buckleComp, false) ||
|
|
!Resolve(strapUid, ref strapComp, false))
|
|
return;
|
|
|
|
var contained = _container.TryGetContainingContainer(buckleUid, out var ownContainer);
|
|
var strapContained = _container.TryGetContainingContainer(strapUid, out var strapContainer);
|
|
|
|
if (contained != strapContained || ownContainer != strapContainer)
|
|
{
|
|
TryUnbuckle(buckleUid, buckleUid, true, buckleComp);
|
|
return;
|
|
}
|
|
|
|
if (!contained)
|
|
{
|
|
ReAttach(buckleUid, strapUid, buckleComp, strapComp);
|
|
}
|
|
}
|
|
|
|
private void OnStrapContainerGettingInsertedAttempt(EntityUid uid, StrapComponent component, ContainerGettingInsertedAttemptEvent args)
|
|
{
|
|
// If someone is attempting to put this item inside of a backpack, ensure that it has no entities strapped to it.
|
|
if (HasComp<StorageComponent>(args.Container.Owner) && component.BuckledEntities.Count != 0)
|
|
args.Cancel();
|
|
}
|
|
|
|
private void OnStrapInteractHand(EntityUid uid, StrapComponent component, InteractHandEvent args)
|
|
{
|
|
if (args.Handled)
|
|
return;
|
|
|
|
args.Handled = ToggleBuckle(args.User, args.User, uid);
|
|
}
|
|
|
|
private void AddStrapVerbs(EntityUid uid, StrapComponent component, GetVerbsEvent<InteractionVerb> args)
|
|
{
|
|
if (args.Hands == null || !args.CanAccess || !args.CanInteract || !component.Enabled)
|
|
return;
|
|
|
|
// Note that for whatever bloody reason, buckle component has its own interaction range. Additionally, this
|
|
// range can be set per-component, so we have to check a modified InRangeUnobstructed for every verb.
|
|
|
|
// Add unstrap verbs for every strapped entity.
|
|
foreach (var entity in component.BuckledEntities)
|
|
{
|
|
var buckledComp = Comp<BuckleComponent>(entity);
|
|
|
|
if (!_interaction.InRangeUnobstructed(args.User, args.Target, range: buckledComp.Range))
|
|
continue;
|
|
|
|
var verb = new InteractionVerb()
|
|
{
|
|
Act = () => TryUnbuckle(entity, args.User, buckleComp: buckledComp),
|
|
Category = VerbCategory.Unbuckle,
|
|
Text = entity == args.User
|
|
? Loc.GetString("verb-self-target-pronoun")
|
|
: Comp<MetaDataComponent>(entity).EntityName
|
|
};
|
|
|
|
// In the event that you have more than once entity with the same name strapped to the same object,
|
|
// these two verbs will be identical according to Verb.CompareTo, and only one with actually be added to
|
|
// the verb list. However this should rarely ever be a problem. If it ever is, it could be fixed by
|
|
// appending an integer to verb.Text to distinguish the verbs.
|
|
|
|
args.Verbs.Add(verb);
|
|
}
|
|
|
|
// Add a verb to buckle the user.
|
|
if (TryComp<BuckleComponent>(args.User, out var buckle) &&
|
|
buckle.BuckledTo != uid &&
|
|
args.User != uid &&
|
|
StrapHasSpace(uid, buckle, component) &&
|
|
_interaction.InRangeUnobstructed(args.User, args.Target, range: buckle.Range))
|
|
{
|
|
InteractionVerb verb = new()
|
|
{
|
|
Act = () => TryBuckle(args.User, args.User, args.Target, buckle),
|
|
Category = VerbCategory.Buckle,
|
|
Text = Loc.GetString("verb-self-target-pronoun")
|
|
};
|
|
args.Verbs.Add(verb);
|
|
}
|
|
|
|
// If the user is currently holding/pulling an entity that can be buckled, add a verb for that.
|
|
if (args.Using is {Valid: true} @using &&
|
|
TryComp<BuckleComponent>(@using, out var usingBuckle) &&
|
|
StrapHasSpace(uid, usingBuckle, component) &&
|
|
_interaction.InRangeUnobstructed(@using, args.Target, range: usingBuckle.Range))
|
|
{
|
|
// Check that the entity is unobstructed from the target (ignoring the user).
|
|
bool Ignored(EntityUid entity) => entity == args.User || entity == args.Target || entity == @using;
|
|
if (!_interaction.InRangeUnobstructed(@using, args.Target, usingBuckle.Range, predicate: Ignored))
|
|
return;
|
|
|
|
var isPlayer = _playerManager.TryGetSessionByEntity(@using, out var _);
|
|
InteractionVerb verb = new()
|
|
{
|
|
Act = () => TryBuckle(@using, args.User, args.Target, usingBuckle),
|
|
Category = VerbCategory.Buckle,
|
|
Text = Comp<MetaDataComponent>(@using).EntityName,
|
|
// just a held object, the user is probably just trying to sit down.
|
|
// If the used entity is a person being pulled, prioritize this verb. Conversely, if it is
|
|
Priority = isPlayer ? 1 : -1
|
|
};
|
|
|
|
args.Verbs.Add(verb);
|
|
}
|
|
}
|
|
|
|
private void OnCanDropTarget(EntityUid uid, StrapComponent component, ref CanDropTargetEvent args)
|
|
{
|
|
args.CanDrop = StrapCanDragDropOn(uid, args.User, uid, args.Dragged, component);
|
|
args.Handled = true;
|
|
}
|
|
|
|
private void OnAttemptFold(EntityUid uid, StrapComponent component, ref FoldAttemptEvent args)
|
|
{
|
|
if (args.Cancelled)
|
|
return;
|
|
|
|
args.Cancelled = component.BuckledEntities.Count != 0;
|
|
}
|
|
|
|
private void OnStrapDragDropTarget(EntityUid uid, StrapComponent component, ref DragDropTargetEvent args)
|
|
{
|
|
if (!StrapCanDragDropOn(uid, args.User, uid, args.Dragged, component))
|
|
return;
|
|
|
|
args.Handled = TryBuckle(args.Dragged, args.User, uid);
|
|
}
|
|
|
|
private void OnStrapMoveEvent(EntityUid uid, StrapComponent component, ref MoveEvent args)
|
|
{
|
|
// TODO: This looks dirty af.
|
|
// On rotation of a strap, reattach all buckled entities.
|
|
// This fixes buckle offsets and draw depths.
|
|
// This is mega cursed. Please somebody save me from Mr Buckle's wild ride.
|
|
// Oh god I'm back here again. Send help.
|
|
|
|
// Consider a chair that has a player strapped to it. Then the client receives a new server state, showing
|
|
// that the player entity has moved elsewhere, and the chair has rotated. If the client applies the player
|
|
// state, then the chairs transform comp state, and then the buckle state. The transform state will
|
|
// forcefully teleport the player back to the chair (client-side only). This causes even more issues if the
|
|
// chair was teleporting in from nullspace after having left PVS.
|
|
//
|
|
// One option is to just never trigger re-buckles during state application.
|
|
// another is to.. just not do this? Like wtf is this code. But I CBF with buckle atm.
|
|
|
|
if (_gameTiming.ApplyingState || args.NewRotation == args.OldRotation)
|
|
return;
|
|
|
|
foreach (var buckledEntity in component.BuckledEntities)
|
|
{
|
|
if (!TryComp<BuckleComponent>(buckledEntity, out var buckled))
|
|
continue;
|
|
|
|
if (!buckled.Buckled || buckled.LastEntityBuckledTo != uid)
|
|
{
|
|
Log.Error($"A moving strap entity {ToPrettyString(uid)} attempted to re-parent an entity that does not 'belong' to it {ToPrettyString(buckledEntity)}");
|
|
continue;
|
|
}
|
|
|
|
ReAttach(buckledEntity, uid, buckled, component);
|
|
Dirty(buckled);
|
|
}
|
|
}
|
|
|
|
private bool StrapCanDragDropOn(
|
|
EntityUid strapUid,
|
|
EntityUid userUid,
|
|
EntityUid targetUid,
|
|
EntityUid buckleUid,
|
|
StrapComponent? strapComp = null,
|
|
BuckleComponent? buckleComp = null)
|
|
{
|
|
if (!Resolve(strapUid, ref strapComp, false) ||
|
|
!Resolve(buckleUid, ref buckleComp, false))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
bool Ignored(EntityUid entity) => entity == userUid || entity == buckleUid || entity == targetUid;
|
|
|
|
return _interaction.InRangeUnobstructed(targetUid, buckleUid, buckleComp.Range, predicate: Ignored);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Remove everything attached to the strap
|
|
/// </summary>
|
|
private void StrapRemoveAll(StrapComponent strapComp)
|
|
{
|
|
foreach (var entity in strapComp.BuckledEntities.ToArray())
|
|
{
|
|
TryUnbuckle(entity, entity, true);
|
|
}
|
|
|
|
strapComp.BuckledEntities.Clear();
|
|
strapComp.OccupiedSize = 0;
|
|
Dirty(strapComp);
|
|
}
|
|
|
|
private bool StrapHasSpace(EntityUid strapUid, BuckleComponent buckleComp, StrapComponent? strapComp = null)
|
|
{
|
|
if (!Resolve(strapUid, ref strapComp, false))
|
|
return false;
|
|
|
|
return strapComp.OccupiedSize + buckleComp.Size <= strapComp.Size;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Try to add an entity to the strap
|
|
/// </summary>
|
|
private bool StrapTryAdd(EntityUid strapUid, EntityUid buckleUid, BuckleComponent buckleComp, bool force = false, StrapComponent? strapComp = null)
|
|
{
|
|
if (!Resolve(strapUid, ref strapComp, false) ||
|
|
!strapComp.Enabled)
|
|
return false;
|
|
|
|
if (!force && !StrapHasSpace(strapUid, buckleComp, strapComp))
|
|
return false;
|
|
|
|
if (!strapComp.BuckledEntities.Add(buckleUid))
|
|
return false;
|
|
|
|
strapComp.OccupiedSize += buckleComp.Size;
|
|
|
|
Appearance.SetData(buckleUid, StrapVisuals.RotationAngle, strapComp.Rotation);
|
|
|
|
Appearance.SetData(strapUid, StrapVisuals.State, true);
|
|
|
|
Dirty(strapUid, strapComp);
|
|
return true;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Sets the enabled field in the strap component to a value
|
|
/// </summary>
|
|
public void StrapSetEnabled(EntityUid strapUid, bool enabled, StrapComponent? strapComp = null)
|
|
{
|
|
if (!Resolve(strapUid, ref strapComp, false) ||
|
|
strapComp.Enabled == enabled)
|
|
return;
|
|
|
|
strapComp.Enabled = enabled;
|
|
|
|
if (!enabled)
|
|
StrapRemoveAll(strapComp);
|
|
}
|
|
}
|