Map conflict, using BEF.

code/ZAS/Functions.dm

@@ -110,7 +110,10 @@ proc/ZMerge(zone/A,zone/B)
 		C.Cleanup()
 
 	//Add space tiles.
-	A.unsimulated_tiles |= B.unsimulated_tiles
+	if(A.unsimulated_tiles && B.unsimulated_tiles)
+		A.unsimulated_tiles |= B.unsimulated_tiles
+	else if (B.unsimulated_tiles)
+		A.unsimulated_tiles = B.unsimulated_tiles
 
 	//Add contents.
 	A.contents = new_contents
@@ -150,4 +153,4 @@ proc/ZConnect(turf/simulated/A,turf/simulated/B)
 				return
 
 	//Make the connection.
-	new /connection(A,B)
+	new /connection(A,B)

code/game/machinery/doors/firedoor.dm

@@ -57,6 +57,13 @@
 			return
 		if(!density)
 			return ..()
+		if(istype(AM, /obj/mecha))
+			var/obj/mecha/mecha = AM
+			if (mecha.occupant)
+				var/mob/M = mecha.occupant
+				if(world.time - M.last_bumped <= 10) return //Can bump-open one airlock per second. This is to prevent popup message spam.
+				M.last_bumped = world.time
+				attack_hand(M)
 		return 0
 
 

code/game/objects/items/devices/PDA/PDA.dm

@@ -23,7 +23,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	//Secondary variables
 	var/scanmode = 0 //1 is medical scanner, 2 is forensics, 3 is reagent scanner.
 	var/fon = 0 //Is the flashlight function on?
-	var/f_lum = 4 //Luminosity for the flashlight function
+	var/f_lum = 2 //Luminosity for the flashlight function
 	var/silent = 0 //To beep or not to beep, that is the question
 	var/toff = 0 //If 1, messenger disabled
 	var/tnote = null //Current Texts

code/game/objects/items/weapons/storage/belt.dm

@@ -108,6 +108,7 @@
 	item_state = "security"//Could likely use a better one.
 	storage_slots = 7
 	max_w_class = 3
+	max_combined_w_class = 21
 	can_hold = list(
 		"/obj/item/weapon/grenade/flashbang",
 		"/obj/item/weapon/reagent_containers/spray/pepper",