From d5d6fb51aa6e8d378fb92fb4ad7bea0682f7e721 Mon Sep 17 00:00:00 2001
From: Plykiya <58439124+Plykiya@users.noreply.github.com>
Date: Thu, 19 Sep 2024 07:08:33 -0700
Subject: [PATCH] Allows you to buckle transfer person from bed to bed (#32089)

* unbuckle if the target is buckled

* better way to do it
---
 Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
index 7f6c39eafc0679..8b35f677f1856d 100644
--- a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
+++ b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
@@ -268,7 +268,7 @@ private bool CanBuckle(EntityUid buckleUid,
             return false;
         }
 
-        if (buckleComp.Buckled)
+        if (buckleComp.Buckled && !TryUnbuckle(buckleUid, user, buckleComp))
         {
             if (popup)
             {