diff --git a/Content.Server/Nutrition/Components/ForcefeedOnCollideComponent.cs b/Content.Server/Nutrition/Components/ForcefeedOnCollideComponent.cs deleted file mode 100644 index e3dfaad884..0000000000 --- a/Content.Server/Nutrition/Components/ForcefeedOnCollideComponent.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Content.Server.Nutrition.EntitySystems; - -namespace Content.Server.Nutrition.Components -{ - /// - /// A food item with this component will be forcefully fed to anyone - /// - [RegisterComponent, Access(typeof(ForcefeedOnCollideSystem))] - public sealed class ForcefeedOnCollideComponent : Component - { - /// - /// Since this component is primarily used by the pneumatic cannon, which adds this comp on throw start - /// and wants to remove it on throw end, this is set to false. However, you're free to change it if you want - /// something that can -always- be forcefed on collide, or something. - /// - [DataField("removeOnThrowEnd")] - public bool RemoveOnThrowEnd = true; - } -} diff --git a/Content.Server/Nutrition/EntitySystems/ForcefeedOnCollideSystem.cs b/Content.Server/Nutrition/EntitySystems/ForcefeedOnCollideSystem.cs deleted file mode 100644 index 41f92dcc9e..0000000000 --- a/Content.Server/Nutrition/EntitySystems/ForcefeedOnCollideSystem.cs +++ /dev/null @@ -1,31 +0,0 @@ -using Content.Server.Nutrition.Components; -using Content.Shared.Throwing; - -namespace Content.Server.Nutrition.EntitySystems -{ - public sealed class ForcefeedOnCollideSystem : EntitySystem - { - [Dependency] private readonly FoodSystem _foodSystem = default!; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnThrowDoHit); - SubscribeLocalEvent(OnLand); - } - - private void OnThrowDoHit(EntityUid uid, ForcefeedOnCollideComponent component, ThrowDoHitEvent args) - { - _foodSystem.ProjectileForceFeed(uid, args.Target, args.User); - } - - private void OnLand(EntityUid uid, ForcefeedOnCollideComponent component, LandEvent args) - { - if (!component.RemoveOnThrowEnd) - return; - - EntityManager.RemoveComponent(uid, component); - } - } -} diff --git a/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs b/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs index 3c7b5780b4..6bc3df18f5 100644 --- a/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs +++ b/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs @@ -236,9 +236,6 @@ namespace Content.Server.PneumaticCannon _throwingSystem.TryThrow(ent, data.Direction, data.Strength, data.User, GetPushbackRatioFromPower(comp.Power)); - // lasagna, anybody? - ent.EnsureComponent(); - if(EntityManager.TryGetComponent(data.User, out var status) && comp.Power == PneumaticCannonPower.High) { diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml index 53bee35db2..ad0fa4d485 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml @@ -114,9 +114,6 @@ - state: tin - state: plain - type: CreamPie - - type: SolutionInjectOnCollide - transferAmount: 20 - transferEfficiency: 0.2 # Tastes like pie, cream, banana. - type: entity