Skip to content

Commit

Permalink
Whack it until it stops making noise
Browse files Browse the repository at this point in the history
  • Loading branch information
SabreML committed Dec 12, 2023
1 parent a14e52a commit 2a30199
Showing 1 changed file with 17 additions and 9 deletions.
26 changes: 17 additions & 9 deletions code/modules/shuttle/computers/dropship_computer.dm
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

0 comments on commit 2a30199

Please sign in to comment.