From 4118d183c1d7645f399918f6f6d22d4bd49d6868 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Sat, 8 Jun 2013 05:27:32 +0400 Subject: [PATCH] No fun allowed. Fixes some hilarious stool glitches. --- .../objects/structures/stool_bed_chair_nest/stools.dm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm index a2f18e8d813..bf868826588 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -37,11 +37,12 @@ /obj/structure/stool/MouseDrop(atom/over_object) if (istype(over_object, /mob/living/carbon/human)) var/mob/living/carbon/human/H = over_object - var/obj/item/weapon/stool/S = new/obj/item/weapon/stool() - S.origin = src - src.loc = S - H.put_in_hands(S) - H.visible_message("\red [H] grabs [src] from the floor!", "\red You grab [src] from the floor!") + if (!H.is_restrained() && !H.stat && in_range(src, user)) + var/obj/item/weapon/stool/S = new/obj/item/weapon/stool() + S.origin = src + src.loc = S + H.put_in_hands(S) + H.visible_message("\red [H] grabs [src] from the floor!", "\red You grab [src] from the floor!") /obj/item/weapon/stool name = "stool"