-
Notifications
You must be signed in to change notification settings - Fork 294
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
Cherry-Pick Oni Markings #1691
Cherry-Pick Oni Markings #1691
Conversation
# Description --- Three new Oni horn markings,] two of which have three tone support. There was a distinct lack of large horns, which I tried my hand at. <details><summary><h1>Media</h1></summary> <p> ![display](https://github.com/user-attachments/assets/cb0604e8-941c-48fd-8fb8-205893b87c5c) </p> </details> --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: Added crowned, tall bull, and tall curved Oni horns.
# Description Adds eight pointy ears, two tusks, one feet marking (toes resembling WarCraft trolls) and human nose markings to Onis. The pointed ears are a big reference to tieflings (similar to Onis) who often have them. Onis will now have pointy ears by default, but there is a marking to disable ears. 5 human nose markings have all been made available to Onis, Harpies, and Felinids. Onis and Felinids can now get chest scars, originally humna-only. The tusk markings are originally from Frontier goblins. The new pointy ears give players the power to make their Onis look like **tieflings, orcs, elves, goblins**, and more fantasy races. These markings can potentially be used in the future for other species like psionic elves. ## Media **Blood Elf** (Tall Ears) ![image](https://github.com/user-attachments/assets/257c8839-303c-45b2-b129-3f9183e47695) <details><summary>See more</summary> **Orc** (Upward Ears, Large Tusks) ![image](https://github.com/user-attachments/assets/46bac694-de88-4e04-a12b-7ff8a8111e7b) **Night Elf** (Wide Ears) ![image](https://github.com/user-attachments/assets/18813660-cd2c-4d37-800d-bf84b1d7dee5) **Night Elf** (Slanted Ears) ![image](https://github.com/user-attachments/assets/7f39457b-875d-4c46-a5fb-428a6a535fb1) **Troll** (Large Ears, Small Tusks, Two-Toed Feet) ![image](https://github.com/user-attachments/assets/d9a0c52e-020d-4b55-bb7e-7a4afed61dcc) **Character Setup** ![image](https://github.com/user-attachments/assets/35ba27d4-e6d1-4c52-bbc7-0f057df12fc8) ![image](https://github.com/user-attachments/assets/5d9e7690-7118-48b3-95b9-50ee784660e2) </details> ## Changelog :cl: Skubman - add: Onis have received eight new pointy ear markings in the 'Head (Side)' section that can help them resemble tieflings, orcs, elves, goblins, trolls, and more. - add: Onis get two new tusk markings in the 'Snout' section, and a Two-Toed feet marking in the 'Legs' section. - add: Felinids, Onis, and Harpies can now select Human nose markings like the schnozz, blobby nose, and nubby nose. - add: Felinids and Onis can now select the Chest Scar and Top Surgery Scar markings. - tweak: Default Onis now use the Double Curved horn and Upward Ears markings.
# Description Adds **16** new horns to Onis, 10 of which are inspired by **Homestuck** trolls. Most of the new horns have three-tone variants, and some also have striped variants. New horns and available variants: - Antlers (Three Tone) - Aries (Three Tone) - Double Thick (Striped, Three Tone) - Erebia (Ringed, Three Tone) - Inclined (Three Tone) - Makara (Striped, Three Tone) - Nepeta (Three Tone) - Pisces (Striped, Three Tone) - Sagittarius - Serket (Three Tone) - Taurus (Striped, Three Tone) - Tavris (Three Tone) - Unicorn - Vantas (Three Tone) - Virgo (Three Tone) - Wavy (Striped, Three Tone) - Three Tone for the existing Double Curved horn - Three Tone for the existing Double Curved Outwards horn ## Media **Serket (Three Tone)** ![image](https://github.com/user-attachments/assets/69beabb3-01ea-49ac-9e9e-8d9351bf99df) <details><summary>See more</summary> **Makara (Striped)** ![image](https://github.com/user-attachments/assets/839707b7-c063-41f4-b59f-dc36f2126967) **Aries (Three Tone)** ![image](https://github.com/user-attachments/assets/ba7a65da-06d0-4ddd-b0d0-afa9cff5ad03) ![image](https://github.com/user-attachments/assets/b4abcdd2-a11e-4d4f-be61-1970e78cf588) **Antlers** ![image](https://github.com/user-attachments/assets/cfb47d5b-f985-4dbe-b86d-96c31472007f) **Pisces (Striped)** ![image](https://github.com/user-attachments/assets/9426c51e-49fe-41d4-b049-ee8b1a159c57) **Wavy** ![image](https://github.com/user-attachments/assets/c29420aa-4576-49ec-af08-0ff38aff7ea4) **Taurus (Striped)** ![image](https://github.com/user-attachments/assets/9aa3084e-4acc-473e-b875-465b242d0551) **Nepeta (Three Tone)** ![image](https://github.com/user-attachments/assets/639abc4a-0cf1-456a-b214-6520e39e992f) **Sagittarius (Three Tone)** ![image](https://github.com/user-attachments/assets/2a4a7c6f-0678-462d-8de6-f8fe6c10aef3) **Unicorn** ![image](https://github.com/user-attachments/assets/6783cbd4-2dcf-4204-bb03-3f3601e1c6f7) ![image](https://github.com/user-attachments/assets/c09f7ef3-a0e3-429f-be70-76db0232ad01) </details> ## Changelog :cl: Skubman - add: 16 new horns for Onis have been added, with three-tone variants and some striped variants! The new horns include the Serket, Nepeta, Vantas, Makara, and more. - add: The Oni horns Double Curved and Double Curved Outwards have received three-tone variants.
RSI Diff Bot; head commit 30f919f merging into 5c21335 Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi
Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi
Resources/Textures/Einstein-Engines/Mobs/Customization/goblin_tusks.rsi
Resources/Textures/Einstein-Engines/Mobs/Customization/oni_feet.rsi
Resources/Textures/Einstein-Engines/Mobs/Customization/pointy_ears.rsi
|
I think this is ready for review, I'm gonna wait for the tests to do their thing while I have this open in a dev env. |
Why is it letting me squash merge this? Never had that happen before. All it needs is a review from a maint to say yeah it's fine. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah this all looks functional enough to me. Oh boy my first review! If this fucks up I fully expect and accept being shot at dawn
About the PR
Cherry-picks the bulk of oni markings over from EE.
Onis get ears, tusks, three-tone horns, and all that shit. Very cool, I commend the work of Skubman and Dootythefrooty on this. I'm just the guy who's porting it and sorting it into EE folders for use on Delta.
Why / Balance
Went to Floofstation, made an oni character of mine, saw these, went "Damn these would be cool to port to Delta" and then decided to cherrypick it from Einstein Engines.
Technical details
.FTL files, YAML.
Media
Simple-Station/Einstein-Engines/pull/726
Simple-Station/Einstein-Engines/pull/727
Simple-Station/Einstein-Engines/pull/741
Bulk of the media is in these PRs to look at for your consideration. (Sorry for mentioning these in lieu of wanting to take my own images, I'm now in EE's walls.)
You can now make elves, orcs, goblins and trolls and other things. It's great.
Requirements
Changelog
🆑 Skubman, dootythefrooty