diff --git a/code/game/machinery/computer/dropship_weapons.dm b/code/game/machinery/computer/dropship_weapons.dm index ab77f35d26..b5022b4a75 100644 --- a/code/game/machinery/computer/dropship_weapons.dm +++ b/code/game/machinery/computer/dropship_weapons.dm @@ -694,10 +694,10 @@ if(CEILING_GLASS) is_outside = TRUE if(!is_outside && !cavebreaker) //cavebreaker doesn't care - to_chat(weapon_operator, SPAN_WARNING("INVALID TARGET: target must be visible from high altitude.")) + to_chat(weapon_operator, SPAN_WARNING("WARNING: Target obstructed by terrain features.")) return FALSE if (protected_by_pylon(TURF_PROTECTION_CAS, TU)) - to_chat(weapon_operator, SPAN_WARNING("INVALID TARGET: biological-pattern interference with signal.")) + to_chat(weapon_operator, SPAN_WARNING("WARNING: Signal garbled, launch aborted.")) return FALSE if(!DEW.ammo_equipped.can_fire_at(TU, weapon_operator)) return FALSE @@ -807,10 +807,10 @@ if (!istype(dropship)) return FALSE if (!dropship.in_flyby || dropship.mode != SHUTTLE_CALL) - to_chat(user, SPAN_WARNING("Has to be in Fly By mode")) + to_chat(user, SPAN_WARNING("You must be making a flyby!")) return FALSE if (dropship.timer && dropship.timeLeft(1) < firemission_envelope.flyoff_period) - to_chat(user, SPAN_WARNING("Not enough time to complete the Fire Mission")) + to_chat(user, SPAN_WARNING("Not enough time on station to complete the firemission.")) return FALSE var/datum/cas_signal/recorded_loc = firemission_envelope.recorded_loc var/obj/source = recorded_loc.signal_loc @@ -846,7 +846,7 @@ return if(firemission_envelope.recorded_loc.obstructed_signal()) if(firemission_envelope.user_is_guided(user)) - to_chat(user, SPAN_WARNING("Signal Obstructed. You have to go in blind.")) + to_chat(user, SPAN_WARNING("Signal obstructed. You have to go in blind.")) return var/sx = 0 var/sy = 0 @@ -872,7 +872,7 @@ var/area/laser_area = get_area(shootloc) if(!istype(laser_area) || CEILING_IS_PROTECTED(laser_area.ceiling, CEILING_PROTECTION_TIER_1)) if(firemission_envelope.user_is_guided(user)) - to_chat(user, SPAN_WARNING("Vision Obstructed. You have to go in blind.")) + to_chat(user, SPAN_WARNING("Vision obstructed. You have to go in blind.")) firemission_envelope.change_current_loc() else firemission_envelope.change_current_loc(shootloc) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index 0024958c8e..ccc7c891e5 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -259,8 +259,8 @@ hijack.fire() GLOB.alt_ctrl_disabled = TRUE - 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.") + marine_announcement("Unknown fault in remote flight control. Resolving as possible hijack. Marking dropship as possibly hostile and disconnecting from sensor matrix.", "Dropship Alert", 'sound/misc/notice2.ogg', logging = ARES_LOG_SECURITY) + log_ares_flight("Unknown", "Unknown fault in remote flight control. Resolving as possible hijack. Marking dropship as possibly hostile and disconnecting from sensor matrix.") var/mob/living/carbon/xenomorph/xeno = user var/hivenumber = XENO_HIVE_NORMAL @@ -306,7 +306,7 @@ .["target_destination"] = shuttle.in_flyby? "Flyby" : shuttle.destination.name .["door_status"] = is_remote ? list() : shuttle.get_door_data() - .["has_flyby_skill"] = skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT) + .["has_flyby_skill"] = skillcheck(user, SKILL_PILOT, SKILL_PILOT_TRAINED) // Launch Alarm Variables .["playing_launch_announcement_alarm"] = shuttle.playing_launch_announcement_alarm @@ -363,7 +363,7 @@ var/dock_id = params["target"] if(dock_id == DROPSHIP_FLYBY_ID) - if(!skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT)) + if(!skillcheck(user, SKILL_PILOT, SKILL_PILOT_TRAINED)) to_chat(user, SPAN_WARNING("You don't have the skill to perform a flyby.")) return FALSE update_equipment(is_optimised, TRUE) @@ -465,7 +465,7 @@ shuttle.setTimer(DROPSHIP_WARMUP_TIME) if("play_launch_announcement_alarm") if (shuttle.mode != SHUTTLE_IDLE && shuttle.mode != SHUTTLE_RECHARGING) - to_chat(usr, SPAN_WARNING("The Launch Announcement Alarm is designed to tell people that you're going to take off soon.")) + to_chat(usr, SPAN_WARNING("The launch warning alarm is only for alerting people to a takeoff.")) return shuttle.alarm_sound_loop.start() shuttle.playing_launch_announcement_alarm = TRUE @@ -503,7 +503,7 @@ /obj/structure/machinery/computer/shuttle/dropship/flight/toc name = "dropship control screen" - desc = "A screen on the TOC computer for controlling the dropship linked to it." + desc = "A screen on the TOC computer for controlling the dropship linked to it. Has an abbreviated version of the flight controls and data." icon = 'icons/obj/structures/machinery/computer.dmi' icon_state = "toc_shuttle" shuttleId = DROPSHIP_MIDWAY