Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

code/modules/mapping/mapping_helpers.dm

@@ -179,7 +179,7 @@
 				qdel(src)
 				return
 			if(9 to 11)
-				airlock.lights = FALSE
+				airlock.feedback = FALSE
 				// These do not use airlock.bolt() because we want to pretend it was always locked. That means no sound effects.
 				airlock.locked = TRUE
 			if(12 to 15)

code/modules/mapping/space_management/space_transition.dm

@@ -161,7 +161,8 @@
 		point.set_neigbours(grid, grid_diameter)
 
 	var/center = round(grid_diameter / 2)
-	point = grid[CHORDS_TO_1D(grid_diameter, center, center)]
+	if(transition_levels.len)
+		point = grid[CHORDS_TO_1D(center, center, grid_diameter)]
 	grid.Cut()
 
 	var/list/transition_pick = transition_levels.Copy()