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

ERT Subshuttles #2449

Merged
merged 8 commits into from
Feb 11, 2024
Merged

ERT Subshuttles #2449

merged 8 commits into from
Feb 11, 2024

Conversation

meemofcourse
Copy link
Contributor

@meemofcourse meemofcourse commented Nov 4, 2023

About The Pull Request

At the request of maptainers, I've moved ERT subshuttles to a separate pull request.

Includes:

  • Ancon-Class Internship Ship, for Central Command Inspectors and Interns
    imagen

  • Crux-Class Dropship, for Colonial Minutemen response teams
    imagen

  • Runner-Class Ambulance, for Cybersun Trauma Teams
    imagen

  • Anvil-Class Dropship, for Inteq Management response teams
    imagen

Why It's Good For The Game

what's the fuckin point of adding support for ert subshuttles if all we get is a kunai

Changelog

🆑
add: Crux-Class Dropship
add: Ancon-Class Internship Ship
add: Runner-Class Ambulance
add: Anvil-Class Dropship
fix: ERTs can now actually spawn at outposts
/:cl:

@meemofcourse meemofcourse requested a review from a team as a code owner November 4, 2023 15:33
@keywordlabeler keywordlabeler bot added the Do Not Merge You probably made someone angry, or you're stopping people from getting angry. label Nov 4, 2023
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. Code change Watch something violently break. labels Nov 4, 2023
Copy link
Contributor

@Erikafox Erikafox left a comment

Choose a reason for hiding this comment

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

we can just add more subshuttles later

Copy link
Contributor

This PR has been inactive for a month. This means it is at risk of being auto closed in a week, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added Stale All falls to entropy eventually. Merge Conflict Use Git Hooks, you're welcome. labels Dec 12, 2023
Copy link
Contributor

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

@thgvr thgvr added Stale Exempt Take your time. and removed Stale All falls to entropy eventually. labels Dec 13, 2023
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Dec 13, 2023
@MarkSuckerberg
Copy link
Member

is this ready?

@meemofcourse
Copy link
Contributor Author

no

@meemofcourse meemofcourse changed the title [DNM] ERT Subshuttles ERT Subshuttles Jan 27, 2024
@meemofcourse meemofcourse removed the Do Not Merge You probably made someone angry, or you're stopping people from getting angry. label Jan 29, 2024
@thgvr thgvr added the Ship Ship successfully tested. label Feb 4, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Feb 4, 2024
Copy link
Contributor

github-actions bot commented Feb 4, 2024

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

@thgvr
Copy link
Member

thgvr commented Feb 4, 2024

haha

@meemofcourse
Copy link
Contributor Author

throws a lizard at you

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Feb 4, 2024
@Latentish
Copy link
Member

Tming and testing this.

@Latentish Latentish added the Test Merge Candidate You do it for free. label Feb 9, 2024
Copy link
Member

@Latentish Latentish left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@Latentish Latentish added this pull request to the merge queue Feb 11, 2024
Merged via the queue into shiptest-ss13:master with commit caf3e07 Feb 11, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Feb 12, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

At the request of maptainers, I've moved ERT subshuttles to a separate
pull request.

Includes:
* Ancon-Class Internship Ship, for Central Command Inspectors and
Interns

![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/5f83c74f-9a08-4f36-addb-286f1c6315cb)
* Crux-Class Dropship, for Colonial Minutemen response teams

![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/0ef8cd4b-f9f5-499e-a238-6e3e6a3d9168)
* Runner-Class Ambulance, for Cybersun Trauma Teams

![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/5e3f48c3-8a47-4485-951f-1c3a1c41e70e)

* Anvil-Class Dropship, for Inteq Management response teams

![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/272f063f-9c7f-458d-9cf0-d11fc4c8b77d)


## Why It's Good For The Game

what's the fuckin point of adding support for ert subshuttles if all we
get is a kunai

## Changelog

:cl:
add: Crux-Class Dropship
add: Ancon-Class Internship Ship
add: Runner-Class Ambulance
add: Anvil-Class Dropship
fix: ERTs can now actually spawn at outposts
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: meem <[email protected]>
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. Map Change Tile placing is hard. Thank you for your service. Ship Ship successfully tested. Stale Exempt Take your time. Test Merge Candidate You do it for free.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants