fix: помогите

This commit is contained in:
Remuchi
2024-03-26 16:01:54 +07:00
parent 5e74f6ae53
commit ad78f747c1
7 changed files with 19 additions and 22 deletions

View File

@@ -7,7 +7,7 @@
/// Maps to <see cref="ChatChannel"/>, giving better names.
/// </remarks>
[Flags]
public enum ChatSelectChannel : ushort
public enum ChatSelectChannel : uint
{
None = 0,

View File

@@ -13,6 +13,8 @@ using Content.Shared.Verbs;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Containers;
using Robust.Shared.GameStates;
using Robust.Shared.Network;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
namespace Content.Shared.Containers.ItemSlots
@@ -32,6 +34,8 @@ namespace Content.Shared.Containers.ItemSlots
[Dependency] private readonly SharedPopupSystem _popupSystem = default!;
[Dependency] private readonly SharedHandsSystem _handsSystem = default!;
[Dependency] private readonly SharedAudioSystem _audioSystem = default!;
[Dependency] private readonly INetManager _netManager = default!;
[Dependency] private readonly IGameTiming _timing = default!;
public override void Initialize()
{

View File

@@ -3,7 +3,6 @@ using Content.Shared.Hands.Components;
using Content.Shared.Interaction;
using Content.Shared.Inventory.VirtualItem;
using Content.Shared.Tag;
using Content.Shared.Pulling.Components;
using Robust.Shared.Containers;
using Robust.Shared.Map;

View File

@@ -3,12 +3,11 @@ using Robust.Shared.Network;
namespace Content.Shared._White.Jukebox;
public class JukeboxSharedSystem : EntitySystem
public sealed class JukeboxSharedSystem : EntitySystem
{
[Dependency] private readonly SharedContainerSystem _containerSystem = default!;
[Dependency] private readonly INetManager _netManager = default!;
public override void Initialize()
{
base.Initialize();
@@ -17,8 +16,11 @@ public class JukeboxSharedSystem : EntitySystem
public void OnJukeboxInit(EntityUid uid, JukeboxComponent component, ComponentStartup args)
{
component.TapeContainer = _containerSystem.EnsureContainer<Container>(uid, JukeboxComponent.JukeboxContainerName);
component.DefaultSongsContainer = _containerSystem.EnsureContainer<Container>(uid, JukeboxComponent.JukeboxDefaultSongsName);
component.TapeContainer =
_containerSystem.EnsureContainer<Container>(uid, JukeboxComponent.JukeboxContainerName);
component.DefaultSongsContainer =
_containerSystem.EnsureContainer<Container>(uid, JukeboxComponent.JukeboxDefaultSongsName);
if (_netManager.IsServer)
{
@@ -28,10 +30,11 @@ public class JukeboxSharedSystem : EntitySystem
{
var tapeUid = EntityManager.SpawnEntity(tapePrototype, transform.MapPosition);
if(!TryComp<TapeComponent>(tapeUid, out _)) continue;
if (!TryComp<TapeComponent>(tapeUid, out _))
continue;
component.DefaultSongsContainer.Insert(tapeUid);
_containerSystem.Insert(tapeUid, component.DefaultSongsContainer);
}
}
}
}
}

View File

@@ -40,8 +40,7 @@ public abstract class SharedScrollSystem : EntitySystem
var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, component.LearnTime, new ScrollDoAfterEvent(), uid, target: uid)
{
BreakOnTargetMove = true,
BreakOnUserMove = true,
BreakOnMove = true,
BreakOnDamage = true,
NeedHand = true
};