Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Separates DV-added airlocks into DV files #1002

Merged
merged 2 commits into from
Mar 27, 2024

Conversation

IamVelcroboy
Copy link
Member

About the PR

Simply moves airlocks we added from the upstream file to our file for better separation/easier management over time. Does not add any new entities.

Why / Balance

Probably should have been done this way the first time but...🤷‍♂️

@github-actions github-actions bot added the Changes: YML Changes any yml files label Mar 25, 2024
@IamVelcroboy IamVelcroboy enabled auto-merge (squash) March 27, 2024 16:34
@IamVelcroboy IamVelcroboy merged commit 3dea418 into DeltaV-Station:master Mar 27, 2024
11 checks passed
nearlyNonexistent referenced this pull request in nearlyNonexistent/Horizon-Station Apr 14, 2024
Separate airlocks

Co-authored-by: Velcroboy <[email protected]>
VMSolidus added a commit to Simple-Station/Einstein-Engines that referenced this pull request May 9, 2024
## Mirror of PR #1002: [Separates DV-added airlocks into DV
files](DeltaV-Station/Delta-v#1002) from <img
src="https://avatars.githubusercontent.com/u/131613340?v=4"
alt="DeltaV-Station" width="22"/>
[DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v)

<aside>PR opened by <img
src="https://avatars.githubusercontent.com/u/107660393?v=4"
width="16"/><a href="https://github.com/IamVelcroboy"> IamVelcroboy</a>
at 2024-03-25 14:52:38 UTC</aside>
<aside>PR merged by <img
src="https://avatars.githubusercontent.com/u/107660393?v=4"
width="16"/><a href="https://github.com/IamVelcroboy"> IamVelcroboy</a>
at 2024-03-27 16:44:22 UTC</aside>
<sup>

`3dea418e7ee0db6136855914dd3f99b01fb337ee`

</sup>

---

PR changed 0 files with 0 additions and 0 deletions.

The PR had the following labels:
- Changes: YML


---

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

> ## About the PR
> Simply moves airlocks we added from the upstream file to our file for
better separation/easier management over time. Does not add any new
entities.
> 
> ## Why / Balance
> Probably should have been done this way the first time but...🤷‍♂️


</details>

Co-authored-by: Velcroboy <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
Co-authored-by: Peptide90 <[email protected]>
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
# Description

This PR adds a new psionic power, that of Telekinetic Pulse.
This also fixes a crash related to the Anomaly Power System.

# TODO

- [x] Finish localizations.

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

![Example Media Embed](https://example.com/thisimageisntreal.png)

</p>
</details>

# Changelog

:cl:
- add: Added Telekinetic Pulse power.
- fix: Fixed a crash related to Shadeskip
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: YML Changes any yml files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants