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

Trade Post Remake troi #3367

Merged
merged 19 commits into from
Oct 24, 2024
Merged

Trade Post Remake troi #3367

merged 19 commits into from
Oct 24, 2024

Conversation

Erikafox
Copy link
Contributor

@Erikafox Erikafox commented Sep 15, 2024

About The Pull Request

Remasters the currently removed and unpersoned wasteplanet tradepost map. You have never seen this pr before.
dreamseeker_aqYq8vThLj
StrongDMM-2024-10-17 17 39 28
StrongDMM-2024-10-17 17 40 03

Why It's Good For The Game

A 'new' ruin of decent quality and some more mapgen options should enrich the experience.

Changelog

🆑 Erika Fox
add: An abandoned tradepost has been located in the system. Investigate nearby waste worlds for more information.
add: preburnt flares
/:cl:

@Erikafox Erikafox requested a review from a team as a code owner September 15, 2024 23:29
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. DME Edit Code change Watch something violently break. labels Sep 15, 2024
thgvr
thgvr previously requested changes Sep 16, 2024
Copy link
Member

@thgvr thgvr left a comment

Choose a reason for hiding this comment

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

This PR has far too many unrelated changes

code/datums/mapgen/planetary/WasteGenerator.dm Outdated Show resolved Hide resolved
_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm Outdated Show resolved Hide resolved
code/modules/clothing/outfits/factions/solgov.dm Outdated Show resolved Hide resolved
code/modules/mining/equipment/marker_beacons.dm Outdated Show resolved Hide resolved

//inteq

/obj/effect/mob_spawn/human/corpse/inteq
Copy link
Member

Choose a reason for hiding this comment

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

I don't really want stocked corpses in a ruin like this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

what would you suggest trimming it down to?

"conc_tiles"
))

/turf/open/floor/concrete/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
Copy link
Member

Choose a reason for hiding this comment

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

why is specifically wasteplanet concreate not slippery

Copy link
Contributor Author

Choose a reason for hiding this comment

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

wasteplanets can spawn with water vapor in the atmosphere (unless this has been changed. I did not check), and having a biome turn into a giant slip and slide doesn't sound like an engaging gameplay experience.

@Erikafox Erikafox requested a review from thgvr September 16, 2024 18:52
@FalloutFalcon FalloutFalcon added the Ruin Ruin successfully tested. label Sep 20, 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 removed the Merge Conflict Use Git Hooks, you're welcome. label Sep 20, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Sep 23, 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 Sep 23, 2024
Copy link
Contributor

@meemofcourse meemofcourse left a comment

Choose a reason for hiding this comment

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

imagen
no

imagen
tone down the engi gear ok thanks

i don't know how i feel about corpses with inteq gear but that's not a concern for this pr

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Sep 29, 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 1, 2024
@meemofcourse
Copy link
Contributor

hey can you fix your checks

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 16, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Oct 16, 2024
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.

Feedback after testing on live:

The main office building is exposed to the waste planet atmos. Either give it a proper door or replace the tiles inside with tile subtypes with planet atmos.
image
There's not really much in these rooms to justify them being bolted, and consequently being worth the effort to break inside. I feel it would good to add some kind of minor loot or money in the office.
image
The paths are fairly plain looking. I think they would benefit from some decals or siding.
image
There's a normal NT Commander here instead of an Inteq Commissioner here. You can cut this one since there's already two other commissioners to loot.
image
.

I'd suggest swapping the position of the mongrel with one of the commissioners. From a flavor standpoint it makes more sense for it be near it's mags, and players have to go through a bit more effort to get the stronger gun.

Players had some confusion on whether the Tradepost was fully Inteq owned. If they were contracted, I think it would be good to add some civilian corpses around the base.

The outer area of the ruin is very dark for what was supposed to be an inhabited area. There's only a single broken floodlight for what would have been a cargo port. I'd suggest scattering around some more broken or maybe even a few working lights on the exterior of the buildings.

As for the Inteq corpses, you could make a subtype of the outfits for use in the ruin with some of their gear cut. The main concerns to me are the corpsman and the vanguard. The corpsman comes with a loaded webbing, so you can either cut it or give them an empty one. Cut the gear from the Vanguard corpse's pockets, and the telebaton in their backpack.

@Erikafox
Copy link
Contributor Author

addressed review (aside from the roads. idk how to get a nice decal pattern on those and think that the plain is somewhat alright)

@Gristlebee Gristlebee dismissed stale reviews from meemofcourse and thgvr October 23, 2024 23:59

Outdated, gear has been cut down.

@Gristlebee Gristlebee added this pull request to the merge queue Oct 24, 2024
Merged via the queue into shiptest-ss13:master with commit 0354553 Oct 24, 2024
14 checks passed
zimon9 pushed a commit to zimon9/Shiptest-PR-testing that referenced this pull request Oct 29, 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. -->

## About The Pull Request
Remasters the currently removed and unpersoned wasteplanet tradepost
map. You have never seen this pr before.

![dreamseeker_aqYq8vThLj](https://github.com/user-attachments/assets/2b3ae689-252a-474a-abe2-bf5a8afbce15)
![StrongDMM-2024-10-17 17 39
28](https://github.com/user-attachments/assets/940321b0-c2b4-4f5c-af96-e093230e679f)
![StrongDMM-2024-10-17 17 40
03](https://github.com/user-attachments/assets/f52f8596-e3b0-4930-bce0-994147f0a1ca)


<!-- 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
A 'new' ruin of decent quality and some more mapgen options should
enrich the experience.
<!-- 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: Erika Fox
add: An abandoned tradepost has been located in the system. Investigate
nearby waste worlds for more information.
add: preburnt flares
/: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: Erika Fox <[email protected]>
Signed-off-by: Erika Fox <[email protected]>
Co-authored-by: Erika Fox <[email protected]>
zimon9 pushed a commit to zimon9/Shiptest-PR-testing that referenced this pull request Oct 29, 2024
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Dec 27, 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. -->

## About The Pull Request
Remasters the currently removed and unpersoned wasteplanet tradepost
map. You have never seen this pr before.

![dreamseeker_aqYq8vThLj](https://github.com/user-attachments/assets/2b3ae689-252a-474a-abe2-bf5a8afbce15)
![StrongDMM-2024-10-17 17 39
28](https://github.com/user-attachments/assets/940321b0-c2b4-4f5c-af96-e093230e679f)
![StrongDMM-2024-10-17 17 40
03](https://github.com/user-attachments/assets/f52f8596-e3b0-4930-bce0-994147f0a1ca)


<!-- 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
A 'new' ruin of decent quality and some more mapgen options should
enrich the experience.
<!-- 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: Erika Fox
add: An abandoned tradepost has been located in the system. Investigate
nearby waste worlds for more information.
add: preburnt flares
/: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: Erika Fox <[email protected]>
Signed-off-by: Erika Fox <[email protected]>
Co-authored-by: Erika Fox <[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. DME Edit 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