Adds a salad yaml and texture #1440
Closed
Conversation
This file contains 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
My favorite ham and pineapple salad, made from mayo, eggs, corn, ham and pineapples. Easy to make in-game with a botanist and filling :)
Amateur contributor; forgot I'm not editing my own files
github-actions
bot
added
Changes: YML
Resources/Textures/DeltaV/Objects/Consumable/Food/hamandpineapplesalad.rsi/meta.json
Outdated
Show resolved
Hide resolved
…plesalad.rsi/meta.json Co-authored-by: Danger Revolution! <[email protected]> Signed-off-by: BashieAgain <[email protected]>
Resources/Textures/DeltaV/Objects/Consumable/Food/hamandpineapplesalad.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/DeltaV/Objects/Consumable/Food/hamandpineapplesalad.rsi/meta.json
Outdated
Show resolved
Hide resolved
|
Coming back to this? |
It's gotta work NOW right?
|
Considering the proposed nutriment and protein within the salad, the finished product constitutes a net loss of nutrition. If you can fix that then we can address the other issues. |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Going to assume that this is abandonware; last changes made two months ago, no response after two weeks |
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Jan 11, 2025
# Description Adds male Lamia with facial hair. Also makes dozens of markings available to Lamiae, including reptilian markings and pointy ears. Also adds locale strings for the Lamia tail marking. ## Media **Mermaid**  **Face:** Lips, Blush **Head:** Left Eye **Head (Top):** Lizard Horns (Ayrshire) **Head (Side):** Thin Ears, Drop Earrings (Left/Right) **Chest:** Lizard Chest (Tiger) **Right Arm:** Right Arm Bracelet **Right Hand:** Right Bracelet, Right Nail Polish **Left Hand:** Left Bracelet, Left Nail Polish **Male**   **Face:** Eyelash (Left/Right), Eye Corner (Left/Right) **Head (Top):** Lizard Horns (Angler) **Head (Side):** Lizard Frills (Short) **Chest:** Lizard Chest (Tiger) **Right Arm:** Lizard Right Arm (Tiger) **Right Hand:** Right Watch (Colorable) **Left Arm:** Lizard Right Arm (Tiger) **Overlay:** Gauze Handwrap **Red**  **Face:** Lips **Head (Top):** Lizard Horns **Head (Side):** Upward Ears **Right Hand:** Right Robotic Hand from Bishop Cybernetics **Left Hand:** Left Robotic Hand from Bishop Cybernetics, Left Gold Watch **Lamia locale**   ## Changelog :cl: Skubman - add: Lamiae can now be male, no longer being a female-only species. They can now wear facial hair as well. - add: The Lamia species can now select markings above the leg, including cybernetics, makeup, tattoos, noses, earrings, heterochromia, bracelets, reptilian horns and frills, pointy ears, and more! - fix: Added text for the Lamia tail marking.
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Jan 11, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
This adds a new salad into the game, with a recipe and texture.
Why / Balance
Simply added for more cooking recipes, as well as giving more use to pineapples. The recipe is easy to follow and isn't problematic to make with a decent botanist. Also felt like adding a "controversial" meal that isn't universally liked in-character.
Media
Video attached.
hamsalad.mp4