tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow Pacifists to Use Bola (#37188)

Browse Source
This commit is contained in:
Cojoke
2025-05-06 11:55:00 -05:00
committed by GitHub
parent c0935e5b59
commit 02c2de3ec5
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Ensnaring/SharedEnsnareableSystem.cs
View File

@@ -52,7 +52,6 @@ public abstract class SharedEnsnareableSystem : EntitySystem
SubscribeLocalEvent<EnsnaringComponent, StepTriggerAttemptEvent>(AttemptStepTrigger); SubscribeLocalEvent<EnsnaringComponent, StepTriggerAttemptEvent>(AttemptStepTrigger);
SubscribeLocalEvent<EnsnaringComponent, StepTriggeredOffEvent>(OnStepTrigger); SubscribeLocalEvent<EnsnaringComponent, StepTriggeredOffEvent>(OnStepTrigger);
SubscribeLocalEvent<EnsnaringComponent, ThrowDoHitEvent>(OnThrowHit); SubscribeLocalEvent<EnsnaringComponent, ThrowDoHitEvent>(OnThrowHit);
SubscribeLocalEvent<EnsnaringComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
} }
protected virtual void OnEnsnareInit(Entity<EnsnareableComponent> ent, ref ComponentInit args) protected virtual void OnEnsnareInit(Entity<EnsnareableComponent> ent, ref ComponentInit args)
@@ -187,11 +186,6 @@ public abstract class SharedEnsnareableSystem : EntitySystem
} }
} }
private void OnAttemptPacifiedThrow(Entity<EnsnaringComponent> ent, ref AttemptPacifiedThrowEvent args)
{
args.Cancel("pacified-cannot-throw-snare");
}
private void OnRemoveEnsnareAlert(Entity<EnsnareableComponent> ent, ref RemoveEnsnareAlertEvent args) private void OnRemoveEnsnareAlert(Entity<EnsnareableComponent> ent, ref RemoveEnsnareAlertEvent args)
{ {
if (args.Handled) if (args.Handled)

2
Resources/Locale/en-US/pacified/pacified.ftl
View File

@@ -7,8 +7,6 @@ pacified-cannot-throw = I can't bring myself to throw { THE($projectile) }, that
pacified-cannot-throw-embed = No way I could throw { THE($projectile) }, that could get lodged inside someone! pacified-cannot-throw-embed = No way I could throw { THE($projectile) }, that could get lodged inside someone!
# With liquid-spilling projectiles: # With liquid-spilling projectiles:
pacified-cannot-throw-spill = I can't possibly throw { THE($projectile) }, that could spill nasty stuff on someone! pacified-cannot-throw-spill = I can't possibly throw { THE($projectile) }, that could spill nasty stuff on someone!
# With bolas and snares:
pacified-cannot-throw-snare = I can't throw { THE($projectile) }, what if someone trips?!
pacified-cannot-harm-directly = I can't bring myself to hurt { THE($entity) }! pacified-cannot-harm-directly = I can't bring myself to hurt { THE($entity) }!
pacified-cannot-harm-indirect = I can't damage { THE($entity) }, it could hurt someone! pacified-cannot-harm-indirect = I can't damage { THE($entity) }, it could hurt someone!