diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm index da591f0570..dcc3af220e 100644 --- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm +++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm @@ -96,8 +96,8 @@ var/const/MAX_ACTIVE_TIME = 400 ..() if(stat == CONSCIOUS) icon_state = "[initial(icon_state)]" - Attach(hit_atom) throwing = 0 + GoIdle(30,50) //stunned for a few seconds - allows throwing them to be useful for positioning but not as an offensive action (unless you're setting up a trap) /obj/item/clothing/mask/facehugger/proc/Attach(M as mob) @@ -124,12 +124,14 @@ var/const/MAX_ACTIVE_TIME = 400 L.visible_message("\red \b [src] leaps at [L]'s face!") + /* Tentatively removed since huggers can't be thrown anymore if(ishuman(L)) var/mob/living/carbon/human/H = L if(H.head && H.head.flags & HEADCOVERSMOUTH) H.visible_message("\red \b [src] smashes against [H]'s [H.head]!") Die() return + */ if(iscarbon(M)) var/mob/living/carbon/target = L @@ -191,7 +193,7 @@ var/const/MAX_ACTIVE_TIME = 400 return -/obj/item/clothing/mask/facehugger/proc/GoIdle() +/obj/item/clothing/mask/facehugger/proc/GoIdle(var/min_time=MIN_ACTIVE_TIME, var/max_time=MAX_ACTIVE_TIME) if(stat == DEAD || stat == UNCONSCIOUS) return @@ -200,7 +202,7 @@ var/const/MAX_ACTIVE_TIME = 400 stat = UNCONSCIOUS icon_state = "[initial(icon_state)]_inactive" - spawn(rand(MIN_ACTIVE_TIME,MAX_ACTIVE_TIME)) + spawn(rand(min_time,max_time)) GoActive() return diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm index 64d5974f25..d36267adab 100644 --- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm +++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm @@ -110,7 +110,7 @@ name = "Xenomorph Drone" caste_name = "drone" weeds_plasma_rate = 15 - slowdown = 2 + slowdown = 1 tail = "xenos_drone_tail" rarity_value = 5 @@ -149,7 +149,7 @@ name = "Xenomorph Hunter" weeds_plasma_rate = 5 caste_name = "hunter" - slowdown = -1 + slowdown = -2 total_health = 150 tail = "xenos_hunter_tail" @@ -177,7 +177,7 @@ name = "Xenomorph Sentinel" weeds_plasma_rate = 10 caste_name = "sentinel" - slowdown = 1 + slowdown = 0 total_health = 125 tail = "xenos_sentinel_tail" @@ -209,7 +209,7 @@ weeds_heal_rate = 5 weeds_plasma_rate = 20 caste_name = "queen" - slowdown = 5 + slowdown = 4 tail = "xenos_queen_tail" rarity_value = 10