Merge remote-tracking branch 'remotes/upstream/master' into statues

# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm

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

@@ -15,7 +15,6 @@
 		else
 			new /obj/item/weapon/storage/backpack/satchel_cap(src)
 		new /obj/item/weapon/book/manual/faxes(src)
-		new /obj/item/clothing/head/crown/fancy(src)
 		new /obj/item/weapon/storage/backpack/duffel/captain(src)
 		new /obj/item/clothing/suit/captunic(src)
 		new /obj/item/clothing/suit/captunic/capjacket(src)

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

@@ -60,19 +60,16 @@
 	set src in oview(1)
 
 	if(config.ghost_interaction)
-		src.dir = turn(src.dir, 90)
+		setDir(turn(dir, 90))
 		handle_rotation()
 		return
-	else
-		if(!usr || !isturf(usr.loc))
-			return
-		if(usr.stat || usr.restrained())
-			return
 
-		src.dir = turn(src.dir, 90)
-		handle_rotation()
+	if(usr.incapacitated())
 		return
 
+	setDir(turn(dir, 90))
+	handle_rotation()
+
 /obj/structure/stool/bed/chair/AltClick(mob/user)
 	if(user.incapacitated())
 		to_chat(user, "<span class='warning'>You can't do that right now!</span>")