From 89d3e37e1a8f02833bf97ca47620d651a845274d Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 27 Nov 2017 17:52:02 -0500
Subject: [PATCH 1/2] Merge pull request #33140 from Wad67/master

Check door for (welded) upon closing
---
 code/game/machinery/doors/door.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index e446670105..30ae436289 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -255,12 +255,15 @@
 		return 1
 	if(operating)
 		return
+	if(welded)
+		return
 	if(safe)
 		for(var/atom/movable/M in get_turf(src))
 			if(M.density && M != src) //something is blocking the door
 				if(autoclose)
 					addtimer(CALLBACK(src, .proc/autoclose), 60)
 				return
+
 	operating = TRUE
 
 	do_animate("closing")