mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-17 05:27:38 +03:00
* Mass Bug Fixing (#1256)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
<!--
Explain this PR in as much detail as applicable
Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->
Mass bug fixing, for bugs related to #1220.
Feel free to link or send bugs.
Fix list:
- #1242
- #1243
- #1244
- https://github.com/space-wizards/space-station-14/pull/28084
- https://github.com/space-wizards/space-station-14/pull/28282
- Actually fixed PirateRadioSpawnRule heisentest (with a bandaid) (I
cancel if it's 0)
- https://github.com/Simple-Station/Einstein-Engines/issues/1263
---
# Changelog
<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
🆑
- fix: Fixed chair visuals drawing depth wrongly if you sat in a
north-facing chair.
- fix: Fixed buckling doing several buckles each time you did one.
- fix: Fixed the magic mirror.
- fix: Fixed beds re-positioning you every few seconds.
- fix: Fixed E not opening containers that are in another container.
- fix: Fixed disposal systems not flushing or ejecting properly.
---------
Co-authored-by: sleepyyapril <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>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
(cherry picked from commit 41501bd335c5e1e2e65b5d2ad040a3ae6851d4e8)
* Automatic Changelog Update (#1256)
(cherry picked from commit 9798f5363135cbe71479d0a14cf3215d01ed28f0)
* fix
* Fix animation looping bugs. (#29457)
Summary of the problem is in the corresponding engine commit: a4ea5a4620
This commit requires engine master right now.
I think #29144 is probably the most severe one, but I touched Jittering and RotatingLight too since they seemed sus too.
Fixes #29144
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 8d015f5c9ff60107dccdf35fa48e1558728ff269)
* Fix arcade machines (#30376)
(cherry picked from commit e72393df712cb2f5d1b4f6b4e2dc417c5584f07a)
* fix
* fix test
* fix test
* fix test
* fix
---------
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Co-authored-by: SimpleStation Changelogs <simplestation14@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: themias <89101928+themias@users.noreply.github.com>
94 lines
3.3 KiB
C#
94 lines
3.3 KiB
C#
using System.Linq;
|
|
using Content.Shared.Buckle.Components;
|
|
using Content.Shared.Construction;
|
|
using Content.Shared.Destructible;
|
|
using Content.Shared.Foldable;
|
|
using Content.Shared.Storage;
|
|
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>((e, c, _) => StrapRemoveAll(e, c));
|
|
|
|
SubscribeLocalEvent<StrapComponent, ContainerGettingInsertedAttemptEvent>(OnStrapContainerGettingInsertedAttempt);
|
|
SubscribeLocalEvent<StrapComponent, DestructionEventArgs>((e, c, _) => StrapRemoveAll(e, c));
|
|
SubscribeLocalEvent<StrapComponent, BreakageEventArgs>((e, c, _) => StrapRemoveAll(e, c));
|
|
|
|
SubscribeLocalEvent<StrapComponent, FoldAttemptEvent>(OnAttemptFold);
|
|
SubscribeLocalEvent<StrapComponent, MachineDeconstructedEvent>((e, c, _) => StrapRemoveAll(e, c));
|
|
}
|
|
|
|
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 (!TerminatingOrDeleted(uid))
|
|
StrapRemoveAll(uid, component);
|
|
}
|
|
|
|
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 (args.Container.ID == StorageComponent.ContainerId && component.BuckledEntities.Count != 0)
|
|
args.Cancel();
|
|
}
|
|
|
|
private void OnAttemptFold(EntityUid uid, StrapComponent component, ref FoldAttemptEvent args)
|
|
{
|
|
if (args.Cancelled)
|
|
return;
|
|
|
|
args.Cancelled = component.BuckledEntities.Count != 0;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Remove everything attached to the strap
|
|
/// </summary>
|
|
private void StrapRemoveAll(EntityUid uid, StrapComponent strapComp)
|
|
{
|
|
foreach (var entity in strapComp.BuckledEntities.ToArray())
|
|
{
|
|
Unbuckle(entity, entity);
|
|
}
|
|
}
|
|
|
|
private bool StrapHasSpace(EntityUid strapUid, BuckleComponent buckleComp, StrapComponent? strapComp = null)
|
|
{
|
|
if (!Resolve(strapUid, ref strapComp, false))
|
|
return false;
|
|
|
|
var avail = strapComp.Size;
|
|
foreach (var buckle in strapComp.BuckledEntities)
|
|
{
|
|
avail -= CompOrNull<BuckleComponent>(buckle)?.Size ?? 0;
|
|
}
|
|
|
|
return avail >= buckleComp.Size;
|
|
}
|
|
|
|
/// <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;
|
|
Dirty(strapUid, strapComp);
|
|
|
|
if (!enabled)
|
|
StrapRemoveAll(strapUid, strapComp);
|
|
}
|
|
}
|