From 6fb87ba3015da9893ad3c4c334beb59a91cd61ce Mon Sep 17 00:00:00 2001 From: DisposableCrewmember42 Date: Sun, 4 Jan 2026 12:08:38 +0100 Subject: [PATCH] tweak: nanotask papers don't provide throwing pushback --- Content.Server/Hands/Systems/HandsSystem.cs | 4 +++- .../_DV/Item/Components/NoThrowingPushbackComponent.cs | 4 ++++ Resources/Prototypes/Entities/Objects/Misc/paper.yml | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 Content.Shared/_DV/Item/Components/NoThrowingPushbackComponent.cs diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs index e3cdb8bfef..9404ec7fa1 100644 --- a/Content.Server/Hands/Systems/HandsSystem.cs +++ b/Content.Server/Hands/Systems/HandsSystem.cs @@ -1,6 +1,7 @@ using System.Numerics; using Content.Server.Stack; using Content.Server.Stunnable; +using Content.Shared._DV.Item; using Content.Shared._NF.Standing; // Frontier using Content.Shared.ActionBlocker; using Content.Shared.Body.Part; @@ -224,7 +225,8 @@ namespace Content.Server.Hands.Systems if (IsHolding((player, hands), throwEnt, out _) && !TryDrop(player, throwEnt.Value)) return false; - _throwingSystem.TryThrow(ev.ItemUid, ev.Direction, ev.ThrowSpeed, ev.PlayerUid, compensateFriction: !HasComp(ev.ItemUid)); + // DeltaV - Set pushback to 0 if NoThrowingPushback, previously unset + _throwingSystem.TryThrow(ev.ItemUid, ev.Direction, ev.ThrowSpeed, ev.PlayerUid, pushbackRatio: HasComp(ev.ItemUid) ? 0 : ThrowingSystem.PushbackDefault, compensateFriction: !HasComp(ev.ItemUid)); return true; } diff --git a/Content.Shared/_DV/Item/Components/NoThrowingPushbackComponent.cs b/Content.Shared/_DV/Item/Components/NoThrowingPushbackComponent.cs new file mode 100644 index 0000000000..2e568c427f --- /dev/null +++ b/Content.Shared/_DV/Item/Components/NoThrowingPushbackComponent.cs @@ -0,0 +1,4 @@ +namespace Content.Shared._DV.Item.Components; + +[RegisterComponent] +public sealed partial class NoThrowingPushbackComponent : Component; diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index cd7dc74a75..c6396a8784 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -236,6 +236,7 @@ contentMargin: 12.0, 0.0, 12.0, 0.0 # This is a narrow piece of paper maxWritableArea: 256.0, 0.0 + - type: NoThrowingPushback # DeltaV - Added comp - type: entity id: PaperCargoBountyManifest