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

[Port] Adds crate shelves to the game #11229

Merged
merged 10 commits into from
Sep 13, 2024

Conversation

XeonMations
Copy link
Contributor

@XeonMations XeonMations commented Jul 24, 2024

About The Pull Request

Adds crate shelves to the game, craftable from an iron sheet.

Ported from Shiptest's GenericDM's #2374 PR

Updated crate shelf sprite from @MarkusLarsson421
Updated crate shelf parts sprite from @ClownMoff

To do:

  • Give crate shelves a custom sprite
  • Give the crate shelf parts a custom sprite

Why It's Good For The Game

Gives crates a third dimension to go, allowing them to be stacked is good for cargo's crate supply.

Testing Photographs and Procedure

Screenshots&Videos

image

2024-07-24.19-30-33.mp4

Changelog

🆑 Generic DM, PositiveEntropy, Markus Larsson, ClownMoff, XeonMations
add: Added crate shelves to the game!
/:cl:

Copy link

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

@XeonMations XeonMations marked this pull request as ready for review August 6, 2024 23:16
@Rukofamicom
Copy link
Contributor

Rukofamicom commented Aug 8, 2024

Why don't the crates stack neatly like they do in the shiptest PR? This just looks very janky because it doesn't actually stack the crate sprites in any way.

The tops of the crates should be covered by the empty shelf or crate above them.

Reference images for those who don't want to compare:

This is shiptest:
image

This is what this PR does:
image

@XeonMations XeonMations closed this Sep 8, 2024
@XeonMations XeonMations reopened this Sep 8, 2024
@Rukofamicom
Copy link
Contributor

Failing new checks

You'll need to define the DEFAULT_SHELF variables in a different file, or #UNDEFINE them at the end of the file.

Comment on lines 117 to 118
if(get_dist(drop_atom, src) != 1 || get_dist(drop_atom, user) != 1)
return // Check whether the crate is exactly 1 tile from the shelf and the user.
Copy link
Member

Choose a reason for hiding this comment

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

Check to see if the crate is next to the user, rather than if the crate is next to the shelf so that you can drag a crate onto a shelf when it is behind you and not adjacent to the shelf.

@XeonMations
Copy link
Contributor Author

2024-09-11.16-26-36.mp4

@PowerfulBacon PowerfulBacon added this pull request to the merge queue Sep 13, 2024
Merged via the queue into BeeStation:master with commit 95aaa44 Sep 13, 2024
21 checks passed
@XeonMations XeonMations deleted the crate-shelves branch September 21, 2024 05:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants