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

@@ -15,8 +15,6 @@ using Content.Server.GameTicking.Rules;
using Content.Server.Humanoid; using Content.Server.Humanoid;
using Content.Server.IdentityManagement; using Content.Server.IdentityManagement;
using Content.Server.Mind; using Content.Server.Mind;
using Content.Server.NPC.Components;
using Content.Server.NPC.Systems;
using Content.Server.Polymorph.Systems; using Content.Server.Polymorph.Systems;
using Content.Server.Popups; using Content.Server.Popups;
using Content.Server.Store.Components; using Content.Server.Store.Components;
@@ -44,8 +42,6 @@ using Content.Shared.Miracle.UI;
using Content.Shared.Mobs; using Content.Shared.Mobs;
using Content.Shared.Mobs.Systems; using Content.Shared.Mobs.Systems;
using Content.Shared.Ninja.Components; using Content.Shared.Ninja.Components;
using Content.Shared.Pulling;
using Content.Shared.Pulling.Components;
using Content.Shared.Standing; using Content.Shared.Standing;
using Content.Shared.StatusEffect; using Content.Shared.StatusEffect;
using Content.Shared.Tag; using Content.Shared.Tag;

View File

@@ -1,9 +1,7 @@
using System.Threading; using System.Threading;
using Content.Server.DoAfter; using Content.Server.DoAfter;
using Content.Server.Hands.Systems;
using Content.Server.Resist; using Content.Server.Resist;
using Content.Server.Popups; using Content.Server.Popups;
using Content.Server.Contests;
using Content.Server.Inventory; using Content.Server.Inventory;
using Content.Shared._White.Crossbow; using Content.Shared._White.Crossbow;
using Content.Shared.Mobs; using Content.Shared.Mobs;
@@ -17,15 +15,14 @@ using Content.Shared.Verbs;
using Content.Shared.Carrying; using Content.Shared.Carrying;
using Content.Shared.Movement.Events; using Content.Shared.Movement.Events;
using Content.Shared.Movement.Systems; using Content.Shared.Movement.Systems;
using Content.Shared.Pulling;
using Content.Shared.Pulling.Components;
using Content.Shared.Standing; using Content.Shared.Standing;
using Content.Shared.ActionBlocker; using Content.Shared.ActionBlocker;
using Content.Shared.Climbing.Events; using Content.Shared.Climbing.Events;
using Content.Shared.Inventory.VirtualItem; using Content.Shared.Inventory.VirtualItem;
using Content.Shared.Throwing; using Content.Shared.Throwing;
using Content.Shared.Physics.Pull;
using Content.Shared.Mobs.Systems; using Content.Shared.Mobs.Systems;
using Content.Shared.Movement.Pulling.Events;
using Content.Shared.Movement.Pulling.Systems;
using Robust.Shared.Map.Components; using Robust.Shared.Map.Components;
namespace Content.Server.Carrying namespace Content.Server.Carrying
@@ -37,11 +34,10 @@ namespace Content.Server.Carrying
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!; [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
[Dependency] private readonly StandingStateSystem _standingState = default!; [Dependency] private readonly StandingStateSystem _standingState = default!;
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
[Dependency] private readonly SharedPullingSystem _pullingSystem = default!; [Dependency] private readonly PullingSystem _pullingSystem = default!;
[Dependency] private readonly MobStateSystem _mobStateSystem = default!; [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
[Dependency] private readonly EscapeInventorySystem _escapeInventorySystem = default!; [Dependency] private readonly EscapeInventorySystem _escapeInventorySystem = default!;
[Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly ContestsSystem _contests = default!;
[Dependency] private readonly MovementSpeedModifierSystem _movementSpeed = default!; [Dependency] private readonly MovementSpeedModifierSystem _movementSpeed = default!;
[Dependency] private readonly PenetratedSystem _penetrated = default!; [Dependency] private readonly PenetratedSystem _penetrated = default!;

View File

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

View File

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

View File

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

View File

@@ -3,12 +3,11 @@ using Robust.Shared.Network;
namespace Content.Shared._White.Jukebox; namespace Content.Shared._White.Jukebox;
public class JukeboxSharedSystem : EntitySystem public sealed class JukeboxSharedSystem : EntitySystem
{ {
[Dependency] private readonly SharedContainerSystem _containerSystem = default!; [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
[Dependency] private readonly INetManager _netManager = default!; [Dependency] private readonly INetManager _netManager = default!;
public override void Initialize() public override void Initialize()
{ {
base.Initialize(); base.Initialize();
@@ -17,8 +16,11 @@ public class JukeboxSharedSystem : EntitySystem
public void OnJukeboxInit(EntityUid uid, JukeboxComponent component, ComponentStartup args) public void OnJukeboxInit(EntityUid uid, JukeboxComponent component, ComponentStartup args)
{ {
component.TapeContainer = _containerSystem.EnsureContainer<Container>(uid, JukeboxComponent.JukeboxContainerName); component.TapeContainer =
component.DefaultSongsContainer = _containerSystem.EnsureContainer<Container>(uid, JukeboxComponent.JukeboxDefaultSongsName); _containerSystem.EnsureContainer<Container>(uid, JukeboxComponent.JukeboxContainerName);
component.DefaultSongsContainer =
_containerSystem.EnsureContainer<Container>(uid, JukeboxComponent.JukeboxDefaultSongsName);
if (_netManager.IsServer) if (_netManager.IsServer)
{ {
@@ -28,10 +30,11 @@ public class JukeboxSharedSystem : EntitySystem
{ {
var tapeUid = EntityManager.SpawnEntity(tapePrototype, transform.MapPosition); 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) var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, component.LearnTime, new ScrollDoAfterEvent(), uid, target: uid)
{ {
BreakOnTargetMove = true, BreakOnMove = true,
BreakOnUserMove = true,
BreakOnDamage = true, BreakOnDamage = true,
NeedHand = true NeedHand = true
}; };