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 the Nomad crash site to the rockplanet #2384

Merged
merged 20 commits into from
Oct 31, 2023
Merged

Conversation

Zytolg
Copy link
Contributor

@Zytolg Zytolg commented Sep 30, 2023

Is the nomad a ship or a faction? I'll leave it to the lore junkies to decide down the line.

About The Pull Request

Adds the Nomad Wreck to the ruin lineup of the Rock Planet.

CrashedShiphehe

Also repaths area/mine/rockplanet to area/ruin/rockplanet. The areas in this file weren't even being used so I might go back and actually make all the rockplanet ruin areas use this file later. All rockplanet ruins bar this new one currently use area/ruin/powered and area/overmap_encounter/planetoid/rockplanet for their areas. Using the default case of ruin/powered for all of your ruins isn't good practice.

Finally adds a new ship manufacturer decal. I've been illegally having fun brainstorming up an entire new lineup of ships. Furthermore, they = have garnered positive feedback from project managers in the official discord, so I'm confident in doing this here. This ruin is the first in a series of ruin addition that feature these vessels in an unflyable state. Be they wrecks, conversions, legitimate salvage, or otherwise. Introducing Arrow & Axe and their Dockyard subdivision. Hopefully a striking addition to the Shiptest universe!

More Arrow More Axe

I have been mapping for Shiptest all week, and my head is still full of a great deal many ideas! This is only the start so be on the lookout for more!

Shoutout to @Imaginos16 for actually spriting out the crappy MSPAINT rendition of the logo. Excellent work as always!

Why It's Good For The Game

-Ruins are requested, so ruins shall be received.
-New 7th ship manufacturer to add even more diversity to the game. This one is Military, so expect even more Spartan Vessels.
---Hammerhead vessel design, Flat-Bow profiles. Prominent nacelles and fishtale sterns. Interiors are asym. and biased port or stbd. (You'll see a complete one that's been converted into a salvage depot for my next PR).
-New Ship manufacturer decal courtesy of @Imaginos16 to really drive that home.
-Repathing the rockplanet.dmm areas out from under ../mine (and they were unused!) into ../ruin to bring it in line with everything else.

Changelog

🆑
add: New Rockplanet Ruin
add: New ship manufacturer sprites.
code: Repaths areas in rockplanet.dmm to be in line with other ruins. Starts using rockplanet.dmm.
code: Code support for Arrow & Axe Dockyard sprites.
/:cl:

@Zytolg Zytolg requested review from a team as code owners September 30, 2023 04:38
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Sep 30, 2023
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

These are OBJ stairs, not turf stairs. they're used for Multi-z, and dont worm normally.

image

get what your going for, but im not sure it's such a good idea. i'll come back to you on this later.

image

WE HAVE PEBBLES?

image

(ULTRA NITPICK) Missing corner decal :)

image

mabye make a couple of the walls Rusted? just to spice it up

image

try to not leave corners like this. looks a bit off with out walls


this is a pretty ruin. good work!

@Zytolg Zytolg requested a review from spockye October 5, 2023 17:28
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.

i'll give this a TM next uptime. if everythings fine i'll merge

(shout at me if i forget- actually just shout at me before next uptime)

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

dont do this. it doesnt work!
everything reverts back to the original icon state on loading.

Copy link
Member

@Latentish Latentish left a comment

Choose a reason for hiding this comment

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

You need to add this ruin to the RuinCatalogue

@Latentish
Copy link
Member

Ruin does look cool though.

@spockye spockye enabled auto-merge October 31, 2023 12:58
@spockye spockye added this pull request to the merge queue Oct 31, 2023
Merged via the queue into shiptest-ss13:master with commit 99b901b Oct 31, 2023
10 checks passed
Mirag1993 added a commit to ancientland/TestShiptest that referenced this pull request Oct 31, 2023
Is the nomad a ship or a faction? I'll leave it to the lore junkies to
decide down the line.

Adds the Nomad Wreck to the ruin lineup of the Rock Planet.

![CrashedShiphehe](https://github.com/shiptest-ss13/Shiptest/assets/33048583/a88ff1bb-ea97-45f1-889c-22567b46bc4c)

Also repaths area/mine/rockplanet to area/ruin/rockplanet. The areas in
this file weren't even being used so I might go back and actually make
all the rockplanet ruin areas use this file later. All rockplanet ruins
bar this new one currently use area/ruin/powered and
area/overmap_encounter/planetoid/rockplanet for their areas. Using the
default case of ruin/powered for all of your ruins isn't good practice.

Finally adds a new ship manufacturer decal. I've been _illegally_ having
fun brainstorming up an entire new lineup of ships. Furthermore, they =
have garnered positive feedback from project managers in the official
discord, so I'm confident in doing this here. This ruin is the first in
a series of ruin addition that feature these vessels in an unflyable
state. Be they wrecks, conversions, legitimate salvage, or otherwise.
Introducing **Arrow & Axe** and their Dockyard subdivision. Hopefully a
striking addition to the Shiptest universe!

![More Arrow More
Axe](https://github.com/shiptest-ss13/Shiptest/assets/33048583/9bed611e-3a16-49cd-8f18-8b1ffa50d672)

I have been mapping for Shiptest all week, and my head is still full of
a great deal many ideas! This is only the start so be on the lookout for
more!

Shoutout to @Imaginos16 for actually spriting out the crappy MSPAINT
rendition of the logo. Excellent work as always!

-Ruins are requested, so ruins shall be received.
-New 7th ship manufacturer to add even more diversity to the game. This
one is Military, so expect even more Spartan Vessels.
---Hammerhead vessel design, Flat-Bow profiles. Prominent nacelles and
fishtale sterns. Interiors are asym. and biased port or stbd. (You'll
see a complete one that's been converted into a salvage depot for my
next PR).
-New Ship manufacturer decal courtesy of @Imaginos16 to really drive
that home.
-Repathing the rockplanet.dmm areas out from under ../mine (and they
were unused!) into ../ruin to bring it in line with everything else.

:cl:
add: New Rockplanet Ruin
add: New ship manufacturer sprites.
code: Repaths areas in rockplanet.dmm to be in line with other ruins.
Starts using rockplanet.dmm.
code: Code support for Arrow & Axe Dockyard 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: spockye <[email protected]>
Co-authored-by: spockye <[email protected]>
github-merge-queue bot pushed a commit that referenced this pull request Feb 28, 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. -->
## 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](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]>
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. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants