Merge remote-tracking branch 'upstream/master' into dev-freeze

Conflicts:
	code/setup.dm

code/game/objects/structures/girders.dm

@@ -43,6 +43,7 @@
 	return
 
 /obj/structure/girder/proc/reset_girder()
+	anchored = 1
 	cover = initial(cover)
 	health = min(health,initial(health))
 	state = 0

code/game/objects/structures/window.dm

@@ -290,6 +290,10 @@
 	set category = "Object"
 	set src in oview(1)
 
+	// TODO :  Change to incapacitated() on merge.
+	if(usr.stat || usr.lying || usr.resting || usr.buckled)
+		return 0
+	
 	if(anchored)
 		usr << "It is fastened to the floor therefore you can't rotate it!"
 		return 0
@@ -306,6 +310,10 @@
 	set category = "Object"
 	set src in oview(1)
 
+	// TODO :  Change to incapacitated() on merge.
+	if(usr.stat || usr.lying || usr.resting || usr.buckled)
+		return 0
+
 	if(anchored)
 		usr << "It is fastened to the floor therefore you can't rotate it!"
 		return 0