From c4d9904de5786cafa2656bdb3e8bd33d6e6fc515 Mon Sep 17 00:00:00 2001
From: Jessica M <jessica@jessicamaybe.com>
Date: Fri, 14 Aug 2026 00:07:12 +0000
Subject: [PATCH] Fix unbuckling from office chairs and being under them
 (#45337)

* don't set draw depth if direction is the same

* organize?
---
 Content.Client/Buckle/BuckleSystem.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Content.Client/Buckle/BuckleSystem.cs b/Content.Client/Buckle/BuckleSystem.cs
index 22996f1553..de6b228e22 100644
--- a/Content.Client/Buckle/BuckleSystem.cs
+++ b/Content.Client/Buckle/BuckleSystem.cs
@@ -44,9 +44,14 @@ internal sealed partial class BuckleSystem : SharedBuckleSystem
         if (!_spriteQuery.TryComp(ent, out SpriteComponent? strapSprite))
             return;
 
-        var angle = _xformSystem.GetWorldRotation(ent) + _eye.CurrentEye.Rotation; // Get true screen position, or close enough
+        var newDir = (args.NewRotation + _eye.CurrentEye.Rotation).GetCardinalDir();
+        var oldDir = (args.OldRotation + _eye.CurrentEye.Rotation).GetCardinalDir();
+
+        if (newDir == oldDir)
+            return;
+
+        var isNorth = newDir == Direction.North;
 
-        var isNorth = angle.GetCardinalDir() == Direction.North;
         foreach (var buckledEntity in ent.Comp.BuckledEntities)
         {
             if (!TryComp<BuckleComponent>(buckledEntity, out var buckle))