From 445f0ea8ddae1eb678052054ce8d16dff7d0679c Mon Sep 17 00:00:00 2001
From: Alan <alfalfascout@users.noreply.github.com>
Date: Mon, 8 Dec 2025 18:55:17 -0500
Subject: [PATCH] Make *flip keep better track of who's buckled. (#31194)

---
 code/modules/mob/mob_emote.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/mob_emote.dm b/code/modules/mob/mob_emote.dm
index 8aba826fa66..185359d4027 100644
--- a/code/modules/mob/mob_emote.dm
+++ b/code/modules/mob/mob_emote.dm
@@ -145,7 +145,8 @@
 			var/obj/item/grab/G = H.get_active_hand()
 			if(G && G.affecting)
 				if(H.buckled || G.affecting.buckled)
-					to_chat(user, "<span class='warning'>[G.affecting] is buckled, you can't flip around [G.affecting.p_them()]!</span>")
+					var/who_is = H.buckled ? "You are" : "[G.affecting] is"
+					to_chat(user, "<span class='warning'>[who_is] buckled, you can't flip around [G.affecting.p_them()]!</span>")
 					return TRUE
 				var/turf/oldloc = user.loc
 				var/turf/newloc = G.affecting.loc