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

Cherry-Pick Oni Markings #1691

Merged

Conversation

ghost
Copy link

@ghost ghost commented Aug 27, 2024

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.)
budgetgoblin aradia
You can now make elves, orcs, goblins and trolls and other things. It's great.

Requirements

  • I have read and I am following the Pull Request Guidelines. I understand that not doing so may get my pr closed at maintainer’s discretion
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog

🆑 Skubman, dootythefrooty

  • add: Quite a few 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: Onis get two new tusk markings in the 'Snout' section, and several pointy ear markings that help them resemble tieflings, orcs, elves and more.
  • tweak: Allows felinids, harpies and oni to have more human markings.

dootythefrooty and others added 3 commits August 27, 2024 01:06
# 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.
@github-actions github-actions bot added Changes: YML Changes any yml files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi labels Aug 27, 2024
Copy link
Contributor

github-actions bot commented Aug 27, 2024

RSI Diff Bot; head commit 30f919f merging into 5c21335
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi

State Old New Status
antlers_2tone_1 Added
antlers_2tone_2 Added
antlers_3tone_1 Added
antlers_3tone_2 Added
antlers_3tone_3 Added
aries Added
aries_3tone_1 Added
aries_3tone_2 Added
aries_3tone_3 Added
crowned Added
double_curved_3tone_1 Added
double_curved_3tone_2 Added
double_curved_3tone_3 Added
double_curved_outwards_3tone_1 Added
double_curved_outwards_3tone_2 Added
double_curved_outwards_3tone_3 Added
double_thick Added
double_thick_2tone_1 Added
double_thick_2tone_2 Added
double_thick_3tone_1 Added
double_thick_3tone_2 Added
double_thick_3tone_3 Added
erebia Added
erebia_3tone_1 Added
erebia_3tone_2 Added
erebia_3tone_3 Added
erebia_rings Added
inclined Added
inclined_3tone_1 Added
inclined_3tone_2 Added
inclined_3tone_3 Added
nepeta Added
nepeta_3tone_1 Added
nepeta_3tone_2 Added
nepeta_3tone_3 Added
pisces Added
pisces_2tone_1 Added
pisces_2tone_2 Added
pisces_3tone_1 Added
pisces_3tone_2 Added
pisces_3tone_3 Added
sagittarius Added
sagittarius_3tone_1 Added
sagittarius_3tone_2 Added
sagittarius_3tone_3 Added
serket Added
serket_3tone_1 Added
serket_3tone_2 Added
serket_3tone_3 Added
taurus Added
taurus_2tone_1 Added
taurus_2tone_2 Added
taurus_3tone_1 Added
taurus_3tone_2 Added
taurus_3tone_3 Added
tavris Added
tavris_3tone_1 Added
tavris_3tone_2 Added
tavris_3tone_3 Added
unicorn Added
vantas Added
vantas_3tone_1 Added
vantas_3tone_2 Added
vantas_3tone_3 Added
virgo Added
virgo_3tone_1 Added
virgo_3tone_2 Added
virgo_3tone_3 Added
wavy Added
wavy_2tone_1 Added
wavy_2tone_2 Added
wavy_3tone_1 Added
wavy_3tone_2 Added
wavy_3tone_3 Added

Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi

State Old New Status
makara Added
makara_2tone_1 Added
makara_2tone_2 Added
makara_3tone_1 Added
makara_3tone_2 Added
makara_3tone_3 Added
tall_bull Added
tall_bull_3tone_1 Added
tall_bull_3tone_2 Added
tall_bull_3tone_3 Added
tall_curved Added
tall_curved_3tone_1 Added
tall_curved_3tone_2 Added
tall_curved_3tone_3 Added

Resources/Textures/Einstein-Engines/Mobs/Customization/goblin_tusks.rsi

State Old New Status
goblin_tusks_big Added
goblin_tusks_none Added
goblin_tusks_small Added

Resources/Textures/Einstein-Engines/Mobs/Customization/oni_feet.rsi

State Old New Status
two_toes Added

Resources/Textures/Einstein-Engines/Mobs/Customization/pointy_ears.rsi

State Old New Status
pointy_ears_large Added
pointy_ears_none Added
pointy_ears_slanted Added
pointy_ears_small Added
pointy_ears_standard Added
pointy_ears_tall Added
pointy_ears_thin Added
pointy_ears_upwards Added
pointy_ears_wide Added

Edit: diff updated after 30f919f

@ghost
Copy link
Author

ghost commented Aug 27, 2024

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.

@ghost ghost marked this pull request as ready for review August 27, 2024 04:59
@ghost
Copy link
Author

ghost commented Aug 27, 2024

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.

@ghost ghost enabled auto-merge (squash) August 27, 2024 07:07
@ghost ghost requested a review from therealDLondon August 27, 2024 07:12
Copy link
Member

@therealDLondon therealDLondon left a 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

@ghost ghost merged commit d89a727 into DeltaV-Station:master Aug 27, 2024
14 checks passed
@ghost ghost deleted the Skubman-&-Dootythefrooty-oni-markings branch August 28, 2024 03:59
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants