Revert "ugh"

This reverts commit 8b5b0e2.
themias · Jul 30, 2024 · 3ac15df · 3ac15df
1 parent af32785
commit 3ac15df
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
@@ -1,4 +1,3 @@
-/*
 #nullable enable
 using Content.Server.Cuffs;
 using Content.Shared.Body.Components;
@@ -107,4 +106,3 @@ private static void AddHand(NetEntity to, IServerConsoleHost host)
         }
     }
 }
-*/
diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs
@@ -461,9 +461,8 @@ public bool TryAddNewCuffs(EntityUid target, EntityUid user, EntityUid handcuff,
             if (!_interaction.InRangeUnobstructed(handcuff, target))
                 return false;
 
-            // Success?
-            if (!_hands.TryDrop(user, handcuff))
-                return false;
+            // Success!
+            _hands.TryDrop(user, handcuff);
 
             _container.Insert(handcuff, component.Container);
             UpdateHeldItems(target, handcuff, component);

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -1,4 +1,11 @@
 Entries:
+- author: SlamBamActionman
+  changes:
+  - message: "Removed Exterminators pending redesign. \U0001F525\U0001F44D\U0001F525"
+    type: Remove
+  id: 6475
+  time: '2024-04-28T05:45:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26978
 - author: Boaz1111
   changes:
   - message: Circuit imprinter recipes now cost less glass
@@ -3773,10 +3780,3 @@
   id: 6974
   time: '2024-07-23T17:47:08.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/30149
-- author: Quantus
-  changes:
-  - message: Reagent grinders can no longer auto-grind when unpowered.
-    type: Fix
-  id: 6975
-  time: '2024-07-23T21:02:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30267