Port Bay's Catwalks

code/game/objects/structures.dm

@@ -223,6 +223,7 @@
 					if(istype(W))
 						W.update_connections(1)
 				if(success)
+<<<<<<< HEAD
 					break
 			if(success)
 				break
@@ -242,6 +243,24 @@
 						break
 				if(success)
 					break
+=======
+					break // breaks inner loop
+		if(!success)
+			blend_obj_loop:
+				for(var/obj/O in T)
+					for(var/b_type in blend_objects)
+						if(istype(O, b_type))
+							success = 1
+							for(var/obj/structure/S in T)
+								if(istype(S, src))
+									success = 0
+							for(var/nb_type in noblend_objects)
+								if(istype(O, nb_type))
+									success = 0
+
+						if(success)
+							break blend_obj_loop // breaks outer loop
+>>>>>>> c62de50... Port Bay's Catwalks (#7083)
 
 		if(success)
 			dirs += get_dir(src, T)