diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm
index 989ffb4358..2690ae5150 100644
--- a/code/datums/wires/airlock.dm
+++ b/code/datums/wires/airlock.dm
@@ -1,163 +1,3 @@
-<<<<<<< HEAD
-/datum/wires/airlock
-	holder_type = /obj/machinery/door/airlock
-	proper_name = "Airlock"
-
-/datum/wires/airlock/secure
-	randomize = TRUE
-
-/datum/wires/airlock/New(atom/holder)
-	wires = list(
-		WIRE_POWER1, WIRE_POWER2,
-		WIRE_BACKUP1, WIRE_BACKUP2,
-		WIRE_OPEN, WIRE_BOLTS, WIRE_IDSCAN, WIRE_AI,
-		WIRE_SHOCK, WIRE_SAFETY, WIRE_TIMING, WIRE_LIGHT,
-		WIRE_ZAP1, WIRE_ZAP2
-	)
-	add_duds(2)
-	..()
-
-/datum/wires/airlock/interactable(mob/user)
-	var/obj/machinery/door/airlock/A = holder
-	if(!issilicon(user) && A.isElectrified() && A.shock(user, 100))
-		return FALSE
-	if(A.panel_open)
-		return TRUE
-
-/datum/wires/airlock/get_status()
-	var/obj/machinery/door/airlock/A = holder
-	var/list/status = list()
-	status += "The door bolts [A.locked ? "have fallen!" : "look up."]"
-	status += "The test light is [A.hasPower() ? "on" : "off"]."
-	status += "The AI connection light is [A.aiControlDisabled || A.emagged ? "off" : "on"]."
-	status += "The check wiring light is [A.safe ? "off" : "on"]."
-	status += "The timer is powered [A.autoclose ? "on" : "off"]."
-	status += "The speed light is [A.normalspeed ? "on" : "off"]."
-	status += "The emergency light is [A.emergency ? "on" : "off"]."
-	return status
-
-/datum/wires/airlock/on_pulse(wire)
-	set waitfor = FALSE
-	var/obj/machinery/door/airlock/A = holder
-	switch(wire)
-		if(WIRE_POWER1, WIRE_POWER2) // Pulse to loose power.
-			A.loseMainPower()
-		if(WIRE_BACKUP1, WIRE_BACKUP2) // Pulse to loose backup power.
-			A.loseBackupPower()
-		if(WIRE_OPEN) // Pulse to open door (only works not emagged and ID wire is cut or no access is required).
-			if(A.emagged)
-				return
-			if(!A.requiresID() || A.check_access(null))
-				if(A.density)
-					A.open()
-				else
-					A.close()
-		if(WIRE_BOLTS) // Pulse to toggle bolts (but only raise if power is on).
-			if(!A.locked)
-				A.bolt()
-				A.audible_message("<span class='italics'>You hear a click from the bottom of the door.</span>", null,  1)
-			else
-				if(A.hasPower())
-					A.unbolt()
-					A.audible_message("<span class='italics'>You hear a click from the bottom of the door.</span>", null, 1)
-			A.update_icon()
-		if(WIRE_IDSCAN) // Pulse to disable emergency access and flash red lights.
-			if(A.hasPower() && A.density)
-				A.do_animate("deny")
-				if(A.emergency)
-					A.emergency = FALSE
-					A.update_icon()
-		if(WIRE_AI) // Pulse to disable WIRE_AI control for 10 ticks (follows same rules as cutting).
-			if(A.aiControlDisabled == 0)
-				A.aiControlDisabled = 1
-			else if(A.aiControlDisabled == -1)
-				A.aiControlDisabled = 2
-			sleep(10)
-			if(A)
-				if(A.aiControlDisabled == 1)
-					A.aiControlDisabled = 0
-				else if(A.aiControlDisabled == 2)
-					A.aiControlDisabled = -1
-		if(WIRE_SHOCK) // Pulse to shock the door for 10 ticks.
-			if(!A.secondsElectrified)
-				A.set_electrified(30)
-				if(usr)
-					A.shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])")
-				add_logs(usr, A, "electrified")
-				sleep(10)
-				if(A)
-					while (A.secondsElectrified > 0)
-						A.secondsElectrified -= 1
-						if(A.secondsElectrified < 0)
-							A.set_electrified(0)
-						sleep(10)
-		if(WIRE_SAFETY)
-			A.safe = !A.safe
-			if(!A.density)
-				A.close()
-		if(WIRE_TIMING)
-			A.normalspeed = !A.normalspeed
-		if(WIRE_LIGHT)
-			A.lights = !A.lights
-			A.update_icon()
-
-/datum/wires/airlock/on_cut(wire, mend)
-	var/obj/machinery/door/airlock/A = holder
-	switch(wire)
-		if(WIRE_POWER1, WIRE_POWER2) // Cut to loose power, repair all to gain power.
-			if(mend && !is_cut(WIRE_POWER1) && !is_cut(WIRE_POWER2))
-				A.regainMainPower()
-				if(usr)
-					A.shock(usr, 50)
-			else
-				A.loseMainPower()
-				if(usr)
-					A.shock(usr, 50)
-		if(WIRE_BACKUP1, WIRE_BACKUP2) // Cut to loose backup power, repair all to gain backup power.
-			if(mend && !is_cut(WIRE_BACKUP1) && !is_cut(WIRE_BACKUP2))
-				A.regainBackupPower()
-				if(usr)
-					A.shock(usr, 50)
-			else
-				A.loseBackupPower()
-				if(usr)
-					A.shock(usr, 50)
-		if(WIRE_BOLTS) // Cut to drop bolts, mend does nothing.
-			if(!mend)
-				A.bolt()
-		if(WIRE_AI) // Cut to disable WIRE_AI control, mend to re-enable.
-			if(mend)
-				if(A.aiControlDisabled == 1) // 0 = normal, 1 = locked out, 2 = overridden by WIRE_AI, -1 = previously overridden by WIRE_AI
-					A.aiControlDisabled = 0
-				else if(A.aiControlDisabled == 2)
-					A.aiControlDisabled = -1
-			else
-				if(A.aiControlDisabled == 0)
-					A.aiControlDisabled = 1
-				else if(A.aiControlDisabled == -1)
-					A.aiControlDisabled = 2
-		if(WIRE_SHOCK) // Cut to shock the door, mend to unshock.
-			if(mend)
-				if(A.secondsElectrified)
-					A.set_electrified(0)
-			else
-				if(A.secondsElectrified != -1)
-					A.set_electrified(-1)
-					if(usr)
-						A.shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])")
-					add_logs(usr, A, "electrified")
-		if(WIRE_SAFETY) // Cut to disable safeties, mend to re-enable.
-			A.safe = mend
-		if(WIRE_TIMING) // Cut to disable auto-close, mend to re-enable.
-			A.autoclose = mend
-			if(A.autoclose && !A.density)
-				A.close()
-		if(WIRE_LIGHT) // Cut to disable lights, mend to re-enable.
-			A.lights = mend
-			A.update_icon()
-		if(WIRE_ZAP1, WIRE_ZAP2) // Ouch.
-			A.shock(usr, 50)
-=======
 /datum/wires/airlock
 	holder_type = /obj/machinery/door/airlock
 	proper_name = "Airlock"
@@ -317,4 +157,3 @@
 		if(WIRE_ZAP1, WIRE_ZAP2) // Ouch.
 			if(usr)
 				A.shock(usr, 50)
->>>>>>> b92cdfc... Merge pull request #31772 from optimumtact/badshit