diff --git a/code/modules/shuttle/shuttles/dropship.dm b/code/modules/shuttle/shuttles/dropship.dm index a1405d7e4e23..b0eca77fdda5 100644 --- a/code/modules/shuttle/shuttles/dropship.dm +++ b/code/modules/shuttle/shuttles/dropship.dm @@ -115,9 +115,8 @@ for(var/area/checked_area in shuttle_areas) for(var/mob/living/carbon/xenomorph/checked_xeno in checked_area) - if(checked_xeno.stat == DEAD) + if(checked_xeno.stat == DEAD || (FACTION_MARINE in checked_xeno?.iff_tag.faction_groups)) continue - var/name = "Unidentified Lifesigns" var/input = "Unidentified lifesigns detected onboard. Recommendation: lockdown of exterior access ports, including ducting and ventilation." shipwide_ai_announcement(input, name, 'sound/AI/unidentified_lifesigns.ogg', ares_logging = ARES_LOG_SECURITY) diff --git a/code/modules/shuttles/marine_ferry.dm b/code/modules/shuttles/marine_ferry.dm index bd4a08716954..7b610d23141b 100644 --- a/code/modules/shuttles/marine_ferry.dm +++ b/code/modules/shuttles/marine_ferry.dm @@ -218,8 +218,8 @@ if(!queen_locked) for(var/turf/T in turfs_src) - var/mob/living/carbon/xenomorph/X = locate(/mob/living/carbon/xenomorph) in T - if(X && X.stat != DEAD) + var/mob/living/carbon/xenomorph/xeno = locate(/mob/living/carbon/xenomorph) in T + if((xeno && xeno.stat != DEAD) && !(FACTION_MARINE in xeno?.iff_tag.faction_groups)) var/name = "Unidentified Lifesigns" var/input = "Unidentified lifesigns detected onboard. Recommendation: lockdown of exterior access ports, including ducting and ventilation." shipwide_ai_announcement(input, name, 'sound/AI/unidentified_lifesigns.ogg', ares_logging = ARES_LOG_SECURITY)