From cd1d8f8b25e304b4d4b1ea876eb9ad7da32bc1c6 Mon Sep 17 00:00:00 2001
From: archbtw <230859540+archbtw0@users.noreply.github.com>
Date: Thu, 4 Dec 2025 23:12:07 +0000
Subject: [PATCH] Corrects not being able to sit on all stools (#94310)

Corrects not being able to sit on all stools
Since it's a chair

Also fixes a mob's offset when sitting on a stool - if the chair is
facing north, the mob should be behind the chair sprite.

## Why It's Good For The Game

Stools are chairs
People sit on chairs
RP level 100

## Changelog

:cl: ArchBTW
fix: Fix sitting on stools (it's a chair)
fix: Fix offset when sitting on a stool
/:cl:

---------

Co-authored-by: glue0000 <230859540+glue0000@users.noreply.github.com>
---
 .../objects/structures/beds_chairs/chair.dm     | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index 685b3ba3fbe..25cf1e0d8cd 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -324,11 +324,17 @@
 	name = "stool"
 	desc = "Apply butt."
 	icon_state = "stool"
-	can_buckle = FALSE
 	buildstackamount = 1
 	item_chair = /obj/item/chair/stool
 	max_integrity = 300
 
+/obj/structure/chair/stool/post_buckle_mob(mob/living/Mob)
+	Mob.add_offsets(type, z_add = 4)
+	. = ..()
+
+/obj/structure/chair/stool/post_unbuckle_mob(mob/living/Mob)
+	Mob.remove_offsets(type)
+
 MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool, 0)
 
 /obj/structure/chair/stool/narsie_act()
@@ -360,13 +366,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool, 0)
 	desc = "It has some unsavory stains on it..."
 	icon_state = "bar"
 	item_chair = /obj/item/chair/stool/bar
-	can_buckle = TRUE
 
-/obj/structure/chair/stool/bar/post_buckle_mob(mob/living/M)
-	M.pixel_y += 4
-
-/obj/structure/chair/stool/bar/post_unbuckle_mob(mob/living/M)
-	M.pixel_y -= 4
+/obj/structure/chair/stool/bar/post_buckle_mob(mob/living/Mob)
+	. = ..()
+	Mob.add_offsets(type, z_add = 7)
 
 MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0)