Skip to content

Fix: Xenomorph on dropship alert occurs after landing #11894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MistChristmas wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Xenomorph on dropship alert occurs after landing #11894

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions code/modules/shuttle/shuttles/dropship.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,19 +94,6 @@
. = ..()
control_doors("force-lock-launch", "all", force=TRUE, asynchronous = FALSE)

if(is_hijacked)
return

for(var/area/checked_area in shuttle_areas)
for(var/mob/living/carbon/xenomorph/checked_xeno in checked_area)
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)
set_security_level(SEC_LEVEL_RED)
return

/obj/docking_port/mobile/marine_dropship/proc/on_dir_change(datum/source, old_dir, new_dir)
SIGNAL_HANDLER
for(var/place in shuttle_areas)
Expand Down Expand Up @@ -280,6 +267,19 @@
for(var/obj/structure/dropship_equipment/eq as anything in dropship.equipments)
eq.on_arrival()

if(dropship.is_hijacked || !is_mainship_level(z))
return

for(var/area/checked_area in dropship.shuttle_areas)
for(var/mob/living/carbon/xenomorph/checked_xeno in checked_area)
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)
set_security_level(SEC_LEVEL_RED)
return

/obj/docking_port/stationary/marine_dropship/on_dock_ignition(obj/docking_port/mobile/departing_shuttle)
. = ..()
turn_on_landing_lights()
Expand Down Expand Up @@ -377,5 +377,3 @@
/datum/map_template/shuttle/devana
name = "Devana"
shuttle_id = DROPSHIP_DEVANA