Merge pull request #33140 from Wad67/master

Check door for (welded) upon closing
2017-11-27 17:52:02 -05:00
parent e0aaed6d3b
commit 89d3e37e1a
1 changed files with 3 additions and 0 deletions
@@ -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")