Skip to content

Commit

Permalink
New horns for oni. (#97)
Browse files Browse the repository at this point in the history
## 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 <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
  • Loading branch information
3 people committed May 4, 2024
1 parent b9bd711 commit 45c366a
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 1 deletion.
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/deltav/markings/Oni.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
marking-OniHornShaved = Shaved
marking-OniHornShaved-shaved = Shaved
marking-OniHornBull = Bull
marking-OniHornBull-bull = Bull
9 changes: 8 additions & 1 deletion Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
marking-OniHornSingleCurved = Single Curved
marking-OniHornSingleLeftCurved =Single Left Curved
marking-OniHornSingleCurved-single_curved = Single Curved
marking-OniHornSingleLeftCurved = Single Left Curved
marking-OniHornSingleLeftCurved-single_left_curved = Single Left Curved
marking-OniHornSingleRightCurved = Single Right Curved
marking-OniHornSingleRightCurved-single_right_curved = Single Right Curved
marking-OniHornDoubleCurvedOutwards = Double Curved Outwards
marking-OniHornDoubleCurvedOutwards-double_curved_outwards = Double Curved Outwards
marking-OniHornDoubleCurved = Double Curved
marking-OniHornDoubleCurved-double_curved = Double Curved
marking-OniHornDoubleLeftBrokeCurved = Double Left Broke Curved
marking-OniHornDoubleLeftBrokeCurved-double_left_broke_curved = Double Left Broke Curved
marking-OniHornDoubleRightBrokeCurved = Double Right Broke Curved
marking-OniHornDoubleRightBrokeCurved-double_right_broke_curved = Double Right Broke Curved
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- type: marking
id: OniHornShaved
bodyPart: HeadTop
markingCategory: HeadTop
forcedColoring: false
speciesRestriction: [Oni]
sprites:
- sprite: DeltaV/Mobs/Customization/Oni/oni_horns.rsi
state: shaved

- type: marking
id: OniHornBull
bodyPart: HeadTop
markingCategory: HeadTop
forcedColoring: false
speciesRestriction: [Oni]
sprites:
- sprite: DeltaV/Mobs/Customization/Oni/oni_horns.rsi
state: bull
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by PS3MOIRA",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "shaved",
"directions": 4
},
{
"name": "bull",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 45c366a

Please sign in to comment.