Merge pull request #188 from Markolie/master

Fix away mission atmos, bug fixes

code/game/machinery/Freezer.dm

@@ -7,6 +7,7 @@
 	anchored = 1.0
 	use_power = 1
 	current_heat_capacity = 1000
+	layer = 3
 
 /obj/machinery/atmospherics/unary/cold_sink/freezer/New()
 	..()
@@ -137,6 +138,7 @@
 	density = 1
 	var/max_temperature = 0
 	anchored = 1.0
+	layer = 3
 
 	current_heat_capacity = 1000
 

code/game/machinery/bots/ed209bot.dm

@@ -58,7 +58,6 @@
 	var/created_name = "ED-209 Security Robot" //To preserve the name if it's a unique securitron I guess
 	var/lasercolor = ""
 
-
 /obj/machinery/bot/ed209/New(loc,created_name,created_lasercolor)
 	..()
 	if(created_name)
@@ -660,8 +659,6 @@ Auto Patrol[]"},
 			if(istype(W, /obj/item/weapon/screwdriver))
 				playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
 				var/turf/T = get_turf(user)
-				user << "<span class='notice'>Now attaching the gun to the frame...</span>"
-				sleep(40)
 				if(get_turf(user) == T)
 					build_step++
 					name = "armed [name]"

code/game/objects/structures/window.dm

@@ -381,7 +381,7 @@ var/global/wcColored
 /obj/structure/window/New(Loc,re=0)
 	..()
 	ini_dir = dir
-	if(!color)
+	if(!color && !istype(src,/obj/structure/window/plasmabasic) && !istype(src,/obj/structure/window/plasmareinforced))
 		color = color_windows(src)
 	update_nearby_tiles(need_rebuild=1)
 	update_nearby_icons()

code/modules/admin/topic.dm

@@ -1604,7 +1604,7 @@
 		var/obj/item/fax = locate(href_list["AdminFaxView"])
 		if (istype(fax, /obj/item/weapon/paper))
 			var/obj/item/weapon/paper/P = fax
-			P.show_content(usr)
+			P.show_content(usr,1)
 		else if (istype(fax, /obj/item/weapon/photo))
 			var/obj/item/weapon/photo/H = fax
 			H.show(usr)

code/modules/events/blob.dm

@@ -7,7 +7,7 @@
 
 /datum/event/blob/announce()
 	command_alert("Confirmed outbreak of level 7 biohazard aboard [station_name()]. Nanotrasen has issued a directive 7-10. The station is to be considered quarantined.", "Biohazard Alert")
-	world << sound('sound/AI/outbreak7.ogg')
+	world << sound('sound/AI/blob_confirmed.ogg')
 		
 	for (var/mob/living/silicon/ai/aiPlayer in player_list)
 		if (aiPlayer.client)

code/modules/events/mass_hallucination.dm

@@ -1,3 +1,4 @@
 /datum/event/mass_hallucination/start()
-	for(var/mob/living/carbon/C in living_mob_list)
-		C.hallucination += rand(70, 100)
+	for(var/mob/living/carbon/human/C in living_mob_list)
+		if(!(C.species.flags & IS_SYNTHETIC))
+			C.hallucination += rand(70, 100)