[FEAT] Pool decorations - #131
Open
portfiend wants to merge 10 commits into
Open
Conversation
… and Pool Water (#2071) <!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline --> <!-- NOTE: All code submitted to this repository is ALWAYS licensed under the AGPL-3.0-or-later license. The REUSE Specification headers or separate .license files indicate a secondary license (e.g., MPL or MIT) solely to facilitate integration for projects that do not use the AGPL license. This secondary license does not replace the fact that AGPL-3.0-or-later remains the primary and binding license. Uncomment and modify the following line if you wish to change the license from the default of AGPL.--> <!--- LICENSE: AGPL --> <!-- What did you change? --> This PR adds a bunch of, well, mapper toys basically, but normal players can obtain them too. They are: - Pool tile and dark pool tile; obtainable via the cutter machine. - Pool water; unobtainable without mapping/admin tools, but it's 1% chlorine. - Lounge chairs, constructed with steel and cloth. Deconstructible with a screwdriver. - Beach umbrellas, constructed with rods and cloth. Deconstructible with a screwdriver. - Swim rings, which can be ordered from Logistics. They're sort of like the emergency comfort units (pillows), but they're inflatable rings and you can pick them up. <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. --> These assets are needed for an upcoming map I'm making and I'm giving them to the community early out of the kindness of my heart <!-- Summary of code changes for easier review. --> All YML and sprites babyyy - Entity prototypes for chairs, umbrellas, pool water, swim rings, and the pool tile stack items - Some construction graphs - A cargo product - A floor definition - Recipes for the tile cutter Pool water IS drinkable because it's extremely funny. Keep in mind that 50u of pool water will only give you like 2 poison damage <!-- Attach media if the PR makes ingame changes (clothing, items, features, etc). Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. --> Preview of the stuff: <img width="713" height="541" alt="image" src="https://github.com/user-attachments/assets/42f1acc8-cc83-4356-a8e0-3c715245d120" /> <img width="697" height="666" alt="image" src="https://github.com/user-attachments/assets/8597017a-9d03-4419-80c5-cf475f3206d1" /> sorry i forgot the pink ring <img width="253" height="179" alt="image" src="https://github.com/user-attachments/assets/7f738f8e-42b4-4ee4-aa75-9f08b67ded0c" /> sorry i forgot the white chair <img width="206" height="140" alt="image" src="https://github.com/user-attachments/assets/6fabe541-4821-4e88-8d64-a99f463c5253" /> Cargo: <img width="633" height="461" alt="image" src="https://github.com/user-attachments/assets/b8ae9b89-4d2f-4326-9814-d000d5e88809" /> Crafting menu: <img width="266" height="454" alt="image" src="https://github.com/user-attachments/assets/cc480ee6-0e0d-4055-93c3-e5a1c4e0687c" /> <img width="409" height="211" alt="image" src="https://github.com/user-attachments/assets/41970a43-1ba8-4898-a96c-deb87a05a409" /> <img width="409" height="211" alt="image" src="https://github.com/user-attachments/assets/ffc00874-e330-49eb-8aba-972c6d223a3a" /> Pool water: <img width="680" height="463" alt="image" src="https://github.com/user-attachments/assets/9abc48b0-8358-46de-89ef-41fc64989787" /> <!-- Confirm the following by placing an X in the brackets [X]: --> - [x] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). - [x] I have added media to this PR or it does not require an ingame showcase. - [x] I have tested any changes or additions. - [x] I can confirm this PR contains no AI-generated content, and did not use any AI-generated content. <!-- You should understand that not following the above may get your PR closed at maintainer’s discretion --> <!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be posted in #codebase-changes. --> Nope **Changelog** <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay. Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up. Changelog must have a 🆑 symbol, so the bot recognizes the changes and adds them to the game's changelog. --> 🆑 - add: 13 colors of lounge chairs can be constructed out of steel and cloth. - add: 8 colors of beach umbrellas can be constructed out of rods and cloth. - add: Pool tile (and dark pool tile) can be produced at the cutter machine. - add: Logistics can now order a crate of bulk swim rings, in 11 possible colors! - add: For mappers (and admins): there is a new "pool water" entity that is a nice green-cyan color and contains about 1% chlorine. --------- Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
…ater (#6113) * Pool-Themed Decorations: Lounge Chairs, Umbrellas, Tiles, Swim Rings, and Pool Water (#2071) <!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline --> <!-- NOTE: All code submitted to this repository is ALWAYS licensed under the AGPL-3.0-or-later license. The REUSE Specification headers or separate .license files indicate a secondary license (e.g., MPL or MIT) solely to facilitate integration for projects that do not use the AGPL license. This secondary license does not replace the fact that AGPL-3.0-or-later remains the primary and binding license. Uncomment and modify the following line if you wish to change the license from the default of AGPL.--> <!--- LICENSE: AGPL --> <!-- What did you change? --> This PR adds a bunch of, well, mapper toys basically, but normal players can obtain them too. They are: - Pool tile and dark pool tile; obtainable via the cutter machine. - Pool water; unobtainable without mapping/admin tools, but it's 1% chlorine. - Lounge chairs, constructed with steel and cloth. Deconstructible with a screwdriver. - Beach umbrellas, constructed with rods and cloth. Deconstructible with a screwdriver. - Swim rings, which can be ordered from Logistics. They're sort of like the emergency comfort units (pillows), but they're inflatable rings and you can pick them up. <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. --> These assets are needed for an upcoming map I'm making and I'm giving them to the community early out of the kindness of my heart <!-- Summary of code changes for easier review. --> All YML and sprites babyyy - Entity prototypes for chairs, umbrellas, pool water, swim rings, and the pool tile stack items - Some construction graphs - A cargo product - A floor definition - Recipes for the tile cutter Pool water IS drinkable because it's extremely funny. Keep in mind that 50u of pool water will only give you like 2 poison damage <!-- Attach media if the PR makes ingame changes (clothing, items, features, etc). Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. --> Preview of the stuff: <img width="713" height="541" alt="image" src="https://github.com/user-attachments/assets/42f1acc8-cc83-4356-a8e0-3c715245d120" /> <img width="697" height="666" alt="image" src="https://github.com/user-attachments/assets/8597017a-9d03-4419-80c5-cf475f3206d1" /> sorry i forgot the pink ring <img width="253" height="179" alt="image" src="https://github.com/user-attachments/assets/7f738f8e-42b4-4ee4-aa75-9f08b67ded0c" /> sorry i forgot the white chair <img width="206" height="140" alt="image" src="https://github.com/user-attachments/assets/6fabe541-4821-4e88-8d64-a99f463c5253" /> Cargo: <img width="633" height="461" alt="image" src="https://github.com/user-attachments/assets/b8ae9b89-4d2f-4326-9814-d000d5e88809" /> Crafting menu: <img width="266" height="454" alt="image" src="https://github.com/user-attachments/assets/cc480ee6-0e0d-4055-93c3-e5a1c4e0687c" /> <img width="409" height="211" alt="image" src="https://github.com/user-attachments/assets/41970a43-1ba8-4898-a96c-deb87a05a409" /> <img width="409" height="211" alt="image" src="https://github.com/user-attachments/assets/ffc00874-e330-49eb-8aba-972c6d223a3a" /> Pool water: <img width="680" height="463" alt="image" src="https://github.com/user-attachments/assets/9abc48b0-8358-46de-89ef-41fc64989787" /> <!-- Confirm the following by placing an X in the brackets [X]: --> - [x] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). - [x] I have added media to this PR or it does not require an ingame showcase. - [x] I have tested any changes or additions. - [x] I can confirm this PR contains no AI-generated content, and did not use any AI-generated content. <!-- You should understand that not following the above may get your PR closed at maintainer’s discretion --> <!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be posted in #codebase-changes. --> Nope **Changelog** <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay. Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up. Changelog must have a 🆑 symbol, so the bot recognizes the changes and adds them to the game's changelog. --> 🆑 - add: 13 colors of lounge chairs can be constructed out of steel and cloth. - add: 8 colors of beach umbrellas can be constructed out of rods and cloth. - add: Pool tile (and dark pool tile) can be produced at the cutter machine. - add: Logistics can now order a crate of bulk swim rings, in 11 possible colors! - add: For mappers (and admins): there is a new "pool water" entity that is a nice green-cyan color and contains about 1% chlorine. --------- Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> * Remove Umbrella + Fixes from Port * Pool Ring Additions * Buff Fishing Vendor * grr * its no longer 2am --------- Co-authored-by: portfiend <109661617+portfiend@users.noreply.github.com> Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
github-actions
Bot
added
size/L
S: Needs Review
S: Untriaged
Changes: No C#
Changes: Sprites
and removed
S: Needs Review
S: Untriaged
size/L
labels
Contributor
Author
|
Contributor
|
RSI Diff Bot; head commit a7be494 merging into 6febc7f Resources/Textures/_DEN/Objects/Tiles/pool.rsi
Resources/Textures/_DEN/Structures/Decoration/umbrella.rsi
Resources/Textures/_DEN/Structures/Furniture/lounge_chair.rsi
Resources/Textures/_DEN/Structures/Furniture/pool_ring.rsi
Resources/Textures/_DEN/Tiles/Planet/water.rsi
Resources/Textures/_DEN/Tiles/pool.rsi
|
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Contributor
Author
|
merge conflicts resolvesd |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
About the PR
Ports these pull requests:
This PR adds beach umbrellas, lounge chairs, swim tubes, pool tiles, and a new "pool water" tile entity.
The former three have mapping spawners!
Why / Balance
Ye olde mapper toy that also happens to be a Macrocosm request.
Making swim tubes belt-wearable was something I wanted to do but never got around to it. Thank you @Stxcking !!
Technical details
Cherry-picks and merge conflict resolution.
Tiles had to get localized.
Had to migrate pool water post-solutions refactor, and fix up the recipes to clear out redundant fields.
Used anchors in construction recipes to massively reduce redundancy.
You'll lie down when buckled to lounge chairs now!
Test plan
Media
Recipes
Asset Preview
Random Spawners
Requirements
Licensing
Combination of my code and assets, plus Stxcking's explicit permission to sublicense their contributions under MIT.
Permission given both by myself and Stxcking; see above.
Breaking changes
Nada.
Changelog
🆑 portfiend, Stxcking