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

Moves the Brazillab ruin to Sandplanet and fixes the Trabuco's inhand sprites #3375

Merged
merged 12 commits into from
Nov 27, 2024

Conversation

Zevotech
Copy link
Contributor

@Zevotech Zevotech commented Sep 16, 2024

About The Pull Request

Remaps the Brazillab ruin to fit on whitesands, because on iceplanet all of the hermits in it would die to the cold and the ruin looked ugly there anyways.
Also fixes the trabuco's inhands that were apparently broken.
Ruin has been given a serious touchup, but otherwise remains similar to its iceplanet counterpart.

image

SDMM Pictures

StrongDMM-2024-11-16 00 30 10

StrongDMM-2024-11-16 00 30 13

Why It's Good For The Game

This ruin always was a better fit for sandplanet, and now has had a serious touch-up so it better fits with our increasing quality standards.

Changelog

🆑
add: Remapped and moved the Brazillab ruin to Sandplanet.
fix: Fixed the Trabuco's inhand sprites.
/:cl:

@Zevotech Zevotech requested review from FalloutFalcon and a team as code owners September 16, 2024 02:36
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. Code change Watch something violently break. labels Sep 16, 2024
@FalloutFalcon FalloutFalcon added Fix Causes more bugs in the future that we won't know about. Ruin Ruin successfully tested. labels Sep 19, 2024
@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 added Merge Conflict Use Git Hooks, you're welcome. and removed Merge Conflict Use Git Hooks, you're welcome. labels Sep 24, 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 Oct 18, 2024
Copy link
Contributor

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

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Oct 24, 2024
@thgvr
Copy link
Member

thgvr commented Nov 3, 2024

@Zevotech finish this

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Nov 11, 2024
@Zevotech
Copy link
Contributor Author

@Zevotech finish this

yes captain

Copy link
Contributor

@Gristlebee Gristlebee left a comment

Choose a reason for hiding this comment

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

Good removal of old cruft from the ruin.

Though there is an issue of these barricades here exposing all the turfs inside to planetary atmos. You're either gonna need to seal that up or change everything inside to planetary subtypes.
image

Copy link
Contributor

@Gristlebee Gristlebee left a comment

Choose a reason for hiding this comment

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

All the tiles you varedited to have whitesand atmos turned the entire ruin into vacuum and massively lagged out the game.

Please subtype the tiles properly.

@Zevotech
Copy link
Contributor Author

All the tiles you varedited to have whitesand atmos turned the entire ruin into vacuum and massively lagged out the game.

Fun fact! The original ruin had them all varedited to be icemoon atmos. Oh well.

@Gristlebee
Copy link
Contributor

All the tiles you varedited to have whitesand atmos turned the entire ruin into vacuum and massively lagged out the game.

Fun fact! The original ruin had them all varedited to be icemoon atmos. Oh well.

Waugh

@Zevotech
Copy link
Contributor Author

Fixed turfs and changed loot slightly.
Medical locker no longer populates on init.
Added a few spare attachments to the shooting range section, and put a guaranteed hermit SKM in the gun locker and two magazines for it in the ammo locker.
Further changes pending feedback from players.

@Zevotech Zevotech requested a review from Gristlebee November 16, 2024 05:34
@Zevotech
Copy link
Contributor Author

Semi final changes done. pending new review.

@meemofcourse meemofcourse added this pull request to the merge queue Nov 27, 2024
Merged via the queue into shiptest-ss13:master with commit cccb0d1 Nov 27, 2024
16 checks passed
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Dec 27, 2024
… sprites (shiptest-ss13#3375)

<!-- 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
Remaps the Brazillab ruin to fit on whitesands, because on iceplanet all
of the hermits in it would die to the cold and the ruin looked ugly
there anyways.
Also fixes the trabuco's inhands that were apparently broken.
Ruin has been given a serious touchup, but otherwise remains similar to
its iceplanet counterpart.


![image](https://github.com/user-attachments/assets/16517740-302b-499e-b3ee-241bc3685d24)

<details>
<summary>SDMM Pictures</summary>

![StrongDMM-2024-11-16 00 30
10](https://github.com/user-attachments/assets/c0c7ae32-ce94-4f62-b343-e1ba29578d56)

![StrongDMM-2024-11-16 00 30
13](https://github.com/user-attachments/assets/35d0af51-926b-4623-8272-5d7537b9bd76)


</details>

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
This ruin always was a better fit for sandplanet, and now has had a
serious touch-up so it better fits with our increasing quality
standards.
<!-- 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:
add: Remapped and moved the Brazillab ruin to Sandplanet.
fix: Fixed the Trabuco's inhand sprites.
/: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. Fix Causes more bugs in the future that we won't know about. 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.

5 participants