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

Fix some trading post oopsies #956

Merged
merged 1 commit into from
Mar 11, 2024

Conversation

DebugOk
Copy link
Contributor

@DebugOk DebugOk commented Mar 11, 2024

Attempt number #2 at a station anchor without altering the map file, and readd a thing I removed while changing stuff

@github-actions github-actions bot added the Changes: C# Changes any cs files label Mar 11, 2024
@DebugOk
Copy link
Contributor Author

DebugOk commented Mar 11, 2024

Bounties are still fucked :/

@DebugOk DebugOk enabled auto-merge (squash) March 11, 2024 19:48
@DebugOk DebugOk merged commit 6bd5092 into DeltaV-Station:master Mar 11, 2024
11 checks passed
deltanedas pushed a commit to deltanedas/Delta-v that referenced this pull request Dec 27, 2024
* full fucking send

* ope forgot to remove the EE scripts

* fix test

* fix shitcode fail

* DELTA THAT VALUE IS NULLABLE

* whoopsie daysie

* fixed???

* chat is this real
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

This is a batch of changes I made for Floof station being ported over to
the upstream branch


---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: Added new neutral xenos, events, and reagent slimes

---------

Signed-off-by: fenndragon <[email protected]>
Signed-off-by: SleepyScarecrow <[email protected]>
Co-authored-by: FoxxoTrystan <[email protected]>
Co-authored-by: SleepyScarecrow <[email protected]>
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: C# Changes any cs files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant