From: Rouge2t7 <81053047+Sarahon@users.noreply.github.com> Date: Wed, 19 Jun 2024 00:29:47 +0000 (+0100) Subject: PullingController cooldown change (#29177) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=c8de4ec397f66056298f5b66aec5b01ae7e1c67e;p=space-station-14.git PullingController cooldown change (#29177) * Revert "Automatic changelog update" This reverts commit 3358aef40f2b5525ec15e6ce01533b4e8c2ddfc9. * Revert "Revert "Automatic changelog update"" This reverts commit 3d0b6a7ade06ec555d4f6df3f39134b139e5247c. * Removal of the throw cooldown as it felt sluggish and unresponsive before. --- diff --git a/Content.Server/Movement/Systems/PullController.cs b/Content.Server/Movement/Systems/PullController.cs index f227d9c55c..340dc5654e 100644 --- a/Content.Server/Movement/Systems/PullController.cs +++ b/Content.Server/Movement/Systems/PullController.cs @@ -127,10 +127,6 @@ public sealed class PullController : VirtualController if (_container.IsEntityInContainer(player)) return false; - // Cooldown buddy - if (_timing.CurTime < pullerComp.NextThrow) - return false; - pullerComp.NextThrow = _timing.CurTime + pullerComp.ThrowCooldown; // Cap the distance