Skip to content

Commit

Permalink
Xenos with USCM Iff tags no longer trigger code red (#7182)
Browse files Browse the repository at this point in the history
# About the pull request
Stops xenos that have USCM IFF tags from setting code red by being on a
dropship.

# Explain why it's good for the game

My god does it get annoying.


# Changelog
:cl:
add: Xenos with USCM IFF tags no longer trigger code red when on
dropships.
/:cl:
  • Loading branch information
realforest2001 authored Sep 19, 2024
1 parent 71c8b06 commit 70a8450
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions code/modules/shuttle/shuttles/dropship.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/shuttles/marine_ferry.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 70a8450

Please sign in to comment.