Commit Graph

15 Commits

Author SHA1 Message Date
Pieter-Jan Briers
de98315595 Extend shuttle dock time if the shuttle doesn't dock at evac. (#31496)
* Extend shuttle dock time if the shuttle doesn't dock at evac.

If the shuttle can't dock at evac for *some reason*, it will instead try to dock at another port on the station. And if that fails it goes somewhere random on the station.

Because of the chaos and confusion caused by this, many people will frequently not get to the shuttle in time under these circumstances. This sucks for everybody.

To alleviate this, the shuttle launch timer will now be extended if the station doesn't dock at its ideal spot. The default values (controlled via CVar) are 1.667x and 2x respectively for "wrong dock" and "no dock at all" scenarios.

The code around here was a mess, so I fixed that too. "CallEmergencyShuttle" has been renamed to "DockEmergencyShuttle", the overload that did the actual docking has been renamed to DockSingleEmergencyShuttle. Code has been split into separate dock -> announce methods so we can calculate shuttle delay in between the case of multiple stations.

Also made the "shuttle couldn't find a dock" text announce the time until it launches and fix the shuttle timers not triggering for it.

* Minor review
2025-07-20 14:08:47 +10:00
Mervill
c9918f33fe Replace obsolete code in shuttle systems. (#31408)
* Format DockingSystem.Shuttle

* arrivals system

* docking system

* shuttle console system

* emergency shuttle system

* shuttle system

* thruster system

* Fix compile error
2025-07-20 14:08:44 +10:00
Will-Oliver-Br
6c121b22dd Port Pod Dock Fix (#2439)
# Description

Port fix for pods escape from
[Harmony](https://github.com/ss14-harmony/ss14-harmony)
Prs:
https://github.com/ss14-harmony/ss14-harmony/pull/364
https://github.com/ss14-harmony/ss14-harmony/pull/372

---

<details><summary><h1>Media</h1></summary>
<p>


https://github.com/user-attachments/assets/0ca72881-fb99-4544-8e4b-44b929cd0f6a

</p>
</details>

---

# Changelog

🆑 Zap527, spanky-spanky and Will-Oliver-Br
- fix: Escape pods now correctly dock at centcomm.

---------

Co-authored-by: jajsha <corbinbinouche7@gmail.com>
Co-authored-by: Spanky <scott@wearejacob.com>
2025-07-12 01:48:18 +10:00
Spatison
a2557f75a6 Upstream (#129) 2024-11-21 17:49:04 +07:00
SimpleStation14
035524b04f Mirror: Fix arrivals not docking on spinning stations (#158)
## Mirror of PR #26033: [Fix arrivals not docking on spinning
stations](https://github.com/space-wizards/space-station-14/pull/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 <10494922+ShadowCommander@users.noreply.github.com>
2024-04-30 16:51:06 -04:00
metalgearsloth
f5a6a11ebd Fix FTLToDock (#25803)
* Fix FTLToDock

- Removed Enabled coz unneeded really.
- Fixed SetCoordinates call that got dumped at some point oop.

* Fix this docking check

(cherry picked from commit 92872e546ad5c281980ab8f56fea970c1921f8e4)
2024-03-08 12:54:53 +01:00
metalgearsloth
f102e8ff75 Shuttle console + FTL rework (#24430)
* Add shuttle interior drawing back

Just do it per-tile she'll be right, at least it's done with 1 draw call.

* Revamp shuttle console

* Bunch of cleanup work

* Lables sortito

* dok

* Pixel alignment and colours

* Fix a bunch of drawing bugs

* Shuttle map drawing

* Drawing fixes

* Map parallax working finally

* weh

* Commit all my stuff

* mic

* deez

* Update everything

* Xamlify everything

* uh

* Rudimentary blocker range

* My enemies have succeeded

* Bunch of changes to FTL

* Heaps of cleanup

* Fix FTL bugs

* FTL

* weewoo

* FTL fallback

* wew

* weh

* Basic FTL working

* FTL working

* FTL destination fixes

* a

* Exclusion zones

* Fix drawing / FTL

* Beacons working

* Coordinates drawing

* Fix unknown map names

* Dorks beginning

* State + docking cleanup start

* Basic dock drawing

* Bunch of drawing fixes

* Batching / color fixes

* Cleanup and beacons support

* weh

* weh

* Begin pings

* First draft at map objects

* Map fixup

* Faster drawing

* Fix perf + FTL

* Cached drawing

* Fix drawing

* Best I got

* strips

* Back to lists but with caching

* Final optimisation

* Fix dock bounds

* Docking work

* stinker

* kobolds

* Btns

* Docking vis working

* Fix docking pre-vis

* canasses

* Helldivers 2

* a

* Array life

* Fix

* Fix TODOs

* liltenhead feature club

* dorking

* Merge artifacts

* Last-minute touchup

(cherry picked from commit c5486873db0d6826122eb1f30007e392fc101082)
2024-03-08 12:54:53 +01:00
metalgearsloth
b3fd04fbf9 Fix docking FTL to planets being impossible (#21780) 2023-12-02 19:00:03 +01:00
DrSmugleaf
9cc8a7fc81 Remove 700 usages of Component.Owner (#21100) 2023-10-20 15:31:13 +02:00
metalgearsloth
82d9fa69a4 Fix planet docking (#20104) 2023-09-27 21:59:12 +02:00
metalgearsloth
68480af109 Update content vectors to numerics (#17759) 2023-07-08 14:08:32 +10:00
metalgearsloth
d09026c89c Fix some docking configs (#17012) 2023-06-01 10:48:44 +10:00
metalgearsloth
56371c3acb Docking config changes (#16945)
* Docking config changes

- Should be more flexible with tight bounds.
- Arrivals should always go for the 4-way dock.
- Don't think it fixes Omega.

* weh

* Basic test
2023-06-01 00:09:14 +10:00
metalgearsloth
40deda74ab Fix docking config in some instances (#15005) 2023-03-31 15:45:14 +11:00
metalgearsloth
448165ffda Escape pods (#14809)
* Namespace adjustments for days

* pod

* thanks rider

* Fix the oop launch

* Fixes

* Fix stuff

* eeeeeeeee

* Fix

* access

* map

* forgor

* thing

* Genericise escape pod fill
2023-03-23 19:54:41 -06:00