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

Adds a crashed pubby as a sand world ruin #2363

Merged
merged 22 commits into from
Dec 16, 2023

Conversation

immortalartisan
Copy link
Contributor

@immortalartisan immortalartisan commented Sep 19, 2023

About The Pull Request

Adds a new pubby crash map along with the requisite area and ruin codes

Why It's Good For The Game

It adds another ruin... this is a good thing

Changelog

๐Ÿ†‘ Immortalartisan
add: A new sandworld ruin based on deprecated ship pubby
/:cl:

pubby in game light dark
SDMM view with areas
image_2023-11-10_094953863

@immortalartisan immortalartisan requested a review from a team as a code owner September 19, 2023 03:43
@github-actions github-actions bot added Config Watch us shake head admins violently until this gets merged. Map Change Tile placing is hard. Thank you for your service. Code change Watch something violently break. labels Sep 19, 2023
@immortalartisan
Copy link
Contributor Author

Fixed all conflicts awaiting review by a maptainer

Copy link
Contributor

@spockye spockye left a comment

Choose a reason for hiding this comment

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

image

light on locker

image

unrotated button. mabye make things a bit more thrown about in the ship, instead of being on tables? would give it a more unkept feel

image

light on apc

image

light on locker, light on newscaster

image

light on airalarm

image

ruin has 6 apc's, yet one area! this will cause bugs. (remove all but one apc)

image

Remove the autosurgeon. while it's a cool item, its a tad too good for the challenge this ruin poses. (shouldn't really be used at all, anywhere)


good work!

@immortalartisan
Copy link
Contributor Author

Changes made awaiting review again

@Zevotech
Copy link
Contributor

image
Mysterious area/space. If its not there on your end feel free to ignore this.

@Zevotech
Copy link
Contributor

image
Don't use micro electric engine precharger boards, use the normal ones. The micro ones are used only on the Pill and have a density of 0 (bad).

@Zevotech
Copy link
Contributor

image
Floating firealarm

Copy link
Member

@goober3 goober3 left a comment

Choose a reason for hiding this comment

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

image
please beef up these rocks around the corners a little. one-wide mountains will look odd -- and reveal structures behind them, as they do not blend with walls.

image
replace these sand turfs with /lit variants -- or replace them with rock turfs, if you want to make this look like a cave.

good job! we'll get this test merged soon.

@immortalartisan
Copy link
Contributor Author

Requested changes made this pull request is ready to be merged once the tests are run then correct?

@goober3
Copy link
Member

goober3 commented Sep 26, 2023

essentially, yes.

@immortalartisan
Copy link
Contributor Author

Checks are all green time to test!

@Zevotech
Copy link
Contributor

There are still podlocks and blast doors under the rocks in the pod bay area.

Copy link
Contributor

@spockye spockye left a comment

Choose a reason for hiding this comment

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

what Zevo said. i'll Merge once you fix it

config/sandruinblacklist.txt Outdated Show resolved Hide resolved
@Latentish
Copy link
Member

Please add a screenshot from SDMM with the areas on.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Oct 31, 2023
Copy link
Contributor

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

@spockye
Copy link
Contributor

spockye commented Nov 7, 2023

fix the conflict, and i'll see about merging this!

@immortalartisan
Copy link
Contributor Author

Please add a screenshot from SDMM with the areas on.

Screen shot added to PR

@github-actions github-actions bot removed Merge Conflict Use Git Hooks, you're welcome. Config Watch us shake head admins violently until this gets merged. labels Nov 10, 2023
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
take a look at the rest of our crash maps and see how they handle crashes. Usually you can see that they landed, pushing up a crater, as opposed to being entombed in rock.

Once you do that, you can scatter some more debris around and create more of an "impact" in your story.

The base idea is sound, if not exciting. Not every ruin needs to be some world shattering revelation though, so I happen to like this.

@goober3
Copy link
Member

goober3 commented Dec 16, 2023

I have a few more nitpicks on this, but seeing as this has been open since september. marged.

@goober3 goober3 enabled auto-merge December 16, 2023 20:27
@goober3 goober3 added this pull request to the merge queue Dec 16, 2023
Merged via the queue into shiptest-ss13:master with commit 49859dd Dec 16, 2023
14 checks passed
@goober3 goober3 mentioned this pull request Dec 17, 2023
MysticalFaceLesS added a commit to CeladonSS13/Shiptest that referenced this pull request Dec 17, 2023
github-merge-queue bot pushed a commit that referenced this pull request Feb 10, 2024
## About The Pull Request
As per the request of @Latentish 

This PR tweaks the recently merged (#2363) Crashed Pubby Ruin. The shape
of the crash area should now be more realistic. Several issues have been
fixed, as well.


![image](https://github.com/shiptest-ss13/Shiptest/assets/118859017/4dc076fe-8dce-4ab5-a37e-c201ee5e77d2)

![9cbdcebcc92d3e5d3a96e44677e129bf](https://github.com/shiptest-ss13/Shiptest/assets/118859017/9b6d7ad7-bf15-44a1-9008-4ce6ce08a3bc)

![image](https://github.com/shiptest-ss13/Shiptest/assets/118859017/d5732f90-f242-41f4-b5e7-e58b10dc5e08)


## Why It's Good For The Game

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

๐Ÿ†‘
tweak: The Crashed Pubby Ruin has been tweaked slightly.
fix: Fixed a floating wallmount in the Crashed Pubby Ruin.
/๐Ÿ†‘
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Feb 11, 2024
## About The Pull Request
As per the request of @Latentish 

This PR tweaks the recently merged (shiptest-ss13#2363) Crashed Pubby Ruin. The shape
of the crash area should now be more realistic. Several issues have been
fixed, as well.


![image](https://github.com/shiptest-ss13/Shiptest/assets/118859017/4dc076fe-8dce-4ab5-a37e-c201ee5e77d2)

![9cbdcebcc92d3e5d3a96e44677e129bf](https://github.com/shiptest-ss13/Shiptest/assets/118859017/9b6d7ad7-bf15-44a1-9008-4ce6ce08a3bc)

![image](https://github.com/shiptest-ss13/Shiptest/assets/118859017/d5732f90-f242-41f4-b5e7-e58b10dc5e08)


## Why It's Good For The Game

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

๐Ÿ†‘
tweak: The Crashed Pubby Ruin has been tweaked slightly.
fix: Fixed a floating wallmount in the Crashed Pubby Ruin.
/๐Ÿ†‘
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants