NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 10:21:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Move SuicideSystem into its own directory (#44965)

Browse source
This commit is contained in:
Andrei Hava 2026-07-27 23:07:07 +03:00 • committed by GitHub
parent b122b95377
commit 4009f2d833
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Content.Client/Suicide/SuicideSystem.cs Normal file
View file

@ -0,0 +1,5 @@
using Content.Shared.Suicide;
namespace Content.Client.Suicide;
public sealed class SuicideSystem : SharedSuicideSystem;

3
Content.Server/Chat/Commands/SuicideCommand.cs
View file

@ -1,7 +1,6 @@
using Content.Server.GameTicking;
using Content.Server.Popups;
using Content.Server.Suicide;
using Content.Shared.Administration;
using Content.Shared.Chat;
using Content.Shared.Mind;
using Robust.Shared.Console;
using Robust.Shared.Enums;

27
Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
View file

@ -1,45 +1,42 @@
using System.Linq;
using Content.Server.Administration.Logs;
using Content.Server.Construction;
using Content.Server.Explosion.EntitySystems;
using Content.Server.Construction.Components;
using Content.Server.DeviceLinking.Systems;
using Content.Server.Explosion.EntitySystems;
using Content.Server.Hands.Systems;
using Content.Server.Kitchen.Components;
using Content.Server.Lightning;
using Content.Server.Power.Components;
using Content.Server.Power.EntitySystems;
using Content.Server.Temperature.Systems;
using Content.Shared.Chemistry.Components.SolutionManager;
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.Chemistry.Reaction;
using Content.Shared.Construction.EntitySystems;
using Content.Shared.Damage.Components;
using Content.Shared.Database;
using Content.Shared.DeviceLinking.Events;
using Content.Shared.Destructible;
using Content.Shared.DeviceLinking.Events;
using Content.Shared.FixedPoint;
using Content.Shared.IdentityManagement;
using Content.Shared.Interaction;
using Content.Shared.Interaction.Events;
using Robust.Shared.Random;
using Robust.Shared.Audio;
using Content.Server.Lightning;
using Content.Shared.Item;
using Content.Shared.Kitchen;
using Content.Shared.Kitchen.Components;
using Content.Shared.Popups;
using Content.Shared.Power;
using Content.Shared.Power.EntitySystems;
using Content.Shared.Stacks;
using Content.Shared.Suicide;
using Content.Shared.Tag;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Containers;
using Robust.Shared.Player;
using System.Linq;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using Robust.Shared.Timing;
using Content.Shared.Stacks;
using Content.Server.Construction.Components;
using Content.Shared.Chat;
using Content.Shared.Damage.Components;
using Content.Shared.Power.EntitySystems;
using Content.Shared.Temperature.Components;
using Content.Shared.IdentityManagement;
namespace Content.Server.Kitchen.EntitySystems
{

12
Content.Server/Chat/SuicideSystem.cs → Content.Server/Suicide/SuicideSystem.cs
View file

@ -1,7 +1,6 @@
using Content.Server.Ghost;
using Content.Server.Hands.Systems;
using Content.Shared.Administration.Logs;
using Content.Shared.Chat;
using Content.Shared.Damage.Components;
using Content.Shared.Database;
using Content.Shared.IdentityManagement;
@ -12,13 +11,14 @@ using Content.Shared.Mind.Components;
using Content.Shared.Mobs.Components;
using Content.Shared.Mobs.Systems;
using Content.Shared.Popups;
using Content.Shared.Suicide;
using Content.Shared.Tag;
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
namespace Content.Server.Chat;
namespace Content.Server.Suicide;
public sealed partial class SuicideSystem : EntitySystem
public sealed partial class SuicideSystem : SharedSuicideSystem
{
[Dependency] private EntityLookupSystem _entityLookupSystem = default!;
[Dependency] private ISharedAdminLogManager _adminLogger = default!;
@ -27,7 +27,6 @@ public sealed partial class SuicideSystem : EntitySystem
[Dependency] private MobStateSystem _mobState = default!;
[Dependency] private SharedPopupSystem _popup = default!;
[Dependency] private GhostSystem _ghostSystem = default!;
[Dependency] private SharedSuicideSystem _suicide = default!;
[Dependency] private EntityQuery<ItemComponent> _itemQuery = default!;
private static readonly ProtoId<TagPrototype> CannotSuicideTag = "CannotSuicide";
@ -83,6 +82,7 @@ public sealed partial class SuicideSystem : EntitySystem
{
_adminLogger.Add(LogType.Mind, $"{ToPrettyString(victim):player} suicided.");
}
return true;
}
@ -162,13 +162,13 @@ public sealed partial class SuicideSystem : EntitySystem
if (args.DamageSpecifier != null)
{
_suicide.ApplyLethalDamage(victim, args.DamageSpecifier);
ApplyLethalDamage(victim, args.DamageSpecifier);
args.Handled = true;
return;
}
args.DamageType ??= "Bloodloss";
_suicide.ApplyLethalDamage(victim, args.DamageType);
ApplyLethalDamage(victim, args.DamageType);
args.Handled = true;
}
}

4
Content.Shared/Execution/SharedExecutionSystem.cs
View file

@ -1,17 +1,17 @@
using Content.Shared.ActionBlocker;
using Content.Shared.Chat;
using Content.Shared.CombatMode;
using Content.Shared.Damage.Components;
using Content.Shared.Database;
using Content.Shared.DoAfter;
using Content.Shared.IdentityManagement;
using Content.Shared.Interaction.Events;
using Content.Shared.Mobs.Components;
using Content.Shared.Mobs.Systems;
using Content.Shared.Popups;
using Content.Shared.Suicide;
using Content.Shared.Verbs;
using Content.Shared.Weapons.Melee;
using Content.Shared.Weapons.Melee.Events;
using Content.Shared.Interaction.Events;
using Robust.Shared.Audio.Systems;
namespace Content.Shared.Execution;

4
Content.Shared/Chat/SharedSuicideSystem.cs → Content.Shared/Suicide/SharedSuicideSystem.cs
View file

@ -6,9 +6,9 @@ using Content.Shared.Damage.Systems;
using Content.Shared.Mobs.Components;
using Robust.Shared.Prototypes;
namespace Content.Shared.Chat;
namespace Content.Shared.Suicide;
public sealed partial class SharedSuicideSystem : EntitySystem
public abstract partial class SharedSuicideSystem : EntitySystem
{
private static readonly ProtoId<DamageTypePrototype> FallbackDamageType = "Blunt";