nahhh next time

cmss13-devs · Nov 1, 2023 · 500ad3b · 500ad3b
1 parent 2cebba2
commit 500ad3b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_abilities.dm
@@ -18,4 +18,4 @@
 	freeze_play_sound = FALSE
 	can_be_shield_blocked = TRUE
 
-	prob_chance = 45 // AI
+	ai_prob_chance = 45
diff --git a/...enomorph/ai/movement/linger_facehugger.dm → ...arbon/xenomorph/ai/movement/facehugger.dm b/...enomorph/ai/movement/linger_facehugger.dm → ...arbon/xenomorph/ai/movement/facehugger.dm
@@ -1,5 +1,6 @@
 /datum/xeno_ai_movement/linger/facehugger/ai_move_target(delta_time)
 	var/mob/living/carbon/xenomorph/moving_xeno = parent
+
 	if(moving_xeno.action_busy)
 		return
 
@@ -39,3 +40,9 @@
 #undef REENGAGE_COOLDOWN
 #undef FIND_NEW_TRAVEL_TURF_LIMIT
 #undef FIND_NEW_TRAVEL_RADIUS_MAX
+
+/mob/living/carbon/xenomorph/facehugger/check_mob_target(mob/living/carbon/human/checked_human)
+	if(checked_human.status_flags & XENO_HOST)
+		return FALSE
+
+	return ..()
diff --git a/code/modules/mob/living/carbon/xenomorph/ai/xeno_ai.dm b/code/modules/mob/living/carbon/xenomorph/ai/xeno_ai.dm
@@ -15,8 +15,6 @@
 	var/ai_timeout_time = 0
 	var/ai_timeout_period = 2 SECONDS
 
-	var/ai_target_xenohost = TRUE
-
 	var/list/datum/action/xeno_action/registered_ai_abilities = list()
 
 	var/datum/xeno_ai_movement/ai_movement_handler

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm
@@ -7,7 +7,7 @@
 	melee_damage_upper = 5
 	max_health = XENO_HEALTH_LARVA
 	caste_desc = "Ewwww, that's disgusting!"
-	speed = XENO_SPEED_TIER_8
+	speed = XENO_SPEED_TIER_10
 
 	evolution_allowed = FALSE
 	can_be_revived = FALSE
@@ -61,7 +61,6 @@
 	icon_xenonid = 'icons/mob/xenonids/facehugger.dmi'
 
 	ai_range = 24
-	ai_target_xenohost = FALSE
 	var/linger_range = 8
 	var/linger_deviation = 1
 

diff --git a/colonialmarines.dme b/colonialmarines.dme
@@ -1996,8 +1996,8 @@
 #include "code\modules\mob\living\carbon\xenomorph\ai\xeno_ai.dm"
 #include "code\modules\mob\living\carbon\xenomorph\ai\movement\base_define.dm"
 #include "code\modules\mob\living\carbon\xenomorph\ai\movement\drone.dm"
+#include "code\modules\mob\living\carbon\xenomorph\ai\movement\facehugger.dm"
 #include "code\modules\mob\living\carbon\xenomorph\ai\movement\linger.dm"
-#include "code\modules\mob\living\carbon\xenomorph\ai\movement\linger_facehugger.dm"
 #include "code\modules\mob\living\carbon\xenomorph\ai\movement\lurking.dm"
 #include "code\modules\mob\living\carbon\xenomorph\castes\Boiler.dm"
 #include "code\modules\mob\living\carbon\xenomorph\castes\Burrower.dm"