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

Reorganizes ship files + Removes ruin and misc folder shuttles + Removes Fugitives and Pirates Antags #2378

Merged
merged 9 commits into from
Oct 25, 2023

Conversation

meemofcourse
Copy link
Contributor

About The Pull Request

This pull request:

  • Reorganizes the Shiptest folder, sorting map files into their own factional folder.
  • Axes all of the ships in the misc and ruin folder, as they were unused and were quite old (you couldn't even spawn them in without an immediate SGT), which includes the Fugitive and Pirate shuttles.
  • Tears out the Pirate and Fugitive antagonist datums. Their content, such as the cryopods and outfits, remain in the game for whatever use.

Why It's Good For The Game

More order and less cruft is good, I think.

Changelog

🆑
del: Ships in the ruin and misc folder (e.g. hunter_bounty, hunter_russian, and pirate_default) have been deleted.
del: Pirates and Fugitives antag datums.
tweak: Map files have been reorganized into a folder with their corresponding faction.
/:cl:

@meemofcourse meemofcourse requested review from a team as code owners September 28, 2023 00:33
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. DME Edit Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Sep 28, 2023
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Sep 30, 2023
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added Merge Conflict Use Git Hooks, you're welcome. and removed Merge Conflict Use Git Hooks, you're welcome. labels Oct 4, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 6, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link
Member

@MarkSuckerberg MarkSuckerberg left a comment

Choose a reason for hiding this comment

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

thank youuuuuuuu

@github-actions github-actions bot removed Merge Conflict Use Git Hooks, you're welcome. Sprites A bikeshed full of soulless bikes. labels Oct 22, 2023
@MarkSuckerberg MarkSuckerberg added this pull request to the merge queue Oct 25, 2023
Merged via the queue into shiptest-ss13:master with commit 4d1b3d5 Oct 25, 2023
10 checks passed
@meemofcourse meemofcourse deleted the fixes branch December 1, 2023 02:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Map Change Tile placing is hard. Thank you for your service.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants