Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Move TimedDespawn to engine (#20515)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-30 14:35:32 +10:00
committed by GitHub
parent 4a884cda6c
commit 3a196a1d09
21 changed files with 35 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/Animations/ReusableAnimations.cs
View File

@@ -1,9 +1,10 @@
using System.Numerics;
using Content.Shared.Spawners.Components;
using Robust.Shared.Spawners;
using Robust.Client.Animations;
using Robust.Client.GameObjects;
using Robust.Shared.Animations;
using Robust.Shared.Map;
using TimedDespawnComponent = Robust.Shared.Spawners.TimedDespawnComponent;
namespace Content.Client.Animations
{

2
Content.Client/Chemistry/Visualizers/FoamVisualizerSystem.cs
View File

@@ -1,5 +1,5 @@
using Content.Shared.Smoking;
using Content.Shared.Spawners.Components;
using Robust.Shared.Spawners;
using Robust.Client.Animations;
using Robust.Client.GameObjects;
using Robust.Shared.Network;

3
Content.Client/Content.Client.csproj
View File

@@ -23,6 +23,9 @@
<ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
<ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Spawners\" />
</ItemGroup>
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
<Import Project="..\RobustToolbox\MSBuild\XamlIL.targets" />
</Project>

3
Content.Client/Projectiles/ProjectileSystem.cs
View File

@@ -1,9 +1,10 @@
using Content.Shared.Projectiles;
using Content.Shared.Spawners.Components;
using Robust.Shared.Spawners;
using Content.Shared.Weapons.Ranged.Systems;
using Robust.Client.Animations;
using Robust.Client.GameObjects;
using Robust.Shared.GameStates;
using TimedDespawnComponent = Robust.Shared.Spawners.TimedDespawnComponent;
namespace Content.Client.Projectiles;

3
Content.Client/Salvage/FultonSystem.cs
View File

@@ -1,6 +1,6 @@
using System.Numerics;
using Content.Shared.Salvage.Fulton;
using Content.Shared.Spawners.Components;
using Robust.Shared.Spawners;
using JetBrains.Annotations;
using Robust.Client.Animations;
using Robust.Client.GameObjects;
@@ -8,6 +8,7 @@ using Robust.Client.Graphics;
using Robust.Shared.Animations;
using Robust.Shared.Serialization.Manager;
using Robust.Shared.Utility;
using TimedDespawnComponent = Robust.Shared.Spawners.TimedDespawnComponent;
namespace Content.Client.Salvage;

11
Content.Client/Spawners/TimedDespawnSystem.cs
View File

@@ -1,11 +0,0 @@
using Content.Shared.Spawners.EntitySystems;
namespace Content.Client.Spawners;
public sealed class TimedDespawnSystem : SharedTimedDespawnSystem
{
protected override bool CanDelete(EntityUid uid)
{
return IsClientSide(uid);
}
}

3
Content.Client/Weapons/Ranged/Systems/GunSystem.cs
View File

@@ -3,7 +3,7 @@ using Content.Client.Items;
using Content.Client.Weapons.Ranged.Components;
using Content.Shared.Camera;
using Content.Shared.CombatMode;
using Content.Shared.Spawners.Components;
using Robust.Shared.Spawners;
using Content.Shared.Weapons.Ranged;
using Content.Shared.Weapons.Ranged.Components;
using Content.Shared.Weapons.Ranged.Events;
@@ -19,6 +19,7 @@ using Robust.Shared.Map;
using Robust.Shared.Prototypes;
using Robust.Shared.Utility;
using SharedGunSystem = Content.Shared.Weapons.Ranged.Systems.SharedGunSystem;
using TimedDespawnComponent = Robust.Shared.Spawners.TimedDespawnComponent;
namespace Content.Client.Weapons.Ranged.Systems;