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

The Wrecked Factory Ruin #2943

Merged
merged 71 commits into from
Jun 12, 2024
Merged

The Wrecked Factory Ruin #2943

merged 71 commits into from
Jun 12, 2024

Conversation

Gristlebee
Copy link
Contributor

@Gristlebee Gristlebee commented Apr 28, 2024

About The Pull Request

The map (updated) (again) (now with buttons)

image

image

factory buttons

This PR adds a new Lavaland ruin themed around Ramzi pirates raiding a Nanotrasen factory. Also adds indestructible titanium walls, and lavaland atmos subtype tiles for plating, rusted plating, concrete, white and dark tiles for use in the ruin.

Increases the max safe temperature for the space syndicate simple mobs from 350 to 400. Turns out lavaland atmos can spawn hot enough they just start dying.

The wall locker mapping helper caught some extra lockers on the Aegis, so I guess that's in here too.

Why It's Good For The Game

New ruins are good and hopefully this is a good ruin

Changelog

🆑
add: Wrecked Factory ruin
add: Indestructible titanium walls
add: Lavaland atmos subtypes for plating, rusted plating, concrete, white and dark turfs
balance: Syndicate Space Simple Mobs have their max temp increased
tweak: Wall_lockers updatepaths on the Aegis
code: Adds ruin to map_catalogue,txt, lavaland.dm and adds it to lavaland.dm areas
/:cl:

@Gristlebee Gristlebee requested a review from a team as a code owner April 28, 2024 07:49
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. Code change Watch something violently break. labels Apr 28, 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 May 28, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label May 28, 2024
@FalloutFalcon FalloutFalcon added the Test Merged They've done it for free. label May 28, 2024
@rye-rice rye-rice added this pull request to the merge queue Jun 2, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 2, 2024
@rye-rice rye-rice added this pull request to the merge queue Jun 2, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 2, 2024
@rye-rice rye-rice added this pull request to the merge queue Jun 3, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 3, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jun 6, 2024
Copy link
Contributor

github-actions bot commented Jun 6, 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 Jun 6, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jun 9, 2024
Copy link
Contributor

github-actions bot commented Jun 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 Jun 9, 2024
@Imaginos16
Copy link
Member

Sigh. Sometimes you just gotta do it yourself.

@Imaginos16 Imaginos16 added this pull request to the merge queue Jun 12, 2024
Merged via the queue into shiptest-ss13:master with commit 494681f Jun 12, 2024
14 checks passed
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Jun 22, 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. -->

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

<details>
<summary>The map (updated) (again) (now with buttons)</summary>
<br>

![image](https://github.com/shiptest-ss13/Shiptest/assets/56049844/afe48b8c-2efd-4729-ac8b-d604b4d20b32)

![image](https://github.com/shiptest-ss13/Shiptest/assets/56049844/6d72f370-b9cf-4c31-9fee-ce08c531dda7)

![factory
buttons](https://github.com/shiptest-ss13/Shiptest/assets/56049844/bf5bb601-62b4-4cba-9fc1-0ecc11ef9413)

</details>

This PR adds a new Lavaland ruin themed around Ramzi pirates raiding a
Nanotrasen factory. Also adds indestructible titanium walls, and
lavaland atmos subtype tiles for plating, rusted plating, concrete,
white and dark tiles for use in the ruin.

Increases the max safe temperature for the space syndicate simple mobs
from 350 to 400. Turns out lavaland atmos can spawn hot enough they just
start dying.

The wall locker mapping helper caught some extra lockers on the Aegis,
so I guess that's in here too.

<!-- 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. -->

New ruins are good and hopefully this is a good ruin

:cl:
add: Wrecked Factory ruin
add: Indestructible titanium walls
add: Lavaland atmos subtypes for plating, rusted plating, concrete,
white and dark turfs
balance: Syndicate Space Simple Mobs have their max temp increased
tweak: Wall_lockers updatepaths on the Aegis
code: Adds ruin to map_catalogue,txt, lavaland.dm and adds it to
lavaland.dm areas
/: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. -->
@Gristlebee Gristlebee deleted the Factoly branch July 3, 2024 06:45
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. Test Merged They've done it for free.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants