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

New Waste Ruin: Abandoned Miskilamo Shipbreaking Yard #3136

Merged
merged 21 commits into from
Sep 29, 2024

Conversation

Thera-Pissed
Copy link
Contributor

@Thera-Pissed Thera-Pissed commented Jun 21, 2024

About The Pull Request

New wasteplanet ruin, an abandoned shipbreaking yard owned by Miskilamo

yardreal4
yardreal3
image
yardmap2

Why It's Good For The Game

Waste ruins are needed, I think!

Changelog

🆑
add: New wasteplanet ruin, the abandoned Miskilamo shipbreaking yard!
/:cl:

@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. Code change Watch something violently break. labels Jun 21, 2024
@Thera-Pissed Thera-Pissed marked this pull request as ready for review June 25, 2024 05:08
@Thera-Pissed Thera-Pissed requested a review from a team as a code owner June 25, 2024 05:08
@thgvr thgvr added the Ruin Ruin successfully tested. label Jul 12, 2024
@rye-rice
Copy link
Member

@shiptest-ss13/maptainers @Latentish @Apogee-dev @goober3

Copy link
Contributor

@meemofcourse meemofcourse left a comment

Choose a reason for hiding this comment

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

imagen
the galoshes being thrown in there unceremoniously seems wrong
imagen
imagen
replace with actual rations please, and lower the amount present
imagen
i understand that fireaxes might be flavorful but please remove this one
imagen
very funny but don't
imagen
kind of iffy on the c4 bag and emp clusterbomb
imagen
perhaps it would be clever to reflavor this

cool ruin

@thgvr
Copy link
Member

thgvr commented Aug 27, 2024

Fix those checks and it should be good to go

@meemofcourse
Copy link
Contributor

checks please

replaces bugged hivebot spawners with normal spawners
@Thera-Pissed
Copy link
Contributor Author

image
new hivebot spawners, basically the same spots

@Thera-Pissed
Copy link
Contributor Author

checks passed, apologies for the delay

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Sep 20, 2024
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Sep 29, 2024
@Thera-Pissed
Copy link
Contributor Author

apologies for taking so long on merge conflicts!

@meemofcourse meemofcourse added this pull request to the merge queue Sep 29, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 29, 2024
@Thera-Pissed
Copy link
Contributor Author

guh

@meemofcourse
Copy link
Contributor

despite all my rage

@meemofcourse meemofcourse added this pull request to the merge queue Sep 29, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 29, 2024
@meemofcourse meemofcourse added this pull request to the merge queue Sep 29, 2024
@Thera-Pissed
Copy link
Contributor Author

surely

Merged via the queue into shiptest-ss13:master with commit d60cfa1 Sep 29, 2024
14 checks passed
@Thera-Pissed Thera-Pissed deleted the map-time-again branch September 29, 2024 06:15
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. Ruin Ruin successfully tested.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants