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 bunch of material to the pred ship and slightly adjusts layout to compensate. #6172

Merged
merged 7 commits into from
May 5, 2024

Conversation

s5nt
Copy link
Contributor

@s5nt s5nt commented Apr 20, 2024

About the pull request

Adds a bunch of material to the pred ship including more runed sandstone, normal sandstone, more metal, along with new items that spawn in pred storage which are stacks of wood, stacks of carpet tile, candle boxes, desk lamps, lanterns, gambling table parts, fancy wooden table parts, wooden table parts, poor wooden table parts, etc. Also adds more pred specific food to the pred kitchen for lodge decoration.
Slightly adjusts pred ship layout to compensate, moving bracer storage to the other side to accommodate more racks for materials. Screenshot attached.

Explain why it's good for the game

Allows preds to build larger and more impressive lodges (barely anybody builds lodges anyways), which provides more opportunity for RP and fun marine/xeno interactions with lodges rather than them just blowing into a room with a C4 and that being the entire lodge. Pred WL is self regulating in terms of stupidly/obstructively large lodges via pred council, obstructive lodges are essentially never an issue anyway.

Testing Photographs and Procedure

Screenshots & Videos

image

Changelog

🆑
add: Added more materials to pred ship including more sandstone, wood, table parts, etc for lodge construction, along with more pred specific food to the pred kitchen.
maptweak: Slightly expanded pred ship material storage area by moving bracer storage over to the left side of the ship.
/:cl:

@s5nt s5nt requested a review from Nanu308 as a code owner April 20, 2024 04:36
@github-actions github-actions bot added Mapping did you remember to save in tgm format? Feature Feature coder badge labels Apr 20, 2024
@s5nt
Copy link
Contributor Author

s5nt commented Apr 20, 2024

Not a very experienced mapper and I'm not sure what I'm meant to do about the "Some checks were not successful", it's like the xbox red ring of death.

@Drulikar
Copy link
Contributor

Not a very experienced mapper and I'm not sure what I'm meant to do about the "Some checks were not successful", it's like the xbox red ring of death.

They were caused by you interrupting already running checks with a merge commit and github being janky about ordering for actions.

maps/predship/huntership.dmm Outdated Show resolved Hide resolved
@Nanu308 Nanu308 marked this pull request as draft May 1, 2024 17:02
@s5nt s5nt marked this pull request as ready for review May 2, 2024 09:35
Copy link
Member

@Nanu308 Nanu308 left a comment

Choose a reason for hiding this comment

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

mapping lgtm

@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label May 5, 2024
@Nanu308 Nanu308 added this pull request to the merge queue May 5, 2024
Merged via the queue into cmss13-devs:master with commit 950df00 May 5, 2024
26 checks passed
cm13-github added a commit that referenced this pull request May 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format?
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants