Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into newstuff

Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -13,6 +13,12 @@
 	icon_state = "bed"
 	var/mob/living/buckled_mob
 
+/obj/structure/stool/psychbed
+	name = "psych bed"
+	desc = "For prime comfort during psychiatric evaluations."
+	icon_state = "psychbed"
+	var/mob/living/buckled_mob
+
 /obj/structure/stool/bed/alien
 	name = "resting contraption"
 	desc = "This looks similar to contraptions from earth. Could aliens be stealing our technology?"

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.restrained() && !H.stat && in_range(src, 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!")
 
 /obj/item/weapon/stool
 	name = "stool"