From bf213e6889f909958978228e2c5b8a6b8ef8db74 Mon Sep 17 00:00:00 2001
From: Atlantiscze <git@stepanekjakub.cz>
Date: Sun, 7 Dec 2014 04:43:00 +0100
Subject: [PATCH] Resolves compilation errors caused by previous merge

---
 code/game/machinery/doors/airlock.dm | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index d0634f81cc0..49252eaac64 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -913,9 +913,9 @@ About the new airlock wires panel:
 				if(operating == -1)
 					new /obj/item/weapon/circuitboard/broken(src.loc)
 					operating = 0
-				else 
+				else
 					if (!electronics) create_electronics()
-					
+
 					electronics.loc = src.loc
 					electronics = null
 
@@ -1059,18 +1059,17 @@ About the new airlock wires panel:
 /obj/machinery/door/airlock/New(var/newloc, var/obj/structure/door_assembly/assembly=null)
 	..()
 
-<<<<<<< HEAD
 	//High-sec airlocks are much harder to completely break by emitters.
-	if(security_bolts)
+	if(secured_wires)
 		emitter_resistance *= 3
-=======
+
 	//if assembly is given, create the new door from the assembly
 	if (assembly)
 		assembly_type = assembly.type
-		
+
 		electronics = assembly.electronics
 		electronics.loc = src
-		
+
 		//update the door's access to match the electronics'
 		secured_wires = electronics.secure
 		if(electronics.one_access)
@@ -1078,13 +1077,12 @@ About the new airlock wires panel:
 			req_one_access = src.electronics.conf_access
 		else
 			req_access = src.electronics.conf_access
-		
+
 		//get the name from the assembly
 		if(assembly.created_name)
 			name = assembly.created_name
 		else
 			name = "[istext(assembly.glass) ? "[assembly.glass] airlock" : assembly.base_name]"
->>>>>>> 2d7ea3028f36259d189674c209b727029da4ecc6
 
 	//wires
 	if (secured_wires)
@@ -1099,8 +1097,8 @@ About the new airlock wires panel:
 					src.closeOther = A
 					break
 
-// Most doors will never be deconstructed over the course of a round, 
-// so as an optimization defer the creation of electronics until 
+// Most doors will never be deconstructed over the course of a round,
+// so as an optimization defer the creation of electronics until
 // the airlock is deconstructed
 /obj/machinery/door/airlock/proc/create_electronics()
 	//create new electronics
@@ -1108,7 +1106,7 @@ About the new airlock wires panel:
 		src.electronics = new/obj/item/weapon/airlock_electronics/secure( src.loc )
 	else
 		src.electronics = new/obj/item/weapon/airlock_electronics( src.loc )
-	
+
 	//update the electronics to match the door's access
 	if(!src.req_access)
 		src.check_access()