From daab574d855d5ef57c14dc3551c20aa952aa214c Mon Sep 17 00:00:00 2001
From: CHOMPStation2StaffMirrorBot
 <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com>
Date: Fri, 3 Oct 2025 02:50:58 -0700
Subject: [PATCH] [MIRROR] fix some doors not operating in parallel

---
 code/game/machinery/door_control.dm | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm
index 0a21f0cec58..f46223d497a 100644
--- a/code/game/machinery/door_control.dm
+++ b/code/game/machinery/door_control.dm
@@ -97,6 +97,7 @@
 		if(D.id_tag == id)
 			if(specialfunctions & OPEN)
 				if(D.density)
+<<<<<<< HEAD
 					spawn(0)
 						D.open()
 						return
@@ -104,6 +105,13 @@
 					spawn(0)
 						D.close()
 						return
+=======
+					D.open()
+					continue
+				D.close()
+				continue
+
+>>>>>>> 83d2abea8f ([MIRROR] fix some doors not operating in parallel (#11771))
 			if(desiredstate == 1)
 				if(specialfunctions & IDSCAN)
 					D.set_idscan(0)
@@ -113,15 +121,16 @@
 					D.electrify(-1)
 				if(specialfunctions & SAFE)
 					D.set_safeties(0)
-			else
-				if(specialfunctions & IDSCAN)
-					D.set_idscan(1)
-				if(specialfunctions & BOLTS)
-					D.unlock()
-				if(specialfunctions & SHOCK)
-					D.electrify(0)
-				if(specialfunctions & SAFE)
-					D.set_safeties(1)
+				continue
+
+			if(specialfunctions & IDSCAN)
+				D.set_idscan(1)
+			if(specialfunctions & BOLTS)
+				D.unlock()
+			if(specialfunctions & SHOCK)
+				D.electrify(0)
+			if(specialfunctions & SAFE)
+				D.set_safeties(1)
 
 #undef OPEN
 #undef IDSCAN