Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

shadowlings can't cuff #205

Merged
merged 5 commits into from
Nov 1, 2024
Merged

shadowlings can't cuff #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
582941a
shadowlings can't cuff
pheenty Oct 30, 2024
da29c68
cuffingspeed
pheenty Oct 30, 2024
80af0e2
thick-fingers
pheenty Oct 30, 2024
bafd549
cuffercomponent
pheenty Oct 31, 2024
4e2f967
just make them worse
pheenty Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Content.Shared/Cuffs/SharedCuffableSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,16 @@ public bool TryCuffing(EntityUid user, EntityUid target, EntityUid handcuff, Han
if (HasComp<StunnedComponent>(target))
cuffTime = MathF.Max(0.1f, cuffTime - handcuffComponent.StunBonus);

if (TryComp<CufferComponent>(user, out var cuffer)) // Stories - CuffingSpeed - start
{
if (cuffer.TimeModifier == null)
{
_popup.PopupClient(Loc.GetString("handcuff-component-cannot-use-cuffs"), user, user);
return false;
}
cuffTime = cuffTime * (float)cuffer.TimeModifier;
} // Stories - CuffingSpeed - end

if (HasComp<DisarmProneComponent>(target))
cuffTime = 0.0f; // cuff them instantly.

Expand Down
8 changes: 8 additions & 0 deletions Content.Shared/Stories/Cuffs/CufferComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace Content.Shared.Cuffs;

[RegisterComponent]
public sealed partial class CufferComponent : Component
{
[DataField("timeModifier")]
public float? TimeModifier = 1;
}
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/cuffs/components/handcuff-component.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ handcuff-component-cuff-interrupt-other-message = Вы помешали { $other
handcuff-component-cuff-interrupt-buckled-message = Вы не можете пристегнуться в наручниках!
handcuff-component-cuff-interrupt-unbuckled-message = Вы не можете отстегнуться в наручниках!
handcuff-component-cannot-drop-cuffs = Вы не можете надеть наручники на { $target }

handcuff-component-cannot-use-cuffs = Ваши пальцы слишком толстые, чтобы использовать наручники!
2 changes: 2 additions & 0 deletions Resources/Prototypes/Stories/Entities/Mobs/Species/shadowling.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
id: BaseMobShadowling
abstract: true
components:
- type: Cuffer
timeModifier: 2
- type: ZombieImmune
- type: ThermalVision
- type: ComplexInteraction
Expand Down
Loading