diff --git a/code/__DEFINES/xeno_ai.dm b/code/__DEFINES/xeno_ai.dm
index dc4be8dbcc..d1f0b647cd 100644
--- a/code/__DEFINES/xeno_ai.dm
+++ b/code/__DEFINES/xeno_ai.dm
@@ -9,6 +9,7 @@
 #define DOOR_PENALTY 3
 #define OBJECT_PENALTY 20
 #define HUMAN_PENALTY 4
+#define XENO_PENALTY 20
 #define VEHICLE_PENALTY 25
 #define SENTRY_PENALTY 25
 #define WINDOW_FRAME_PENALTY 25
diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm b/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm
index ddadee2b5b..9f4ce3df0e 100644
--- a/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm
+++ b/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm
@@ -100,6 +100,14 @@ At bare minimum, make sure the relevant checks from parent types gets copied in
 
 	. = ..()
 
+// XENOS
+/mob/living/carbon/xenomorph/xeno_ai_obstacle(mob/living/carbon/xenomorph/X, direction, turf/target)
+	. = ..()
+	if(!.)
+		return
+
+	return XENO_PENALTY
+
 // VEHICLES
 /obj/vehicle/xeno_ai_obstacle(mob/living/carbon/xenomorph/X, direction, turf/target)
 	. = ..()
@@ -122,11 +130,6 @@ At bare minimum, make sure the relevant checks from parent types gets copied in
 		return ..()
 	return WINDOW_FRAME_PENALTY
 
-/obj/structure/window_frame/xeno_ai_act(mob/living/carbon/xenomorph/X)
-	. = ..()
-	if(!X.action_busy)
-		do_climb(X)
-
 /obj/structure/barricade/handrail/xeno_ai_obstacle(mob/living/carbon/xenomorph/X, direction, turf/target)
 	. = ..()
 	if(!.)