Skip to content

Revert Salvage Shittle and Trading Post removal#344

Merged
Peptide90 merged 1 commit intoSimple-Station:masterfrom
VMSolidus:revert-salvage-shittle-removal
Apr 30, 2024
Merged

Revert Salvage Shittle and Trading Post removal#344
Peptide90 merged 1 commit intoSimple-Station:masterfrom
VMSolidus:revert-salvage-shittle-removal

Conversation

@VMSolidus
Copy link
Copy Markdown
Member

It's been gone for a bit too long.

@github-actions github-actions bot added the Changes: YML Changes any yml files label Apr 29, 2024
@DangerRevolution
Copy link
Copy Markdown
Contributor

not sure this is a good idea, forks should be able to edit this to their preference :O

@stellar-novas
Copy link
Copy Markdown
Contributor

stellar-novas commented Apr 29, 2024

Make it a cvar :godo:

Also forks still can, this is just the default

@Peptide90 Peptide90 enabled auto-merge (squash) April 30, 2024 19:19
Copy link
Copy Markdown
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i personally don't like this but it is a functional PR, this should be checked that it causes no fuckery with changed bounties from Delta

@Peptide90 Peptide90 merged commit 0947a52 into Simple-Station:master Apr 30, 2024
@Axionyxx

This comment was marked as abuse.

@VMSolidus

This comment was marked as off-topic.

@Axionyxx

This comment was marked as off-topic.

@VMSolidus
Copy link
Copy Markdown
Member Author

Sure thing, next time you introduce a bug I'll just stay quiet

Everything still works, there's just two trade stations now. I'll go fix that.

Peptide90 pushed a commit that referenced this pull request May 12, 2024
# Description

This fixes a bug introduced inadvertently by
#344 by adding a
CVar that makes it a choice to be made by our downstreams. Also, welcome
to our new CVar standard where they should be included in other systems.

---------

Co-authored-by: Danger Revolution! <[email protected]>
Mnemotechnician pushed a commit to Mnemotechnician/Einstein-Engines that referenced this pull request Dec 15, 2024
Mnemotechnician pushed a commit to Mnemotechnician/Einstein-Engines that referenced this pull request Dec 15, 2024
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.

5 participants