Skip to content
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

Jump to bottom

Allows Xenomorphs to turn off the dropship's launch alarm #5210

Merged
merged 4 commits into from
Dec 23, 2023
Merged

Allows Xenomorphs to turn off the dropship's launch alarm #5210

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a30199
Whack it until it stops making noise
SabreML Dec 12, 2023
af50e9a
`stop_playing_launch_announcement_alarm()` move
SabreML Dec 13, 2023
3a30c05
Merge remote-tracking branch 'upstream/master' into siren-stoppage
SabreML Dec 15, 2023
593c563
Queen pronoun consistency
SabreML Dec 15, 2023
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
26 changes: 17 additions & 9 deletions code/modules/shuttle/computers/dropship_computer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,21 +211,30 @@


/obj/structure/machinery/computer/shuttle/dropship/flight/attack_alien(mob/living/carbon/xenomorph/xeno)
if(!is_ground_level(z))
to_chat(xeno, SPAN_NOTICE("Lights flash from the terminal but you can't comprehend their meaning."))
playsound(loc, 'sound/machines/terminal_error.ogg', KEYBOARD_SOUND_VOLUME, 1)
return
var/obj/docking_port/mobile/marine_dropship/dropship = SSshuttle.getShuttle(shuttleId)

// If the attacking xeno isn't the queen.
if(xeno.hive_pos != XENO_QUEEN)
// If the 'about to launch' alarm is playing, a xeno can whack the computer to stop it.
if(dropship.playing_launch_announcement_alarm)
stop_playing_launch_announcement_alarm()
xeno.animation_attack_on(src)
to_chat(xeno, SPAN_XENONOTICE("You slash at [src], silencing its squawking!"))
playsound(loc, 'sound/machines/terminal_shutdown.ogg', 20)
else
to_chat(xeno, SPAN_NOTICE("Lights flash from the terminal but you can't comprehend their meaning."))
playsound(loc, 'sound/machines/terminal_error.ogg', KEYBOARD_SOUND_VOLUME, TRUE)
return XENO_NONCOMBAT_ACTION

if(!is_ground_level(z))
to_chat(xeno, SPAN_NOTICE("Lights flash from the terminal but you can't comprehend their meaning."))
playsound(loc, 'sound/machines/terminal_error.ogg', KEYBOARD_SOUND_VOLUME, 1)
return
playsound(loc, 'sound/machines/terminal_error.ogg', KEYBOARD_SOUND_VOLUME, TRUE)
return XENO_NONCOMBAT_ACTION

if(is_remote)
groundside_alien_action(xeno)
return

var/obj/docking_port/mobile/marine_dropship/dropship = SSshuttle.getShuttle(shuttleId)
if(dropship.is_hijacked)
return

Expand Down Expand Up @@ -287,8 +296,7 @@
hijack.fire()
GLOB.alt_ctrl_disabled = TRUE

dropship.alarm_sound_loop.stop()
dropship.playing_launch_announcement_alarm = FALSE
stop_playing_launch_announcement_alarm()

marine_announcement("Unscheduled dropship departure detected from operational area. Hijack likely. Shutting down autopilot.", "Dropship Alert", 'sound/AI/hijack.ogg', logging = ARES_LOG_SECURITY)
log_ares_flight("Unknown", "Unscheduled dropship departure detected from operational area. Hijack likely. Shutting down autopilot.")
Expand Down
Loading