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

a bedtime update for beddy-bye boys (Bunk beds!) #3345

Merged
merged 4 commits into from
Oct 1, 2024

Conversation

tmtmtl30
Copy link
Contributor

@tmtmtl30 tmtmtl30 commented Sep 9, 2024

About The Pull Request

Adds bunk beds, in the form of two objects, a "bottom bunk" structure and a "top bunk" structure, each with appropriate layering and sprite-shifting, including for bedsheets. Sprites are courtesy of @thgvr . They can be crafted with metal or placed by mappers as a single object using a spawner effect.

Additionally, beds, double beds, and bunk beds have had their alternate-direction behavior fixed. These beds have a flipped set of sprites on the NORTH and EAST directions, but neither bedsheets nor buckled players correctly respected the alternate sprites. This has been fixed.

oh also i fixed a random rendering error with tank storage units that imaginos notified me of. they weren't showing the final 5-tank overlay state correctly. they do now

image

Why It's Good For The Game

  1. bunkbeds give mappers another tool to make ships and ruins feel appropriately-decorated
  2. mappers being effectively locked to a single bed rotation is dumb
    currently, there's one bug: when crafting a bunk bed, you need to make the bottom one first. if you make the top one first, you won't be able to place the bottom bunk there without just deconstructing the top bunk. i know exactly what causes this, it's mostly just annoying and i've got a few ideas for (slightly hacky) fixes. but i'm also lazy

Changelog

🆑 tmtmtl30, Thgvr
add: Added bunkbeds, which can now be crafted with metal or placed by mappers.
fix: Beds facing alternate directions now correctly support people buckling to them and bedsheets being placed on top of them.
/:cl:

- adds bunk beds, with correct layering, incl. with sheets
- these bunk beds can be crafted using the new "beds" metal crafting category
- fixes beds facing NORTH or EAST having a laying dir that doesn't match the sprite
- fixes laying bedsheets on such beds not moving the sheets to match the pillow
- also fixes tank dispensers not rendering right
- currently only one bug: you need to construct the bottom bunk first to construct two bunks on top of each other. the top cannot be made first
@tmtmtl30 tmtmtl30 requested a review from a team as a code owner September 9, 2024 12:13
@github-actions github-actions bot added Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Sep 9, 2024
//Dog bed

/*
* "Dog" beds
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 like those quotes.....

Copy link
Member

@FalloutFalcon FalloutFalcon left a comment

Choose a reason for hiding this comment

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

Very charming. Unsure if this requires test merge..

@thgvr thgvr added this pull request to the merge queue Sep 25, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 25, 2024
@FalloutFalcon FalloutFalcon added this pull request to the merge queue Sep 30, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 30, 2024
@thgvr thgvr added this pull request to the merge queue Oct 1, 2024
Merged via the queue into shiptest-ss13:master with commit 180c9b2 Oct 1, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Oct 6, 2024
## About The Pull Request

Adds bunk beds, in the form of two objects, a "bottom bunk" structure
and a "top bunk" structure, each with appropriate layering and
sprite-shifting, including for bedsheets. Sprites are courtesy of @thgvr
. They can be crafted with metal or placed by mappers as a single object
using a spawner effect.

Additionally, beds, double beds, and bunk beds have had their
alternate-direction behavior fixed. These beds have a flipped set of
sprites on the NORTH and EAST directions, but neither bedsheets nor
buckled players correctly respected the alternate sprites. This has been
fixed.

oh also i fixed a random rendering error with tank storage units that
imaginos notified me of. they weren't showing the final 5-tank overlay
state correctly. they do now


![image](https://github.com/user-attachments/assets/bbebeb5e-27db-4703-a7db-c639b8ec1502)

## Why It's Good For The Game

1. bunkbeds give mappers another tool to make ships and ruins feel
appropriately-decorated
2. mappers being effectively locked to a single bed rotation is dumb
currently, there's one bug: when crafting a bunk bed, you need to make
the bottom one first. if you make the top one first, you won't be able
to place the bottom bunk there without just deconstructing the top bunk.
i know exactly what causes this, it's mostly just annoying and i've got
a few ideas for (slightly hacky) fixes. but i'm also lazy

## Changelog

:cl: tmtmtl30, Thgvr
add: Added bunkbeds, which can now be crafted with metal or placed by
mappers.
fix: Beds facing alternate directions now correctly support people
buckling to them and bedsheets being placed on top of them.
/:cl:
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. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants