cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 09:42:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes an issue where called shuttles would say "1 minutes" instead of "1 minute" (#92539)

Browse Source 
## About The Pull Request
<img width="397" height="190" alt="image"
src="https://github.com/user-attachments/assets/41e915bc-6d8c-4180-83f1-12380c76554c"
/>

<img width="220" height="112" alt="image"
src="https://github.com/user-attachments/assets/ef3aa542-e6e3-4983-8917-66009d4f843e"
/>

## Why It's Good For The Game
It. is good 👍 

## Changelog

🆑
spellcheck: shuttles will now say "arriving in 1 minute" instead of "1
minutes"
/🆑
This commit is contained in:
tonyhawq
2025-08-14 19:22:08 -07:00
committed by GitHub
parent 7ccd6742a1
commit 48fc67f7bb
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/cargo/orderconsole.dm
View File

@@ -378,7 +378,7 @@
requisition_paper.update_appearance() requisition_paper.update_appearance()
ui.user.investigate_log("called the supply shuttle.", INVESTIGATE_CARGO) 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) SSshuttle.moveShuttle(cargo_shuttle, docking_home, TRUE)
. = TRUE . = TRUE

2
code/modules/modular_computers/file_system/programs/budgetordering.dm
View File

@@ -187,7 +187,7 @@
usr.investigate_log("sent the supply shuttle away.", INVESTIGATE_CARGO) usr.investigate_log("sent the supply shuttle away.", INVESTIGATE_CARGO)
else else
usr.investigate_log("called the supply shuttle.", INVESTIGATE_CARGO) 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) SSshuttle.moveShuttle(cargo_shuttle, docking_home, TRUE)
. = TRUE . = TRUE
if("loan") if("loan")

3
code/modules/shuttle/mobile_port/variants/emergency/emergency.dm
View File

@@ -47,9 +47,8 @@
SSshuttle.emergency_last_call_loc = signal_origin SSshuttle.emergency_last_call_loc = signal_origin
else else
SSshuttle.emergency_last_call_loc = null SSshuttle.emergency_last_call_loc = null
priority_announce( 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", title = "Emergency Shuttle Dispatched",
sound = ANNOUNCER_SHUTTLECALLED, sound = ANNOUNCER_SHUTTLECALLED,
sender_override = "Emergency Shuttle Uplink Alert", sender_override = "Emergency Shuttle Uplink Alert",