diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index 998b213ff4d..70558da2ec7 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -142,18 +142,23 @@
 
 	. = buckle_mob(M, forced)
 	if(.)
+		var/reveal_message
 		if(!silent)
 			if(M == user)
+				reveal_message = "<span class='notice'>You come out of hiding and buckle yourself to [src].</span>"
 				M.visible_message(\
 					"<span class='notice'>[M.name] buckles themselves to [src].</span>",\
 					"<span class='notice'>You buckle yourself to [src].</span>",\
 					"<span class='notice'>You hear metal clanking.</span>")
 			else
+				reveal_message = "<span class='notice'>You are revealed as you are buckled to [src].</span>"
 				M.visible_message(\
 					"<span class='danger'>[M.name] is buckled to [src] by [user.name]!</span>",\
 					"<span class='danger'>You are buckled to [src] by [user.name]!</span>",\
 					"<span class='notice'>You hear metal clanking.</span>")
 
+		M.reveal(silent, reveal_message) //Reveal people so they aren't buckled to chairs from behind.
+
 /atom/movable/proc/user_unbuckle_mob(mob/living/buckled_mob, mob/user)
 	var/mob/living/M = unbuckle_mob(buckled_mob)
 	if(M)
@@ -193,4 +198,3 @@
 		riding_datum.handle_vehicle_layer()
 		riding_datum.handle_vehicle_offsets()
 	//VOREStation Add End
-	
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index edf1bdd6c6f..1e9fdbc3297 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1555,9 +1555,8 @@
 
 /mob/living/carbon/human/proc/update_icon_special() //For things such as teshari hiding and whatnot.
 	if(status_flags & HIDING) // Hiding? Carry on.
-		if(stat == DEAD || paralysis || weakened || stunned || restrained()) //stunned/knocked down by something that isn't the rest verb? Note: This was tried with INCAPACITATION_STUNNED, but that refused to work.
-			reset_plane_and_layer()
-			status_flags &= ~HIDING
+		if(stat == DEAD || paralysis || weakened || stunned || restrained() || buckled || LAZYLEN(grabbed_by)) //stunned/knocked down by something that isn't the rest verb? Note: This was tried with INCAPACITATION_STUNNED, but that refused to work.
+			reveal(TRUE) //Reveal them silently.
 		else
 			layer = HIDING_LAYER
 
diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm
index 9ea12b967c7..6ac15f79fd1 100644
--- a/code/modules/mob/living/death.dm
+++ b/code/modules/mob/living/death.dm
@@ -1,5 +1,6 @@
 /mob/living/death()
 	clear_fullscreens()
+	reveal(TRUE) //Silently reveal the mob if they were hidden.
 	//VOREStation Edit - Mob spawner stuff
 	if(source_spawner)
 		source_spawner.get_death_report(src)
diff --git a/code/modules/mob/living/living_powers.dm b/code/modules/mob/living/living_powers.dm
index 1442c80f9ba..6cd5ebb1f5a 100644
--- a/code/modules/mob/living/living_powers.dm
+++ b/code/modules/mob/living/living_powers.dm
@@ -1,15 +1,20 @@
+/mob/living/proc/reveal(var/silent, var/message = "<span class='warning'>You have been revealed! You are no longer hidden.</span>")
+	if(status_flags & HIDING)
+		status_flags &= ~HIDING
+		reset_plane_and_layer()
+		if(!silent && message)
+			to_chat(src, message)
+
 /mob/living/proc/hide()
 	set name = "Hide"
 	set desc = "Allows to hide beneath tables or certain items. Toggled on or off."
 	set category = "Abilities"
 
-	if(stat == DEAD || paralysis || weakened || stunned || restrained())
+	if(stat == DEAD || paralysis || weakened || stunned || restrained() || buckled || LAZYLEN(grabbed_by))
 		return
 
 	if(status_flags & HIDING)
-		status_flags &= ~HIDING
-		reset_plane_and_layer()
-		to_chat(src,"<span class='notice'>You have stopped hiding.</span>")
+		reveal("<span class='notice'>You have stopped hiding.</span>")
 	else
 		status_flags |= HIDING
 		layer = HIDING_LAYER //Just above cables with their 2.44
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index b5cc72fd199..96e5378eb2c 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -47,6 +47,8 @@
 		return
 
 	affecting.grabbed_by += src
+	affecting.reveal("<span class='warning'>You are revealed as [assailant] grabs you.</span>")
+	assailant.reveal("<span class='warning'>You reveal yourself as you grab [affecting].</span>")
 
 	hud = new /obj/screen/grab(src)
 	hud.icon_state = "reinforce"