From d1afe39c0c721a0056d1ee93b1db893da776e17f Mon Sep 17 00:00:00 2001 From: tonyhawq <119907639+tonyhawq@users.noreply.github.com> Date: Thu, 14 Aug 2025 19:22:08 -0700 Subject: [PATCH] Fixes an issue where called shuttles would say "1 minutes" instead of "1 minute" (#92539) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## About The Pull Request image image ## Why It's Good For The Game It. is good 👍 ## Changelog :cl: spellcheck: shuttles will now say "arriving in 1 minute" instead of "1 minutes" /:cl: --- code/modules/cargo/orderconsole.dm | 2 +- .../modular_computers/file_system/programs/budgetordering.dm | 2 +- .../shuttle/mobile_port/variants/emergency/emergency.dm | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/cargo/orderconsole.dm b/code/modules/cargo/orderconsole.dm index 420d5486c63..762fa1dcfa5 100644 --- a/code/modules/cargo/orderconsole.dm +++ b/code/modules/cargo/orderconsole.dm @@ -379,7 +379,7 @@ requisition_paper.update_appearance() ui.user.investigate_log("called the supply shuttle.", INVESTIGATE_CARGO) - say("The supply shuttle has been called and will arrive in [SSshuttle.supply.timeLeft(600)] minutes.") + say("The supply shuttle has been called and will arrive in [SSshuttle.supply.timeLeft(600)] minute\s.") SSshuttle.moveShuttle(cargo_shuttle, docking_home, TRUE) . = TRUE diff --git a/code/modules/modular_computers/file_system/programs/budgetordering.dm b/code/modules/modular_computers/file_system/programs/budgetordering.dm index 35bacb2fd41..ea01652cf84 100644 --- a/code/modules/modular_computers/file_system/programs/budgetordering.dm +++ b/code/modules/modular_computers/file_system/programs/budgetordering.dm @@ -187,7 +187,7 @@ usr.investigate_log("sent the supply shuttle away.", INVESTIGATE_CARGO) else usr.investigate_log("called the supply shuttle.", INVESTIGATE_CARGO) - computer.say("The supply shuttle has been called and will arrive in [SSshuttle.supply.timeLeft(600)] minutes.") + computer.say("The supply shuttle has been called and will arrive in [SSshuttle.supply.timeLeft(600)] minute\s.") SSshuttle.moveShuttle(cargo_shuttle, docking_home, TRUE) . = TRUE if("loan") diff --git a/code/modules/shuttle/mobile_port/variants/emergency/emergency.dm b/code/modules/shuttle/mobile_port/variants/emergency/emergency.dm index 979f1dec964..c0e088e60aa 100644 --- a/code/modules/shuttle/mobile_port/variants/emergency/emergency.dm +++ b/code/modules/shuttle/mobile_port/variants/emergency/emergency.dm @@ -47,9 +47,8 @@ SSshuttle.emergency_last_call_loc = signal_origin else SSshuttle.emergency_last_call_loc = null - priority_announce( - text = "The emergency shuttle has been called. [red_alert ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [(timeLeft(60 SECONDS))] minutes.[reason][SSshuttle.emergency_last_call_loc ? "\n\nCall signal traced. Results can be viewed on any communications console." : "" ][SSshuttle.admin_emergency_no_recall ? "\n\nWarning: Shuttle recall subroutines disabled; Recall not possible." : ""]", + text = "The emergency shuttle has been called. [red_alert ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [timeLeft(60 SECONDS)] minute\s.[reason][SSshuttle.emergency_last_call_loc ? "\n\nCall signal traced. Results can be viewed on any communications console." : "" ][SSshuttle.admin_emergency_no_recall ? "\n\nWarning: Shuttle recall subroutines disabled; Recall not possible." : ""]", title = "Emergency Shuttle Dispatched", sound = ANNOUNCER_SHUTTLECALLED, sender_override = "Emergency Shuttle Uplink Alert",