diff --git a/Content.Server/Damage/Systems/DamageOnLandSystem.cs b/Content.Server/Damage/Systems/DamageOnLandSystem.cs index 2e72e76e6d8361..3cf103e6eeec35 100644 --- a/Content.Server/Damage/Systems/DamageOnLandSystem.cs +++ b/Content.Server/Damage/Systems/DamageOnLandSystem.cs @@ -1,10 +1,12 @@ using Content.Server.Damage.Components; -using Content.Shared.CombatMode.Pacification; using Content.Shared.Damage; using Content.Shared.Throwing; namespace Content.Server.Damage.Systems { + /// + /// Damages the thrown item when it lands. + /// public sealed class DamageOnLandSystem : EntitySystem { [Dependency] private readonly DamageableSystem _damageableSystem = default!; @@ -13,19 +15,6 @@ public override void Initialize() { base.Initialize(); SubscribeLocalEvent(DamageOnLand); - SubscribeLocalEvent(OnAttemptPacifiedThrow); - } - - /// - /// Prevent Pacified entities from throwing damaging items. - /// - private void OnAttemptPacifiedThrow(Entity ent, ref AttemptPacifiedThrowEvent args) - { - // Allow healing projectiles, forbid any that do damage: - if (ent.Comp.Damage.AnyPositive()) - { - args.Cancel("pacified-cannot-throw"); - } } private void DamageOnLand(EntityUid uid, DamageOnLandComponent component, ref LandEvent args)