-
-
Notifications
You must be signed in to change notification settings - Fork 538
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
The Wrecked Factory Ruin #2943
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Jun 2, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Jun 2, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Jun 3, 2024
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Sigh. Sometimes you just gotta do it yourself. |
shiptest-server
pushed a commit
that referenced
this pull request
Jun 12, 2024
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. -->
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
The map (updated) (again) (now with 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: