Skip to content

Commit

Permalink
Whatstone fixup for hairballs
Browse files Browse the repository at this point in the history
  • Loading branch information
dvir001 committed Aug 9, 2024
1 parent f43f41b commit 5358dcd
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
8 changes: 8 additions & 0 deletions Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -47,6 +48,8 @@ public override void Initialize()
SubscribeLocalEvent<FelinidComponent, DidUnequipHandEvent>(OnUnequipped);
SubscribeLocalEvent<HairballComponent, ThrowDoHitEvent>(OnHairballHit);
SubscribeLocalEvent<HairballComponent, GettingPickedUpAttemptEvent>(OnHairballPickupAttempt);

SubscribeLocalEvent<HairballComponent, AttemptPacifiedThrowEvent>(OnHairballAttemptPacifiedThrow); // Frontier - Block hairball abuse
}

private Queue<EntityUid> RemQueue = new();
Expand Down Expand Up @@ -190,6 +193,11 @@ private void OnHairballPickupAttempt(EntityUid uid, HairballComponent component,
args.Cancel();
}
}

private void OnHairballAttemptPacifiedThrow(Entity<HairballComponent> ent, ref AttemptPacifiedThrowEvent args) // Frontier - Block hairball abuse
{
args.Cancel("pacified-cannot-throw-hairball");
}
}

}
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/_NF/pacified/pacified.ftl
Original file line number Diff line number Diff line change
@@ -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?

0 comments on commit 5358dcd

Please sign in to comment.