diff --git a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs b/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs index e066da5c2f3..28213f71350 100644 --- a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs @@ -21,6 +21,7 @@ using Robust.Shared.Prototypes; using Content.Shared.Nutrition.EntitySystems; using Content.Shared.Nyanotrasen.Abilities; +using Content.Shared.CombatMode.Pacification; // Frontier namespace Content.Server.Abilities.Felinid { @@ -47,6 +48,8 @@ public override void Initialize() SubscribeLocalEvent(OnUnequipped); SubscribeLocalEvent(OnHairballHit); SubscribeLocalEvent(OnHairballPickupAttempt); + + SubscribeLocalEvent(OnHairballAttemptPacifiedThrow); // Frontier - Block hairball abuse } private Queue RemQueue = new(); @@ -190,6 +193,11 @@ private void OnHairballPickupAttempt(EntityUid uid, HairballComponent component, args.Cancel(); } } + + private void OnHairballAttemptPacifiedThrow(Entity ent, ref AttemptPacifiedThrowEvent args) // Frontier - Block hairball abuse + { + args.Cancel("pacified-cannot-throw-hairball"); + } } } diff --git a/Resources/Locale/en-US/_NF/pacified/pacified.ftl b/Resources/Locale/en-US/_NF/pacified/pacified.ftl new file mode 100644 index 00000000000..7ca98d11afc --- /dev/null +++ b/Resources/Locale/en-US/_NF/pacified/pacified.ftl @@ -0,0 +1,4 @@ + +## Messages shown to Pacified players when they try to do violence: + +pacified-cannot-throw-hairball = I can't possibly throw { THE($projectile) }, what if somebody vomits? \ No newline at end of file