Merge branch 'master' of https://github.com/Baystation12/Baystation12 into Baystation12-master

Conflicts:
	config/example/config.txt
	config/example/motd.txt
	config/example/rules.html

code/game/objects/structures/barsign.dm

@@ -1,5 +1,5 @@
 /obj/structure/sign/double/barsign
-	icon = 'barsigns.dmi'
+	icon = 'icons/obj/barsigns.dmi'
 	icon_state = "empty"
 	anchored = 1
 	New()

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

@@ -112,7 +112,7 @@
 /obj/item/roller
 	name = "roller bed"
 	desc = "A collapsed roller bed that can be carried around."
-	icon = 'rollerbed.dmi'
+	icon = 'icons/obj/rollerbed.dmi'
 	icon_state = "folded"
 	w_class = 4.0 // Can't be put in backpacks. Oh well.
 

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

@@ -35,17 +35,8 @@
 		src.layer = FLY_LAYER
 	else
 		src.layer = OBJ_LAYER
-
 	if(buckled_mob)
-		if(buckled_mob.loc != src.loc)
-			buckled_mob.buckled = null //Temporary, so Move() succeeds.
-			if(!buckled_mob.Move(loc))
-				unbuckle()
-				buckled_mob = null
-			else
-				buckled_mob.buckled = src //Restoring
-		if(buckled_mob)
-			buckled_mob.dir = dir
+		buckled_mob.dir = dir
 
 /obj/structure/stool/bed/chair/verb/rotate()
 	set name = "Rotate Chair"
@@ -114,6 +105,12 @@
 
 /obj/structure/stool/bed/chair/office/Move()
 	..()
+	if(buckled_mob)
+		buckled_mob.buckled = null //Temporary, so Move() succeeds.
+		var/moved = buckled_mob.Move(src.loc)
+		buckled_mob.buckled = src
+		if(!moved)
+			unbuckle()
 	handle_rotation()
 
 /obj/structure/stool/bed/chair/office/light

code/game/objects/structures/window.dm

@@ -105,12 +105,12 @@
 		if(reinf) new /obj/item/stack/rods(loc)
 		del(src)
 	else if (usr.a_intent == "hurt")
-		playsound(src.loc, 'glassknock.ogg', 80, 1)
+		playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1)
 		usr.visible_message("\red [usr.name] bangs against the [src.name]!", \
 							"\red You bang against the [src.name]!", \
 							"You hear a banging sound.")
 	else
-		playsound(src.loc, 'glassknock.ogg', 80, 1)
+		playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1)
 		usr.visible_message("[usr.name] knocks on the [src.name].", \
 							"You knock on the [src.name].", \
 							"You hear a knocking sound.")