Merge pull request #3448 from VampyrBytes/Bugfix-(#3425)

Fixes #3425
2026-08-25 04:57:12 +01:00 · 2016-01-31 19:16:36 -05:00
parent 29827ea252 bb15d5f133
commit 1b94a5b0b3
2 changed files with 7 additions and 5 deletions
@@ -402,12 +402,14 @@
 					var/obj/machinery/door/Door = O
 					spawn(-1)
 						if(Door)
-							Door.close()
 							if(istype(Door, /obj/machinery/door/airlock))
 								var/obj/machinery/door/airlock/A = Door
+								A.close(0,1)
 								if(A.id_tag == "s_docking_airlock")
 									A.lock()
 									door_unlock_list += A
+							else
+								Door.close()
 			else if (istype(AM,/mob))
 				var/mob/M = AM
 				if(!M.move_on_shuttle)