Merge pull request #4159 from Citadel-Station-13/upstream-merge-33140

[MIRROR] Check door for (welded) upon closing
2017-11-29 03:26:03 +00:00
parent 2f42366856 423f07bcb9
commit 3f29fb59e1
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")