tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move disarmed event (#8130)

Browse Source
This commit is contained in:
wrexbe
2022-05-12 22:30:30 -07:00
committed by GitHub
parent 41f38ef0a0
commit 16ad873688
8 changed files with 10 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/CombatMode/CombatModeSystem.cs
View File

@@ -1,5 +1,3 @@
using System.Diagnostics;
using Content.Server.Act;
using Content.Server.Actions.Events;
using Content.Server.Administration.Logs;
using Content.Server.Hands.Components;
@@ -11,10 +9,6 @@ using Content.Shared.CombatMode;
using Content.Shared.Database;
using JetBrains.Annotations;
using Robust.Shared.Audio;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Player;
using Robust.Shared.Random;

2
Content.Server/Act/IDisarmedAct.cs → Content.Server/CombatMode/DisarmedEvent.cs
View File

@@ -1,4 +1,4 @@
namespace Content.Server.Act
namespace Content.Server.CombatMode
{
public sealed class DisarmedEvent : HandledEntityEventArgs
{

14
Content.Server/Hands/Systems/HandsSystem.cs
View File

@@ -1,22 +1,26 @@
using System.Linq;
using Content.Server.Act;
using Content.Server.Administration.Logs;
using Content.Server.CombatMode;
using Content.Server.Hands.Components;
using Content.Server.Popups;
using Content.Server.Pulling;
using Content.Server.Stack;
using Content.Server.Storage.Components;
using Content.Server.Storage.EntitySystems;
using Content.Server.Strip;
using Content.Server.Stunnable;
using Content.Shared.ActionBlocker;
using Content.Shared.Database;
using Content.Shared.Hands;
using Content.Shared.Hands.Components;
using Content.Shared.Stunnable;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Input;
using Content.Shared.Inventory;
using Content.Shared.Physics.Pull;
using Content.Shared.Popups;
using Content.Shared.Pulling.Components;
using Content.Shared.Stunnable;
using Content.Shared.Throwing;
using JetBrains.Annotations;
using Robust.Server.GameObjects;
using Robust.Server.Player;
@@ -27,10 +31,6 @@ using Robust.Shared.Map;
using Robust.Shared.Player;
using Robust.Shared.Players;
using Robust.Shared.Utility;
using Content.Shared.Pulling.Components;
using Content.Server.Pulling;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Throwing;
namespace Content.Server.Hands.Systems
{

6
Content.Server/Kitchen/Components/MicrowaveComponent.cs
View File

@@ -1,19 +1,13 @@
using System.Linq;
using Content.Server.Act;
using Content.Server.Chat.Managers;
using Content.Server.Chemistry.Components.SolutionManager;
using Content.Server.Chemistry.EntitySystems;
using Content.Server.Popups;
using Content.Server.Power.Components;
using Content.Server.Temperature.Components;
using Content.Server.Temperature.Systems;
using Content.Server.UserInterface;
using Content.Shared.Body.Components;
using Content.Shared.Body.Part;
using Content.Shared.FixedPoint;
using Content.Shared.Kitchen;
using Content.Shared.Kitchen.Components;
using Content.Shared.Popups;
using Content.Shared.Power;
using Content.Shared.Sound;
using Content.Shared.Tag;

8
Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs
View File

@@ -1,16 +1,10 @@
using System.Threading;
using Content.Server.Act;
using Content.Server.Chat.Managers;
using Content.Server.GameTicking;
using Content.Server.Players;
using Content.Server.Popups;
using Content.Server.Storage.Components;
using Content.Shared.Interaction;
using Content.Shared.Morgue;
using Content.Shared.Popups;
using Content.Shared.Sound;
using Content.Shared.Standing;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.Player;

8
Content.Server/Recycling/Components/RecyclerComponent.cs
View File

@@ -1,13 +1,5 @@
using Content.Server.Act;
using Content.Server.Chat.Managers;
using Content.Server.GameTicking;
using Content.Server.Players;
using Content.Server.Popups;
using Content.Shared.Body.Components;
using Content.Shared.Popups;
using Content.Shared.Recycling;
using Content.Shared.Sound;
using Robust.Server.GameObjects;
namespace Content.Server.Recycling.Components
{

7
Content.Server/Stunnable/StunSystem.cs
View File

@@ -1,17 +1,12 @@
using System;
using Content.Server.Act;
using Content.Server.Administration.Logs;
using Content.Server.CombatMode;
using Content.Server.Popups;
using Content.Shared.Administration.Logs;
using Content.Shared.Audio;
using Content.Shared.Database;
using Content.Shared.Popups;
using Content.Shared.StatusEffect;
using Content.Shared.Stunnable;
using Robust.Shared.Audio;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Player;
using Robust.Shared.Random;

4
Content.Server/Toilet/ToiletSystem.cs
View File

@@ -1,4 +1,3 @@
using Content.Server.Act;
using Content.Server.Buckle.Components;
using Content.Server.Popups;
using Content.Server.Storage.Components;
@@ -13,9 +12,6 @@ using Content.Shared.Interaction.Events;
using Content.Shared.Toilet;
using Content.Shared.Tools.Components;
using Robust.Shared.Audio;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Player;
using Robust.Shared.Random;