Merge pull request #7946 from VOREStation/upstream-merge-7083

[MIRROR] Port Bay's Catwalks

code/game/objects/structures.dm

@@ -223,25 +223,22 @@
 					if(istype(W))
 						W.update_connections(1)
 				if(success)
-					break
-			if(success)
-				break
+					break // breaks inner loop
 		if(!success)
-			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
+			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
-				if(success)
-					break
+						if(success)
+							break blend_obj_loop // breaks outer loop
 
 		if(success)
 			dirs += get_dir(src, T)

code/game/objects/structures/catwalk.dm

@@ -44,7 +44,6 @@
 			L.update_connections()
 			L.update_icon() //so siding get updated properly
 
-
 /obj/structure/catwalk/update_icon()
 	update_connections()
 	cut_overlays()
@@ -78,7 +77,7 @@
 	new /obj/item/stack/rods(src.loc)
 	new /obj/item/stack/rods(src.loc)
 	//Lattice would delete itself, but let's save ourselves a new obj
-	if(istype(src.loc, /turf/space) || istype(src.loc, /turf/simulated/open))
+	if(isspace(loc) || isopenspace(loc))
 		new /obj/structure/lattice/(src.loc)
 	if(plated_tile)
 		new plated_tile(src.loc)

code/modules/tgs/v5/chat_commands.dm

@@ -92,7 +92,7 @@ GLOBAL_LIST_EMPTY(pending_discord_registrations)
 
 	// Couldn't find them logged in.
 	if(!user)
-		return "[sender.friendly_name], I couldn't find a logged-in user with the username of '[key_to_find]', which is what you provided after conversion to Byond's \"ckey\" format. Please connect to the game server and try again."
+		return "[sender.friendly_name], I couldn't find a logged-in user with the username of '[key_to_find]', which is what you provided after conversion to Byond's ckey format. Please connect to the game server and try again."
 	
 	var/sql_ckey = sql_sanitize_text(key_to_find)
 	query = dbcon.NewQuery("SELECT discord_id FROM erro_player WHERE ckey = '[sql_ckey]'")