Merge pull request #159 from Markolie/master

Malf AI lockdown fix, mapfix

code/game/area/Space Station 13 areas.dm

@@ -2240,55 +2240,6 @@ area/security/podbay
 	luminosity = 1
 	lighting_use_dynamic = 0
 	requires_power = 0
-	var/sound/mysound = null
-
-	New()
-		..()
-		var/sound/S = new/sound()
-		mysound = S
-		S.file = 'sound/ambience/shore.ogg'
-		S.repeat = 1
-		S.wait = 0
-		S.channel = 123
-		S.volume = 100
-		S.priority = 255
-		S.status = SOUND_UPDATE
-		process()
-
-	Entered(atom/movable/Obj,atom/OldLoc)
-		if(ismob(Obj))
-			if(Obj:client)
-				mysound.status = SOUND_UPDATE
-				Obj << mysound
-		return
-
-	Exited(atom/movable/Obj)
-		if(ismob(Obj))
-			if(Obj:client)
-				mysound.status = SOUND_PAUSED | SOUND_UPDATE
-				Obj << mysound
-
-	proc/process()
-		//set background = 1
-
-		var/sound/S = null
-		var/sound_delay = 0
-		if(prob(25))
-			S = sound(file=pick('sound/ambience/seag1.ogg','sound/ambience/seag2.ogg','sound/ambience/seag3.ogg'), volume=100)
-			sound_delay = rand(0, 50)
-
-		for(var/mob/living/carbon/human/H in src)
-			if(H.s_tone > -55)
-				H.s_tone--
-				H.update_body()
-			if(H.client)
-				mysound.status = SOUND_UPDATE
-				H << mysound
-				if(S)
-					spawn(sound_delay)
-						H << S
-
-		spawn(60) .()
 	
 ////////////////////////AWAY AREAS///////////////////////////////////
 	

code/game/gamemodes/malfunction/Malf_Modules.dm

@@ -92,6 +92,8 @@ rcd light flash thingy on matter drain
 	for(var/obj/machinery/door/D in airlocks)
 		spawn()
 			if(istype(D, /obj/machinery/door/airlock))
+				if(D.z != 1)
+					continue
 				AL = D
 				if(AL.canAIControl() && !AL.stat) //Must be powered and have working AI wire.
 					AL.locked = 0 //For airlocks that were bolted open.

code/game/objects/structures/window.dm

@@ -67,7 +67,7 @@ var/global/wcColored
 	if(health <= 0)
 		var/pdiff=performWallPressureCheck(src.loc)
 		if(pdiff>0)
-			message_admins("Window destroyed by [Proj.firer.real_name] ([formatPlayerPanel(Proj.firer,Proj.firer.ckey)]) via \an [Proj]! pdiff = [pdiff] at [formatJumpTo(loc)]!")
+			message_admins("Window destroyed by [Proj.firer.name] ([formatPlayerPanel(Proj.firer,Proj.firer.ckey)]) via \an [Proj]! pdiff = [pdiff] at [formatJumpTo(loc)]!")
 			log_admin("Window destroyed by ([Proj.firer.ckey]) via \an [Proj]! pdiff = [pdiff] at [loc]!")
 		destroy()
 	return

code/modules/awaymissions/gateway.dm

@@ -9,10 +9,11 @@
 	var/active = 0
 
 
-/obj/machinery/gateway/initialize()
-	update_icon()
-	if(dir == 2)
-		density = 0
+/obj/machinery/gateway/New()
+	spawn(25)
+		update_icon()
+		if(dir == 2)
+			density = 0
 
 
 /obj/machinery/gateway/update_icon()
@@ -35,10 +36,11 @@
 	var/wait = 0				//this just grabs world.time at world start
 	var/obj/machinery/gateway/centeraway/awaygate = null
 
-/obj/machinery/gateway/centerstation/initialize()
-	update_icon()
-	wait = world.time + config.gateway_delay	//+ thirty minutes default
-	awaygate = locate(/obj/machinery/gateway/centeraway) in world
+/obj/machinery/gateway/centerstation/New()
+	spawn(25)
+		update_icon()
+		wait = world.time + config.gateway_delay	//+ thirty minutes default
+		awaygate = locate(/obj/machinery/gateway/centeraway) in world
 
 
 /obj/machinery/gateway/centerstation/update_icon()
@@ -153,9 +155,10 @@ obj/machinery/gateway/centerstation/process()
 	var/obj/machinery/gateway/centeraway/stationgate = null
 
 
-/obj/machinery/gateway/centeraway/initialize()
-	update_icon()
-	stationgate = locate(/obj/machinery/gateway/centerstation) in world
+/obj/machinery/gateway/centeraway/New()
+	spawn(25)
+		update_icon()
+		stationgate = locate(/obj/machinery/gateway/centerstation) in world
 
 
 /obj/machinery/gateway/centeraway/update_icon()