Merge remote-tracking branch 'remotes/git-svn' r4881 into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/game/gamemodes/events.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/gateway.dm
	code/game/objects/items/devices/flashlight.dm
	code/game/sound.dm
	code/global.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/handlabeler.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paperbin.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/photocopier.dm
	code/modules/paperwork/stamps.dm
	code/world.dm
	html/changelog.html
	maps/RandomZLevels/fileList.txt

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

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

@@ -15,6 +15,14 @@
 	var/storage_capacity = 20 //This is so that someone can't pack hundreds of items in a locker/crate
 							  //then open it in a populated area to crash clients.
 
+/obj/structure/closet/New()
+	..()
+	spawn(1)
+		if(!opened)		// if closed, any item at the crate's loc is put in the contents
+			for(var/obj/item/I in src.loc)
+				if(I.density || I.anchored || I == src) continue
+				I.loc = src
+
 /obj/structure/closet/alter_health()
 	return get_turf(src)
 

code/game/objects/structures/crates_lockers/closets/utility_closets.dm

@@ -141,7 +141,6 @@
 /*
  * Radiation Closet
  */
-
 /obj/structure/closet/radiation
 	name = "radiation suit closet"
 	desc = "It's a storage unit for rad-protective suits."
@@ -157,7 +156,7 @@
 /*
  * Bombsuit closet
  */
- /obj/structure/closet/bombcloset
+/obj/structure/closet/bombcloset
 	name = "\improper EOD closet"
 	desc = "It's a storage unit for explosion-protective suits."
 	icon_state = "bombsuit"

code/game/objects/structures/crates_lockers/crates.dm

@@ -197,13 +197,6 @@
 //		new /obj/item/weapon/pestspray(src)
 //		new /obj/item/weapon/pestspray(src)
 
-/obj/structure/closet/crate/New()
-	..()
-	spawn(1)
-		if(!opened)		// if closed, any item at the crate's loc is put in the contents
-			for(var/obj/item/I in src.loc)
-				if(I.density || I.anchored || I == src) continue
-				I.loc = src
 
 /obj/structure/closet/crate/secure/New()
 	..()

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

@@ -49,6 +49,11 @@
 	set category = "Object"
 	set src in oview(1)
 
+	if(!usr || !isturf(usr.loc))
+		return
+	if(usr.stat || usr.restrained())
+		return
+
 	src.dir = turn(src.dir, 90)
 	handle_rotation()
 	return

code/game/objects/structures/window.dm

@@ -227,33 +227,38 @@
 		playsound(src.loc, 'sound/items/Crowbar.ogg', 75, 1)
 		user << (state ? "You have pried the window into the frame." : "You have pried the window out of the frame.")
 	else
-
-		var/aforce = W.force
-		if(reinf) aforce /= 2.0
 		if(W.damtype == BRUTE || W.damtype == BURN)
-			src.health = max(0, src.health - aforce)
-		playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
-		if (src.health <= 7)
-			src.anchored = 0
-			update_nearby_icons()
-			step(src, get_dir(user, src))
-		if (src.health <= 0)
-			if (src.dir == SOUTHWEST)
-				var/index = null
-				index = 0
-				while(index < 2)
-					new /obj/item/weapon/shard( src.loc )
-					if(reinf) new /obj/item/stack/rods( src.loc)
-					index++
-			else
-				new /obj/item/weapon/shard( src.loc )
-				if(reinf) new /obj/item/stack/rods( src.loc)
-			src.density = 0
-			del(src)
-			return
+			hit(W.force)
+			if (src.health <= 7)
+				src.anchored = 0
+				update_nearby_icons()
+				step(src, get_dir(user, src))
+		else
+			playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
 		..()
 	return
 
+/obj/structure/window/proc/hit(var/damage, var/sound_effect = 1)
+
+	if(reinf) damage /= 2.0
+	src.health = max(0, src.health - damage)
+	if(sound_effect)
+		playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
+	if (src.health <= 0)
+		if (src.dir == SOUTHWEST)
+			var/index = null
+			index = 0
+			while(index < 2)
+				new /obj/item/weapon/shard( src.loc )
+				if(reinf) new /obj/item/stack/rods( src.loc)
+				index++
+		else
+			new /obj/item/weapon/shard( src.loc )
+			if(reinf) new /obj/item/stack/rods( src.loc)
+		src.density = 0
+		del(src)
+		return
+
 
 /obj/structure/window/verb/rotate()
 	set name = "Rotate Window Counter-Clockwise"
@@ -409,6 +414,11 @@
 
 		return
 
+/obj/structure/window/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	if(exposed_temperature > T0C + 600)
+		hit(round(exposed_volume / 100), 0)
+	..()
+
 
 
 /obj/structure/window/basic