juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Content arch (#20107)

Browse Source 
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
This commit is contained in:
metalgearsloth
2023-11-23 14:34:37 +11:00
committed by GitHub
parent 7d2e8c7087
commit 93bd9972f1
33 changed files with 331 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Anomaly/SharedAnomalySystem.cs
View File

@@ -109,7 +109,7 @@ public abstract class SharedAnomalySystem : EntitySystem
var pulse = EnsureComp<AnomalyPulsingComponent>(uid);
pulse.EndTime = Timing.CurTime + pulse.PulseDuration;
Appearance.SetData(uid, AnomalyVisuals.IsPulsing, true);
var ev = new AnomalyPulseEvent(uid, component.Stability, component.Severity);
RaiseLocalEvent(uid, ref ev, true);
}

1
Content.Shared/Blocking/BlockingSystem.User.cs
View File

@@ -1,5 +1,4 @@
using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
using Robust.Shared.Audio;
using Robust.Shared.Containers;

2
Content.Shared/Chasm/ChasmSystem.cs
View File

@@ -1,9 +1,7 @@
using Content.Shared.ActionBlocker;
using Content.Shared.Buckle.Components;
using Content.Shared.Movement.Events;
using Content.Shared.StepTrigger.Systems;
using Robust.Shared.Network;
using Robust.Shared.Physics.Components;
using Robust.Shared.Timing;
namespace Content.Shared.Chasm;

2
Content.Shared/Climbing/Systems/ClimbSystem.cs
View File

@@ -1,4 +1,3 @@
using System.Numerics;
using Content.Shared.ActionBlocker;
using Content.Shared.Body.Components;
using Content.Shared.Body.Part;
@@ -13,7 +12,6 @@ using Content.Shared.Hands.Components;
using Content.Shared.IdentityManagement;
using Content.Shared.Interaction;
using Content.Shared.Movement.Events;
using Content.Shared.Movement.Systems;
using Content.Shared.Physics;
using Content.Shared.Popups;
using Content.Shared.Stunnable;

2
Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
View File

@@ -110,7 +110,7 @@ namespace Content.Shared.Containers.ItemSlots
/// </summary>
public void RemoveItemSlot(EntityUid uid, ItemSlot slot, ItemSlotsComponent? itemSlots = null)
{
if (Terminating(uid) || slot.ContainerSlot == null)
if (TerminatingOrDeleted(uid) || slot.ContainerSlot == null)
return;
slot.ContainerSlot.Shutdown();

1
Content.Shared/Cuffs/SharedCuffableSystem.cs
View File

@@ -3,7 +3,6 @@ using Content.Shared.ActionBlocker;
using Content.Shared.Administration.Components;
using Content.Shared.Administration.Logs;
using Content.Shared.Alert;
using Content.Shared.Atmos.Piping.Unary.Components;
using Content.Shared.Buckle.Components;
using Content.Shared.Cuffs.Components;
using Content.Shared.Damage;

3
Content.Shared/Inventory/InventorySystem.Equip.cs
View File

@@ -14,7 +14,6 @@ using Robust.Shared.Audio;
using Robust.Shared.Containers;
using Robust.Shared.Network;
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
namespace Content.Shared.Inventory;
@@ -24,9 +23,9 @@ public abstract partial class InventorySystem
[Dependency] private readonly SharedPopupSystem _popup = default!;
[Dependency] private readonly MovementSpeedModifierSystem _movementSpeed = default!;
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
[Dependency] private readonly SharedItemSystem _item = default!;
[Dependency] private readonly SharedContainerSystem _containerSystem = default!;
[Dependency] private readonly SharedHandsSystem _handsSystem = default!;
[Dependency] private readonly SharedItemSystem _item = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly INetManager _netMan = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;

4
Content.Shared/Lock/LockSystem.cs
View File

@@ -106,7 +106,7 @@ public sealed class LockSystem : EntitySystem
lockComp.Locked = true;
_appearanceSystem.SetData(uid, StorageVisuals.Locked, true);
Dirty(lockComp);
Dirty(uid, lockComp);
var ev = new LockToggledEvent(true);
RaiseLocalEvent(uid, ref ev, true);
@@ -134,7 +134,7 @@ public sealed class LockSystem : EntitySystem
lockComp.Locked = false;
_appearanceSystem.SetData(uid, StorageVisuals.Locked, false);
Dirty(lockComp);
Dirty(uid, lockComp);
var ev = new LockToggledEvent(false);
RaiseLocalEvent(uid, ref ev, true);

3
Content.Shared/Mech/Equipment/Systems/MechSoundboardSystem.cs
View File

@@ -1,8 +1,5 @@
using Content.Shared.Mech;
using Content.Shared.Mech.Equipment.Components;
using Content.Shared.Mech.Equipment.Systems;
using Content.Shared.Timing;
using Robust.Shared.Audio;
using System.Linq;
namespace Content.Shared.Mech.Equipment.Systems;

1
Content.Shared/RCD/Systems/RCDSystem.cs
View File

@@ -12,7 +12,6 @@ using Content.Shared.Popups;
using Content.Shared.RCD.Components;
using Content.Shared.Tag;
using Content.Shared.Tiles;
using Robust.Shared.Audio;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
using Robust.Shared.Network;

1
Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs
View File

@@ -6,7 +6,6 @@ using Content.Shared.Hands.EntitySystems;
using Content.Shared.Interaction;
using Content.Shared.Popups;
using Content.Shared.Radio.Components;
using Content.Shared.Tools;
using Content.Shared.Tools.Components;
using Content.Shared.Wires;
using Robust.Shared.Containers;

2
Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
View File

@@ -20,9 +20,7 @@ using Robust.Shared.GameStates;
using Robust.Shared.Map;
using Robust.Shared.Network;
using Robust.Shared.Physics;
using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Systems;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
using Robust.Shared.Utility;

6
Content.Shared/Stunnable/SharedStunSystem.cs
View File

@@ -1,7 +1,5 @@
using Content.Shared.ActionBlocker;
using Content.Shared.Administration.Logs;
using Content.Shared.Audio;
using Content.Shared.DragDrop;
using Content.Shared.Interaction;
using Content.Shared.Interaction.Events;
using Content.Shared.Inventory.Events;
@@ -11,15 +9,11 @@ using Content.Shared.Database;
using Content.Shared.Hands;
using Content.Shared.Mobs;
using Content.Shared.Mobs.Components;
using Content.Shared.Mobs.Systems;
using Content.Shared.Movement.Events;
using Content.Shared.Movement.Systems;
using Content.Shared.Standing;
using Content.Shared.StatusEffect;
using Content.Shared.Throwing;
using Robust.Shared.Audio;
using Robust.Shared.GameStates;
using Robust.Shared.Player;
namespace Content.Shared.Stunnable;

2
Content.Shared/Weapons/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs
View File

@@ -1,9 +1,7 @@
using Content.Shared.Examine;
using Content.Shared.Weapons.Ranged.Components;
using Robust.Shared.Network;
using Robust.Shared.Player;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
namespace Content.Shared.Weapons.Ranged.Systems;