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

Fixes Nomadcrash and the areas of Budgetcuts and Miningexpedition #2448

Merged
merged 15 commits into from
Feb 28, 2024

Conversation

Zevotech
Copy link
Contributor

@Zevotech Zevotech commented Nov 3, 2023

turfs repathed this is mergable now thank you for waiting

About The Pull Request

#2384
Fixes the areas on nomadcrash and the two other rockplanet ruins that were given areas but never had them applied.
Fixes the enemy selection on nomadcrash to better fit rockplanets mob pool.
Repaths the turfs used in nomadcrash to be properly subtyped from their actual turfs and use rockplanet atmos.

2023-11-05 14 39 28
2023-11-05 14 39 24

StrongDMM-2023-12-08 02 56 19
StrongDMM-2023-12-08 03 00 46

Why It's Good For The Game

Who merged this without checking it on a testmerge thoroughly? I just want to talk.
Anyways ruins should probably use the correct areas and not have really fucky tiles.

Changelog

🆑
fix: rockplanet_nomadcrash now uses the correct areas.
fix: rockplanet_nomadcrash now uses correctly pathed turfs that dont break when spawned.
fix: rockplanet_budgetcuts and rockplanet_miningexpedition now use their newly added respective areas instead of ruin/powered.
/:cl:

@Zevotech Zevotech requested a review from a team as a code owner November 3, 2023 04:55
@github-actions github-actions bot added the Map Change Tile placing is hard. Thank you for your service. label Nov 3, 2023
@github-actions github-actions bot added the Code change Watch something violently break. label Nov 3, 2023
@Latentish
Copy link
Member

Tm...........

@Latentish Latentish added the Test Merge Candidate You do it for free. label Nov 5, 2023
@Latentish
Copy link
Member

Please link the original pr in your description if you wouldn't mind.

@Zevotech
Copy link
Contributor Author

Zevotech commented Nov 5, 2023

Please link the original pr in your description if you wouldn't mind.

(bites you) Okay............

@Latentish
Copy link
Member

Could you also please provide screenshots of the area'ing of these ruins in sdmm?

@Zevotech
Copy link
Contributor Author

Zevotech commented Nov 5, 2023

Could you also please provide screenshots of the area'ing of these ruins in sdmm?

(bites you again) Hi hiii haiiii :3

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.

image
while you're touching this can you use proper areas so i can have my fuckin weather

@Zevotech Zevotech changed the title Fixes Nomadcrash Areas Fixes Nomadcrash and the areas of Budgetcuts and Mininexpedition Dec 8, 2023
@Zevotech
Copy link
Contributor Author

Zevotech commented Dec 8, 2023

Updated, turfs repathed so its mergable.

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

github-actions bot commented Jan 9, 2024

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 Jan 11, 2024
@Zevotech Zevotech changed the title Fixes Nomadcrash and the areas of Budgetcuts and Mininexpedition Fixes Nomadcrash and the areas of Budgetcuts and Miningexpedition Jan 27, 2024
@Zevotech
Copy link
Contributor Author

Should be fixed. Please TM.

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

github-actions bot commented Feb 5, 2024

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 Feb 9, 2024
@thgvr thgvr enabled auto-merge February 9, 2024 23:04
@Latentish Latentish disabled auto-merge February 10, 2024 00:01
@Latentish Latentish added this pull request to the merge queue Feb 28, 2024
Merged via the queue into shiptest-ss13:master with commit 51b4317 Feb 28, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Feb 28, 2024
…iptest-ss13#2448)

<!-- 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. -->
## turfs repathed this is mergable now thank you for waiting
## About The Pull Request
shiptest-ss13#2384
Fixes the areas on nomadcrash and the two other rockplanet ruins that
were given areas but never had them applied.
Fixes the enemy selection on nomadcrash to better fit rockplanets mob
pool.
Repaths the turfs used in nomadcrash to be properly subtyped from their
actual turfs and use rockplanet atmos.

![2023-11-05 14 39
28](https://github.com/shiptest-ss13/Shiptest/assets/95449138/2129cf50-d1a8-4b0b-b1cd-9fb966f64be4)
![2023-11-05 14 39
24](https://github.com/shiptest-ss13/Shiptest/assets/95449138/f30da56d-9458-488b-9e81-344fd0ec4f8c)

![StrongDMM-2023-12-08 02 56
19](https://github.com/shiptest-ss13/Shiptest/assets/95449138/e6e8e9e0-ff2d-41e4-a2ca-206367af6b51)
![StrongDMM-2023-12-08 03 00
46](https://github.com/shiptest-ss13/Shiptest/assets/95449138/8548bb33-08cb-4751-8441-a2c6ad9e2955)

## Why It's Good For The Game
Who merged this without checking it on a testmerge thoroughly? I just
want to talk.
Anyways ruins should probably use the correct areas and not have really
fucky tiles.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
fix: rockplanet_nomadcrash now uses the correct areas.
fix: rockplanet_nomadcrash now uses correctly pathed turfs that dont
break when spawned.
fix: rockplanet_budgetcuts and rockplanet_miningexpedition now use their
newly added respective areas instead of ruin/powered.
/: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: zevo <[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. Test Merge Candidate You do it for free.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants