Skip to content

Exploration Shuttle fixes#38970

Draft
west3436 wants to merge 1 commit intovgstation-coders:Bleeding-Edgefrom
west3436:expshuttlefixes
Draft

Exploration Shuttle fixes#38970
west3436 wants to merge 1 commit intovgstation-coders:Bleeding-Edgefrom
west3436:expshuttlefixes

Conversation

@west3436
Copy link
Collaborator

@west3436 west3436 commented Feb 1, 2026

What this does

  • Fixes the Deff Exploration Shuttle which was completely immobile due to an incorrect docking port type. Closes Defficiency explorer shuttle doesn't work #38947.
  • Fixes the Waystation Exploration Shuttle overlapping with the Vox Tradeship, causing either shuttle to be unable to dock at the station while the other one was present. Closes Exploration Shuttle Stuck In Transit #38953.
  • Adds a 2min time limit to transit level use; if a shuttle is unable to move to its destination for whatever reason then it'll return to its previous destination after 2min in transit.

Why it's good

Fixes bugs.

How it was tested

0% but I will later

Changelog

🆑

  • bugfix: Fixed an overlap between the Vox Trade Ship and Exploration Shuttle on Waystation.
  • bugfix: Fixed an incorrect docking port type on the Deff Exploration Shuttle preventing it from being used.

@west3436 west3436 added Bug / Fix This is either a bug or a fix for a bug. Mapping (Deff 🗑️) Defficiency map touched. Mapping (Waystation 🚉) Waystation map touched. labels Feb 1, 2026
@braplord
Copy link
Contributor

braplord commented Feb 2, 2026

if this pr gets merged after #38977 then my changes will not be in the codebase and vice versa so should i close mine and wait for this to get merged?

@west3436
Copy link
Collaborator Author

west3436 commented Feb 3, 2026

if this pr gets merged after #38977 then my changes will not be in the codebase and vice versa so should i close mine and wait for this to get merged?

That's not what will happen; your PR being merged will just result in merge conflicts in my PR that I can fix when it happens. No need to change or close your PR

@braplord
Copy link
Contributor

braplord commented Feb 3, 2026

okay thanks

@west3436 west3436 marked this pull request as draft February 7, 2026 02:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Bug / Fix This is either a bug or a fix for a bug. Mapping (Deff 🗑️) Defficiency map touched. Mapping (Waystation 🚉) Waystation map touched.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Exploration Shuttle Stuck In Transit Defficiency explorer shuttle doesn't work

2 participants