Skip to content

Commit

Permalink
Mirror: Fix arrivals not docking on spinning stations (#158)
Browse files Browse the repository at this point in the history
## Mirror of PR #26033: [Fix arrivals not docking on spinning
stations](space-wizards/space-station-14#26033)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `9e2e51431938b2df9391939fe499f8963b297292`

PR opened by <img
src="https://avatars.githubusercontent.com/u/10494922?v=4"
width="16"/><a href="https://github.com/ShadowCommander">
ShadowCommander</a> at 2024-03-12 09:44:08 UTC
PR merged by <img
src="https://avatars.githubusercontent.com/u/19864447?v=4"
width="16"/><a href="https://github.com/web-flow"> web-flow</a> at
2024-03-12 12:57:35 UTC

---

PR changed 1 files with 1 additions and 1 deletions.

The PR had the following labels:
- Issue: Bug
- Size: Very Small


---

<details open="true"><summary><h1>Original Body</h1></summary>

> 
> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> ## About the PR
> <!-- What did you change in this PR? -->
> 
> Angle tolerance was too tight for the arrivals shuttle to dock on
station when it was spinning.
> 
> Changed the tolerance from 0.01 to 0.15.
> 
> Fixes #25901
> 
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> 
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
> 
> ## Media
> <!-- 
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
> 
> If you're unsure whether your PR will require media, ask a maintainer.
> 
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
> 
> - [x] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> 
> ## Breaking changes
> <!--
> List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
> -->
> 
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
> 
> <!--
> Make sure to take this Changelog template out of the comment block in
order for it to show up.
> 🆑
> - add: Added fun!
> - remove: Removed fun!
> - tweak: Changed fun!
> - fix: Fixed fun!
> -->
> 🆑
> - fix: Fixed arrivals shuttle not docking with the station when it was
slowly spinning.
> 


</details>

Co-authored-by: ShadowCommander <[email protected]>
  • Loading branch information
SimpleStation14 and ShadowCommander authored Apr 30, 2024
1 parent 0095959 commit 035524b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ private bool CanDock(

foreach (var config in configs)
{
if (config.Coordinates.Equals(coordinates) && config.Angle.EqualsApprox(angle, 0.01))
if (config.Coordinates.Equals(coordinates) && config.Angle.EqualsApprox(angle, 0.15))
{
return config;
}
Expand Down

0 comments on commit 035524b

Please sign in to comment.