mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-20 06:58:55 +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>
278 lines
9.2 KiB
C#
278 lines
9.2 KiB
C#
using System.Linq;
|
|
using Content.Server.DoAfter;
|
|
using Content.Server.Humanoid;
|
|
using Content.Shared.DoAfter;
|
|
using Content.Shared.Humanoid;
|
|
using Content.Shared.Humanoid.Markings;
|
|
using Content.Shared.Interaction;
|
|
using Content.Shared.MagicMirror;
|
|
using Robust.Shared.Audio.Systems;
|
|
|
|
namespace Content.Server.MagicMirror;
|
|
|
|
/// <summary>
|
|
/// Allows humanoids to change their appearance mid-round.
|
|
/// </summary>
|
|
public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
|
|
{
|
|
[Dependency] private readonly SharedAudioSystem _audio = default!;
|
|
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
|
|
[Dependency] private readonly MarkingManager _markings = default!;
|
|
[Dependency] private readonly HumanoidAppearanceSystem _humanoid = default!;
|
|
|
|
public override void Initialize()
|
|
{
|
|
base.Initialize();
|
|
|
|
Subs.BuiEvents<MagicMirrorComponent>(MagicMirrorUiKey.Key,
|
|
subs =>
|
|
{
|
|
subs.Event<BoundUIClosedEvent>(OnUiClosed);
|
|
subs.Event<MagicMirrorSelectMessage>(OnMagicMirrorSelect);
|
|
subs.Event<MagicMirrorChangeColorMessage>(OnTryMagicMirrorChangeColor);
|
|
subs.Event<MagicMirrorAddSlotMessage>(OnTryMagicMirrorAddSlot);
|
|
subs.Event<MagicMirrorRemoveSlotMessage>(OnTryMagicMirrorRemoveSlot);
|
|
});
|
|
|
|
|
|
SubscribeLocalEvent<MagicMirrorComponent, MagicMirrorSelectDoAfterEvent>(OnSelectSlotDoAfter);
|
|
SubscribeLocalEvent<MagicMirrorComponent, MagicMirrorChangeColorDoAfterEvent>(OnChangeColorDoAfter);
|
|
SubscribeLocalEvent<MagicMirrorComponent, MagicMirrorRemoveSlotDoAfterEvent>(OnRemoveSlotDoAfter);
|
|
SubscribeLocalEvent<MagicMirrorComponent, MagicMirrorAddSlotDoAfterEvent>(OnAddSlotDoAfter);
|
|
}
|
|
|
|
private void OnMagicMirrorSelect(EntityUid uid, MagicMirrorComponent component, MagicMirrorSelectMessage message)
|
|
{
|
|
if (component.Target is not { } target)
|
|
return;
|
|
|
|
_doAfterSystem.Cancel(component.DoAfter);
|
|
component.DoAfter = null;
|
|
|
|
var doAfter = new MagicMirrorSelectDoAfterEvent()
|
|
{
|
|
Category = message.Category,
|
|
Slot = message.Slot,
|
|
Marking = message.Marking,
|
|
};
|
|
|
|
_doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, component.SelectSlotTime, doAfter, uid, target: target, used: uid)
|
|
{
|
|
DistanceThreshold = SharedInteractionSystem.InteractionRange,
|
|
BreakOnTargetMove = true,
|
|
BreakOnDamage = true,
|
|
BreakOnHandChange = false,
|
|
BreakOnUserMove = true,
|
|
BreakOnWeightlessMove = false,
|
|
NeedHand = true
|
|
},
|
|
out var doAfterId);
|
|
|
|
component.DoAfter = doAfterId;
|
|
_audio.PlayPvs(component.ChangeHairSound, uid);
|
|
}
|
|
|
|
private void OnSelectSlotDoAfter(EntityUid uid, MagicMirrorComponent component, MagicMirrorSelectDoAfterEvent args)
|
|
{
|
|
if (args.Handled || args.Target == null || args.Cancelled)
|
|
return;
|
|
|
|
if (component.Target != args.Target)
|
|
return;
|
|
|
|
MarkingCategories category;
|
|
|
|
switch (args.Category)
|
|
{
|
|
case MagicMirrorCategory.Hair:
|
|
category = MarkingCategories.Hair;
|
|
break;
|
|
case MagicMirrorCategory.FacialHair:
|
|
category = MarkingCategories.FacialHair;
|
|
break;
|
|
default:
|
|
return;
|
|
}
|
|
|
|
_humanoid.SetMarkingId(component.Target.Value, category, args.Slot, args.Marking);
|
|
|
|
UpdateInterface(uid, component.Target.Value, component);
|
|
}
|
|
|
|
private void OnTryMagicMirrorChangeColor(EntityUid uid, MagicMirrorComponent component, MagicMirrorChangeColorMessage message)
|
|
{
|
|
if (component.Target is not { } target)
|
|
return;
|
|
|
|
_doAfterSystem.Cancel(component.DoAfter);
|
|
component.DoAfter = null;
|
|
|
|
var doAfter = new MagicMirrorChangeColorDoAfterEvent()
|
|
{
|
|
Category = message.Category,
|
|
Slot = message.Slot,
|
|
Colors = message.Colors,
|
|
};
|
|
|
|
_doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, component.ChangeSlotTime, doAfter, uid, target: target, used: uid)
|
|
{
|
|
BreakOnTargetMove = true,
|
|
BreakOnDamage = true,
|
|
BreakOnHandChange = false,
|
|
BreakOnUserMove = true,
|
|
BreakOnWeightlessMove = false,
|
|
NeedHand = true
|
|
},
|
|
out var doAfterId);
|
|
|
|
component.DoAfter = doAfterId;
|
|
}
|
|
private void OnChangeColorDoAfter(EntityUid uid, MagicMirrorComponent component, MagicMirrorChangeColorDoAfterEvent args)
|
|
{
|
|
if (args.Handled || args.Target == null || args.Cancelled)
|
|
return;
|
|
|
|
if (component.Target != args.Target)
|
|
return;
|
|
|
|
MarkingCategories category;
|
|
switch (args.Category)
|
|
{
|
|
case MagicMirrorCategory.Hair:
|
|
category = MarkingCategories.Hair;
|
|
break;
|
|
case MagicMirrorCategory.FacialHair:
|
|
category = MarkingCategories.FacialHair;
|
|
break;
|
|
default:
|
|
return;
|
|
}
|
|
|
|
_humanoid.SetMarkingColor(component.Target.Value, category, args.Slot, args.Colors);
|
|
|
|
// using this makes the UI feel like total ass
|
|
// que
|
|
// UpdateInterface(uid, component.Target, message.Session);
|
|
}
|
|
|
|
private void OnTryMagicMirrorRemoveSlot(EntityUid uid, MagicMirrorComponent component, MagicMirrorRemoveSlotMessage message)
|
|
{
|
|
if (component.Target is not { } target)
|
|
return;
|
|
|
|
_doAfterSystem.Cancel(component.DoAfter);
|
|
component.DoAfter = null;
|
|
|
|
var doAfter = new MagicMirrorRemoveSlotDoAfterEvent()
|
|
{
|
|
Category = message.Category,
|
|
Slot = message.Slot,
|
|
};
|
|
|
|
_doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, component.RemoveSlotTime, doAfter, uid, target: target, used: uid)
|
|
{
|
|
DistanceThreshold = SharedInteractionSystem.InteractionRange,
|
|
BreakOnTargetMove = true,
|
|
BreakOnDamage = true,
|
|
BreakOnHandChange = false,
|
|
BreakOnUserMove = true,
|
|
BreakOnWeightlessMove = false,
|
|
NeedHand = true
|
|
},
|
|
out var doAfterId);
|
|
|
|
component.DoAfter = doAfterId;
|
|
_audio.PlayPvs(component.ChangeHairSound, uid);
|
|
}
|
|
|
|
private void OnRemoveSlotDoAfter(EntityUid uid, MagicMirrorComponent component, MagicMirrorRemoveSlotDoAfterEvent args)
|
|
{
|
|
if (args.Handled || args.Target == null || args.Cancelled)
|
|
return;
|
|
|
|
if (component.Target != args.Target)
|
|
return;
|
|
|
|
MarkingCategories category;
|
|
|
|
switch (args.Category)
|
|
{
|
|
case MagicMirrorCategory.Hair:
|
|
category = MarkingCategories.Hair;
|
|
break;
|
|
case MagicMirrorCategory.FacialHair:
|
|
category = MarkingCategories.FacialHair;
|
|
break;
|
|
default:
|
|
return;
|
|
}
|
|
|
|
_humanoid.RemoveMarking(component.Target.Value, category, args.Slot);
|
|
|
|
UpdateInterface(uid, component.Target.Value, component);
|
|
}
|
|
|
|
private void OnTryMagicMirrorAddSlot(EntityUid uid, MagicMirrorComponent component, MagicMirrorAddSlotMessage message)
|
|
{
|
|
if (component.Target == null)
|
|
return;
|
|
|
|
_doAfterSystem.Cancel(component.DoAfter);
|
|
component.DoAfter = null;
|
|
|
|
var doAfter = new MagicMirrorAddSlotDoAfterEvent()
|
|
{
|
|
Category = message.Category,
|
|
};
|
|
|
|
_doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, component.AddSlotTime, doAfter, uid, target: component.Target.Value, used: uid)
|
|
{
|
|
BreakOnTargetMove = true,
|
|
BreakOnDamage = true,
|
|
BreakOnHandChange = false,
|
|
BreakOnUserMove = true,
|
|
BreakOnWeightlessMove = false,
|
|
NeedHand = true
|
|
},
|
|
out var doAfterId);
|
|
|
|
component.DoAfter = doAfterId;
|
|
_audio.PlayPvs(component.ChangeHairSound, uid);
|
|
}
|
|
private void OnAddSlotDoAfter(EntityUid uid, MagicMirrorComponent component, MagicMirrorAddSlotDoAfterEvent args)
|
|
{
|
|
if (args.Handled || args.Target == null || args.Cancelled || !TryComp(component.Target, out HumanoidAppearanceComponent? humanoid))
|
|
return;
|
|
|
|
MarkingCategories category;
|
|
|
|
switch (args.Category)
|
|
{
|
|
case MagicMirrorCategory.Hair:
|
|
category = MarkingCategories.Hair;
|
|
break;
|
|
case MagicMirrorCategory.FacialHair:
|
|
category = MarkingCategories.FacialHair;
|
|
break;
|
|
default:
|
|
return;
|
|
}
|
|
|
|
var marking = _markings.MarkingsByCategoryAndSpecies(category, humanoid.Species).Keys.FirstOrDefault();
|
|
|
|
if (string.IsNullOrEmpty(marking))
|
|
return;
|
|
|
|
_humanoid.AddMarking(component.Target.Value, marking, Color.Black);
|
|
|
|
UpdateInterface(uid, component.Target.Value, component);
|
|
|
|
}
|
|
|
|
private void OnUiClosed(Entity<MagicMirrorComponent> ent, ref BoundUIClosedEvent args)
|
|
{
|
|
ent.Comp.Target = null;
|
|
Dirty(ent);
|
|
}
|
|
}
|