]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
PullingController cooldown change (#29177)
authorRouge2t7 <81053047+Sarahon@users.noreply.github.com>
Wed, 19 Jun 2024 00:29:47 +0000 (01:29 +0100)
committerGitHub <noreply@github.com>
Wed, 19 Jun 2024 00:29:47 +0000 (10:29 +1000)
* 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.

Content.Server/Movement/Systems/PullController.cs

index f227d9c55cdaeb743092a3a7cf3ffe007cdfa013..340dc5654e86ed63b00852c4c738a9b144aa5d20 100644 (file)
@@ -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