diff --git a/code/modules/mob/living/carbon/xenomorph/ai/movement/base_define.dm b/code/modules/mob/living/carbon/xenomorph/ai/movement/base_define.dm
index eeae131b26..1edefcd59d 100644
--- a/code/modules/mob/living/carbon/xenomorph/ai/movement/base_define.dm
+++ b/code/modules/mob/living/carbon/xenomorph/ai/movement/base_define.dm
@@ -21,12 +21,12 @@
 
 /datum/xeno_ai_movement/proc/ai_move_idle(delta_time, game_evaluation)
 	SHOULD_NOT_SLEEP(TRUE)
-	var/mob/living/carbon/xenomorph/X = parent
-	if(X.throwing)
+	var/mob/living/carbon/xenomorph/idle_xeno = parent
+	if(idle_xeno.throwing)
 		return
 
-	if(next_home_search < world.time && (!home_turf || !home_turf.weeds || get_dist(home_turf, X) > max_distance_from_home))
-		var/turf/T = get_turf(X.loc)
+	if(next_home_search < world.time && (!home_turf || !home_turf.weeds || get_dist(home_turf, idle_xeno) > max_distance_from_home))
+		var/turf/T = get_turf(idle_xeno.loc)
 		next_home_search = world.time + home_search_delay
 		if(T.weeds)
 			home_turf = T
@@ -34,15 +34,16 @@
 			var/shortest_distance = INFINITY
 			for(var/i in RANGE_TURFS(home_locate_range, T))
 				var/turf/potential_home = i
-				if(potential_home.weeds && !potential_home.density && get_dist(X, potential_home) < shortest_distance)
+				if(potential_home.weeds && !potential_home.density && get_dist(idle_xeno, potential_home) < shortest_distance)
 					home_turf = potential_home
+					shortest_distance = get_dist(idle_xeno, potential_home)
 
 	if(!home_turf)
 		return
 
-	if(X.move_to_next_turf(home_turf, home_locate_range))
-		if(get_dist(home_turf, X) <= 0 && !X.resting)
-			X.lay_down()
+	if(idle_xeno.move_to_next_turf(home_turf, home_locate_range))
+		if(get_dist(home_turf, idle_xeno) <= 0 && !idle_xeno.resting)
+			idle_xeno.lay_down()
 	else
 		home_turf = null
 
diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm
index 561c5c0cda..1f6e71dc9f 100644
--- a/maps/map_files/golden_arrow/golden_arrow.dmm
+++ b/maps/map_files/golden_arrow/golden_arrow.dmm
@@ -197,6 +197,14 @@
 	dir = 6
 	},
 /area/almayer/living/briefing)
+"hZ" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
+	name = "\improper Briefing Room"
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/living/briefing)
 "iA" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/item/device/flashlight/lamp,
@@ -217,6 +225,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
+"jV" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/living/briefing)
 "kB" = (
 /turf/closed/wall/almayer/outer,
 /area/almayer/living/briefing)
@@ -354,15 +368,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hallways/hangar)
-"rI" = (
-/obj/structure/bed/chair/comfy/alpha{
-	dir = 1
-	},
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer{
-	icon_state = "plate"
-	},
-/area/almayer/living/briefing)
 "rM" = (
 /obj/structure/cargo_container/wy/mid,
 /turf/open/floor/almayer,
@@ -483,15 +488,6 @@
 /obj/structure/cargo_container/arious/right,
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
-"xr" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 2
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/living/briefing)
 "yn" = (
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
@@ -695,15 +691,10 @@
 	},
 /area/almayer/living/briefing)
 "HC" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
-	name = "\improper Briefing Room"
-	},
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 2
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
+/obj/structure/surface/table/almayer,
+/obj/item/paper_bin/uscm,
+/obj/item/tool/pen,
+/turf/open/floor/almayer,
 /area/almayer/living/briefing)
 "HH" = (
 /obj/structure/machinery/status_display{
@@ -868,10 +859,13 @@
 	},
 /area/almayer/living/platoon_commander_rooms)
 "NO" = (
-/obj/structure/surface/table/almayer,
-/obj/item/paper_bin/uscm,
-/obj/item/tool/pen,
-/turf/open/floor/almayer,
+/obj/structure/bed/chair/comfy/alpha{
+	dir = 1
+	},
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
 /area/almayer/living/briefing)
 "OA" = (
 /obj/structure/bed/chair/comfy/alpha{
@@ -12782,7 +12776,7 @@ gs
 Ks
 Ks
 Ks
-HC
+hZ
 Cr
 Cr
 Cr
@@ -12934,7 +12928,7 @@ PY
 Pr
 Pr
 Pr
-xr
+jV
 Cr
 Cr
 Cr
@@ -13080,8 +13074,8 @@ Ds
 OA
 OA
 Gx
-rI
-rI
+NO
+NO
 Fl
 Ks
 Ks
@@ -13224,7 +13218,7 @@ qA
 qA
 qA
 FN
-NO
+HC
 HJ
 Ks
 ZR