mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-17 13:37:47 +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>
218 lines
6.4 KiB
C#
218 lines
6.4 KiB
C#
using Content.Shared.DoAfter;
|
|
using Content.Shared.Humanoid;
|
|
using Content.Shared.Humanoid.Markings;
|
|
using Content.Shared.Interaction;
|
|
using Content.Shared.UserInterface;
|
|
using Robust.Shared.Serialization;
|
|
using Robust.Shared.Utility;
|
|
|
|
namespace Content.Shared.MagicMirror;
|
|
|
|
public abstract class SharedMagicMirrorSystem : EntitySystem
|
|
{
|
|
[Dependency] private readonly SharedInteractionSystem _interaction = default!;
|
|
[Dependency] protected readonly SharedUserInterfaceSystem UISystem = default!;
|
|
|
|
public override void Initialize()
|
|
{
|
|
base.Initialize();
|
|
SubscribeLocalEvent<MagicMirrorComponent, AfterInteractEvent>(OnMagicMirrorInteract);
|
|
SubscribeLocalEvent<MagicMirrorComponent, BeforeActivatableUIOpenEvent>(OnBeforeUIOpen);
|
|
SubscribeLocalEvent<MagicMirrorComponent, BoundUserInterfaceCheckRangeEvent>(OnMirrorRangeCheck);
|
|
}
|
|
|
|
private void OnMagicMirrorInteract(Entity<MagicMirrorComponent> mirror, ref AfterInteractEvent args)
|
|
{
|
|
if (!args.CanReach || args.Target == null)
|
|
return;
|
|
|
|
if (!UISystem.TryOpenUi(mirror.Owner, MagicMirrorUiKey.Key, args.User))
|
|
return;
|
|
|
|
UpdateInterface(mirror, args.Target.Value, mirror);
|
|
}
|
|
|
|
private void OnMirrorRangeCheck(EntityUid uid, MagicMirrorComponent component, ref BoundUserInterfaceCheckRangeEvent args)
|
|
{
|
|
if (args.Result == BoundUserInterfaceRangeResult.Fail)
|
|
return;
|
|
|
|
DebugTools.Assert(component.Target != null && Exists(component.Target));
|
|
|
|
if (!_interaction.InRangeUnobstructed(uid, component.Target.Value))
|
|
args.Result = BoundUserInterfaceRangeResult.Fail;
|
|
}
|
|
|
|
private void OnBeforeUIOpen(Entity<MagicMirrorComponent> ent, ref BeforeActivatableUIOpenEvent args)
|
|
{
|
|
if (args.User != ent.Comp.Target && ent.Comp.Target != null)
|
|
return;
|
|
|
|
UpdateInterface(ent, args.User, ent);
|
|
}
|
|
|
|
protected void UpdateInterface(EntityUid mirrorUid, EntityUid targetUid, MagicMirrorComponent component)
|
|
{
|
|
if (!TryComp<HumanoidAppearanceComponent>(targetUid, out var humanoid))
|
|
return;
|
|
component.Target ??= targetUid;
|
|
|
|
var hair = humanoid.MarkingSet.TryGetCategory(MarkingCategories.Hair, out var hairMarkings)
|
|
? new List<Marking>(hairMarkings)
|
|
: new();
|
|
|
|
var facialHair = humanoid.MarkingSet.TryGetCategory(MarkingCategories.FacialHair, out var facialHairMarkings)
|
|
? new List<Marking>(facialHairMarkings)
|
|
: new();
|
|
|
|
var state = new MagicMirrorUiState(
|
|
humanoid.Species,
|
|
hair,
|
|
humanoid.MarkingSet.PointsLeft(MarkingCategories.Hair) + hair.Count,
|
|
facialHair,
|
|
humanoid.MarkingSet.PointsLeft(MarkingCategories.FacialHair) + facialHair.Count);
|
|
|
|
// TODO: Component states
|
|
component.Target = targetUid;
|
|
UISystem.SetUiState(mirrorUid, MagicMirrorUiKey.Key, state);
|
|
Dirty(mirrorUid, component);
|
|
}
|
|
}
|
|
|
|
[Serializable, NetSerializable]
|
|
public enum MagicMirrorUiKey : byte
|
|
{
|
|
Key
|
|
}
|
|
|
|
[Serializable, NetSerializable]
|
|
public enum MagicMirrorCategory : byte
|
|
{
|
|
Hair,
|
|
FacialHair
|
|
}
|
|
|
|
[Serializable, NetSerializable]
|
|
public sealed class MagicMirrorSelectMessage : BoundUserInterfaceMessage
|
|
{
|
|
public MagicMirrorSelectMessage(MagicMirrorCategory category, string marking, int slot)
|
|
{
|
|
Category = category;
|
|
Marking = marking;
|
|
Slot = slot;
|
|
}
|
|
|
|
public MagicMirrorCategory Category { get; }
|
|
public string Marking { get; }
|
|
public int Slot { get; }
|
|
}
|
|
|
|
[Serializable, NetSerializable]
|
|
public sealed class MagicMirrorChangeColorMessage : BoundUserInterfaceMessage
|
|
{
|
|
public MagicMirrorChangeColorMessage(MagicMirrorCategory category, List<Color> colors, int slot)
|
|
{
|
|
Category = category;
|
|
Colors = colors;
|
|
Slot = slot;
|
|
}
|
|
|
|
public MagicMirrorCategory Category { get; }
|
|
public List<Color> Colors { get; }
|
|
public int Slot { get; }
|
|
}
|
|
|
|
[Serializable, NetSerializable]
|
|
public sealed class MagicMirrorRemoveSlotMessage : BoundUserInterfaceMessage
|
|
{
|
|
public MagicMirrorRemoveSlotMessage(MagicMirrorCategory category, int slot)
|
|
{
|
|
Category = category;
|
|
Slot = slot;
|
|
}
|
|
|
|
public MagicMirrorCategory Category { get; }
|
|
public int Slot { get; }
|
|
}
|
|
|
|
[Serializable, NetSerializable]
|
|
public sealed class MagicMirrorSelectSlotMessage : BoundUserInterfaceMessage
|
|
{
|
|
public MagicMirrorSelectSlotMessage(MagicMirrorCategory category, int slot)
|
|
{
|
|
Category = category;
|
|
Slot = slot;
|
|
}
|
|
|
|
public MagicMirrorCategory Category { get; }
|
|
public int Slot { get; }
|
|
}
|
|
|
|
[Serializable, NetSerializable]
|
|
public sealed class MagicMirrorAddSlotMessage : BoundUserInterfaceMessage
|
|
{
|
|
public MagicMirrorAddSlotMessage(MagicMirrorCategory category)
|
|
{
|
|
Category = category;
|
|
}
|
|
|
|
public MagicMirrorCategory Category { get; }
|
|
}
|
|
|
|
[Serializable, NetSerializable]
|
|
public sealed class MagicMirrorUiState : BoundUserInterfaceState
|
|
{
|
|
public MagicMirrorUiState(string species, List<Marking> hair, int hairSlotTotal, List<Marking> facialHair, int facialHairSlotTotal)
|
|
{
|
|
Species = species;
|
|
Hair = hair;
|
|
HairSlotTotal = hairSlotTotal;
|
|
FacialHair = facialHair;
|
|
FacialHairSlotTotal = facialHairSlotTotal;
|
|
}
|
|
|
|
public NetEntity Target;
|
|
|
|
public string Species;
|
|
|
|
public List<Marking> Hair;
|
|
public int HairSlotTotal;
|
|
|
|
public List<Marking> FacialHair;
|
|
public int FacialHairSlotTotal;
|
|
}
|
|
|
|
[Serializable, NetSerializable]
|
|
public sealed partial class MagicMirrorRemoveSlotDoAfterEvent : DoAfterEvent
|
|
{
|
|
public override DoAfterEvent Clone() => this;
|
|
public MagicMirrorCategory Category;
|
|
public int Slot;
|
|
}
|
|
|
|
[Serializable, NetSerializable]
|
|
public sealed partial class MagicMirrorAddSlotDoAfterEvent : DoAfterEvent
|
|
{
|
|
public override DoAfterEvent Clone() => this;
|
|
public MagicMirrorCategory Category;
|
|
}
|
|
|
|
[Serializable, NetSerializable]
|
|
public sealed partial class MagicMirrorSelectDoAfterEvent : DoAfterEvent
|
|
{
|
|
public MagicMirrorCategory Category;
|
|
public int Slot;
|
|
public string Marking = string.Empty;
|
|
|
|
public override DoAfterEvent Clone() => this;
|
|
}
|
|
|
|
[Serializable, NetSerializable]
|
|
public sealed partial class MagicMirrorChangeColorDoAfterEvent : DoAfterEvent
|
|
{
|
|
public override DoAfterEvent Clone() => this;
|
|
public MagicMirrorCategory Category;
|
|
public int Slot;
|
|
public List<Color> Colors = new List<Color>();
|
|
}
|