From 45c366aae8773b3a882ff3cd8d2f4ec60b1094ed Mon Sep 17 00:00:00 2001
From: SimpleStation14 <130339894+SimpleStation14@users.noreply.github.com>
Date: Sat, 4 May 2024 16:07:59 -0700
Subject: [PATCH] New horns for oni. (#97)
## Mirror of PR #1030: [New horns for
oni.](https://github.com/DeltaV-Station/Delta-v/pull/1030) from
[DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v)
`d87b4b048a434e4d2c9ac23d4da4a46fae0d5c30`
---
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
---
Original Body
>
>
>
> ## 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
>
>
> - [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
>
>
> **Changelog**
>
>
>
> :cl:
> - add: Added new horn designs for onis.
>
Co-authored-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
Co-authored-by: VMSolidus
---
.../Locale/en-US/deltav/markings/Oni.ftl | 4 ++++
.../Locale/en-US/nyanotrasen/markings/Oni.ftl | 9 ++++++++-
.../Mobs/Customization/Markings/Oni_horns.yml | 19 ++++++++++++++++++
.../Customization/Oni/oni_horns.rsi/bull.png | Bin 0 -> 745 bytes
.../Customization/Oni/oni_horns.rsi/meta.json | 19 ++++++++++++++++++
.../Oni/oni_horns.rsi/shaved.png | Bin 0 -> 656 bytes
6 files changed, 50 insertions(+), 1 deletion(-)
create mode 100644 Resources/Locale/en-US/deltav/markings/Oni.ftl
create mode 100644 Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml
create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/bull.png
create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/meta.json
create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/shaved.png
diff --git a/Resources/Locale/en-US/deltav/markings/Oni.ftl b/Resources/Locale/en-US/deltav/markings/Oni.ftl
new file mode 100644
index 00000000000..0ba3315fdbb
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/markings/Oni.ftl
@@ -0,0 +1,4 @@
+marking-OniHornShaved = Shaved
+marking-OniHornShaved-shaved = Shaved
+marking-OniHornBull = Bull
+marking-OniHornBull-bull = Bull
diff --git a/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl b/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl
index 7b8a14bccf3..de9389d9aa9 100644
--- a/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl
@@ -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
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml
new file mode 100644
index 00000000000..fbf78c92e52
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml
@@ -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
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/bull.png b/Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/bull.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d1c5ebf86212c892788115467c4a6caef61295f
GIT binary patch
literal 745
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|*86aP
zNZb5vUas0oRvi{87am<`(&$>sH=?7O(u
zaWyUAQ0hBZr>pcaMmxkMe}^Ui`@QcUKH>eL&b{lUSx;l;)HyCT%g!!+w)KHBV^v1_
zjDo20w<~9Ms{CKKJ-cRAoNMU%|L_0qjGDG-9p65+hk|#@ybc-hPS#e9{@7Nqe4f8P
z=X*|f8OeYjF)wFI*=wA;`oneOWS^eq_^(%r>@7Ywf8CSJ^_~0stkzBcZ2Nyr3b;0F
z?!;TVyV<9+6eeY)Xl(Xr6bf89E#=$x{0FDaeFJTF?a9@$cywZ-c)rV(O(kc&OkK{O
z3SO|N=>Od1**v`0cC{y6sCZv_zEuxOgn&@BI^vmw~2ewJ8KXvORRI?u{
z+MoMTxb9PiOMa&IU0?)o7I;J!Gca%qfiUBxyLEqn(V^(+;uum9_x6@I*C7LehKCw*
zj)4MOo)_LOE_+?MNU`Ta==gS*i^Zh>)*LOXFC6{BGc*lt(*E!`nM|n
z`)k8dVD%>EP52a>lk%UQys+nt{Sb3~d$MHO)){?k4sSWU{pU3sdp-C1(iOR(rkfWP
ze13ZCr1(Vd+*6-a&r4kwKOA*k>iYKo%5hRBq_q+{JNGs$-KMIx&AyUDp@D%3H&McI
zByY<7#AWNg-%z6F6T@xp?;4@yK;XpZ83}c!3nNFz>P2s>0WbkzLb6Mw<&;$V1SWDXg
literal 0
HcmV?d00001
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/meta.json
new file mode 100644
index 00000000000..7d86318e7bf
--- /dev/null
+++ b/Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/meta.json
@@ -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
+ }
+ ]
+}
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/shaved.png b/Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/shaved.png
new file mode 100644
index 0000000000000000000000000000000000000000..1afcdb7c539b46cca1cc7dce636b2a7cb9c9197a
GIT binary patch
literal 656
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|*86aP
zNZb5vUas0oRvi{87am<`(&$>sH=?7O(u
zaWyUAQ0hBZr>pcaMmxkMe}^Ui`@QcUKH>eL&b{lUSx;l;)HyCT%g!!+w)KHBV^v1_
zjDo20w<~9Ms{CKKJ-cRAoNMU%|L_0qjGDG-9p65+hk|#@ybc-hPS#e9{@7Nqe4f8P
z=X*|f8OeYjF)wFI*=wA;`oneOWS^eq_^(%r>@7Ywf8CSJ^_~0stkzBcZ2Nyr3b;0F
z?!;TVyV<9+6eeY)Xl(Xr6bf89E#=$x{0FDaeFJTF?a9@$cywZ-c)rV(O(kc&OkK{O
z3SO|N=>Od1**v`0cC{y6sCZv_zEuxOgn&@BI^vmw~2ewJ8KXvORRI?u{
z+MoMTxb9PiOMa&IU0?)o7I;J!Gca%qfiUBxyLEqnf+sv(978JN-rm~Cd&oe5HK2JD
zQ|+^bXXj)_GNraRw6G{yv&4$Kq^8UbvMEnL`fvL6UtSwI1Xc*{@Vi_kdAzh*?bVI-
zJD=arkA5znEnRuO*z)V&>l;@j+b6r8tCZloy=KMcPsaZO*%+BvI0O_N8W^xM-h?UK
zd;9+U)AX_hsfP{Q1tfLT1$Tw