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

New horns for oni. #1030

Merged
merged 7 commits into from
Apr 4, 2024
Merged

Conversation

Adrian16199
Copy link
Contributor

About the PR

I added new horns and fixed marking ftl
Sprites were made by PS3MOIRA

Why / Balance

These sprites were made and simply it took a moment from various of reasons for them to be pull resquested here.
So I have simply ported them here myself.

Technical details

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase
    image
    image

Breaking changes

Changelog

🆑

  • add: Added new horn designs for onis.

@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 Mar 28, 2024
Copy link
Contributor

github-actions bot commented Mar 28, 2024

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

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

State Old New Status
bull Added
shaved Added

Edit: diff updated after dbf4c75

Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT left a comment

Choose a reason for hiding this comment

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

Move this to the DeltaV namespace

@Adrian16199
Copy link
Contributor Author

Move this to the DeltaV namespace

Done

@IamVelcroboy
Copy link
Member

Move this to the DeltaV namespace

This review is blocking merge and I can't find a way to dismiss it. Looks like it was addressed.

@IamVelcroboy IamVelcroboy merged commit d87b4b0 into DeltaV-Station:master Apr 4, 2024
14 checks passed
@Adrian16199 Adrian16199 deleted the Oninew-horns branch April 9, 2024 17:13
nearlyNonexistent referenced this pull request in nearlyNonexistent/Horizon-Station Apr 14, 2024
* New horns for oni.

* Update meta.json

* That one cursed lack of space

* Do what was requested

* Update meta.json

---------

Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
VMSolidus added a commit to Simple-Station/Einstein-Engines that referenced this pull request May 4, 2024
## Mirror of PR #1030: [New horns for
oni.](DeltaV-Station/Delta-v#1030) from <img
src="https://avatars.githubusercontent.com/u/131613340?v=4"
alt="DeltaV-Station" width="22"/>
[DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v)

<aside>PR opened by <img
src="https://avatars.githubusercontent.com/u/144424013?v=4"
width="16"/><a href="https://github.com/Adrian16199"> Adrian16199</a> at
2024-03-28 18:32:23 UTC</aside>
<aside>PR merged by <img
src="https://avatars.githubusercontent.com/u/144424013?v=4"
width="16"/><a href="https://github.com/Adrian16199"> Adrian16199</a> at
2024-04-04 21:43:48 UTC</aside>
<sup>

`d87b4b048a434e4d2c9ac23d4da4a46fae0d5c30`

</sup>

---

PR changed 0 files with 0 additions and 0 deletions.

The PR had the following labels:
- Changes: YML
- Status: Needs Review
- Changes: Localization
- Changes: Sprite


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> ## About the PR
> <!-- What did you change in this PR? -->
> I added new horns and fixed marking ftl
> Sprites were made by PS3MOIRA
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> These sprites were made and simply it took a moment from various of
reasons for them to be pull resquested here.
> So I have simply ported them here myself.
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
> 
> ## Media
> <!-- 
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
> 
> If you're unsure whether your PR will require media, ask a maintainer.
> 
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
> 
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
>
![image](https://github.com/DeltaV-Station/Delta-v/assets/144424013/ac93e16c-e834-432e-af82-1da29ab4aece)
>
![image](https://github.com/DeltaV-Station/Delta-v/assets/144424013/8527f0fc-67a6-441d-b6c0-eb42daa76a9e)
> 
> ## Breaking changes
> <!--
> List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
> -->
> 
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
> 
> 
> 🆑
> - add: Added new horn designs for onis.
> 


</details>

Co-authored-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
rbertoche pushed a commit to rbertoche/space-station-14 that referenced this pull request Sep 6, 2024
oni.](DeltaV-Station/Delta-v#1030) from <img
src="https://avatars.githubusercontent.com/u/131613340?v=4"
alt="DeltaV-Station" width="22"/>
[DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v)

<aside>PR opened by <img
src="https://avatars.githubusercontent.com/u/144424013?v=4"
width="16"/><a href="https://github.com/Adrian16199"> Adrian16199</a> at
2024-03-28 18:32:23 UTC</aside>
<aside>PR merged by <img
src="https://avatars.githubusercontent.com/u/144424013?v=4"
width="16"/><a href="https://github.com/Adrian16199"> Adrian16199</a> at
2024-04-04 21:43:48 UTC</aside>
<sup>

`d87b4b048a434e4d2c9ac23d4da4a46fae0d5c30`

</sup>

---

PR changed 0 files with 0 additions and 0 deletions.

The PR had the following labels:
- Changes: YML
- Status: Needs Review
- Changes: Localization
- Changes: Sprite

---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
>
> ## About the PR
> <!-- What did you change in this PR? -->
> I added new horns and fixed marking ftl
> Sprites were made by PS3MOIRA
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> These sprites were made and simply it took a moment from various of
reasons for them to be pull resquested here.
> So I have simply ported them here myself.
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
>
> ## Media
> <!--
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
>
> If you're unsure whether your PR will require media, ask a maintainer.
>
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
>
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
>
![image](https://github.com/DeltaV-Station/Delta-v/assets/144424013/ac93e16c-e834-432e-af82-1da29ab4aece)
>
![image](https://github.com/DeltaV-Station/Delta-v/assets/144424013/8527f0fc-67a6-441d-b6c0-eb42daa76a9e)
>
> ## Breaking changes
> <!--
> List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
> -->
>
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
>
>
> 🆑
> - add: Added new horn designs for onis.
>

</details>

Co-authored-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
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.

4 participants