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

Oni Horn Markings #726

Merged
merged 4 commits into from
Aug 14, 2024
Merged

Conversation

dootythefrooty
Copy link
Contributor

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.

Media

display


Changelog

🆑

  • add: Added crowned, tall bull, and tall curved Oni horns.

@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Aug 12, 2024
Copy link
Contributor

github-actions bot commented Aug 12, 2024

RSI Diff Bot; head commit 44de732 merging into 2ae464e
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Mobs/Customization/Oni/oni_horns.rsi

State Old New Status
crowned Added

Resources/Textures/Mobs/Customization/Oni/oni_horns48x48.rsi

State Old New Status
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

Edit: diff updated after 44de732

Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

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

Test fail valid

@DangerRevolution DangerRevolution merged commit 5f25d1b into Simple-Station:master Aug 14, 2024
13 checks passed
SimpleStation14 added a commit that referenced this pull request Aug 14, 2024
tmcqueen pushed a commit to tmcqueen/Syndicate-Station that referenced this pull request Aug 24, 2024
# 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.
tmcqueen pushed a commit to tmcqueen/Syndicate-Station that referenced this pull request Aug 24, 2024
tmcqueen pushed a commit to tmcqueen/Syndicate-Station that referenced this pull request Aug 24, 2024
---

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>

---

<!--
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.
tmcqueen pushed a commit to tmcqueen/Syndicate-Station that referenced this pull request Aug 24, 2024
@ghost ghost mentioned this pull request Aug 27, 2024
2 tasks
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 Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants