Oni Horn Markings (Simple-Station#726)

---

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.

Resources/Locale/en-US/markings/oni.ftl

@@ -1,19 +1,28 @@
 marking-OniHornTallCurved = Tall Curved
 marking-OniHornTallCurved-tall_curved = Tall Curved
 
+<<<<<<< HEAD
+=======
+marking-OniHornTallCurved3Tone = Tall Curved Three Tone
+>>>>>>> 5f25d1bd64 (Oni Horn Markings (#726))
 marking-OniHornTallCurved3Tone-tall_curved_3tone_1 = Bottom Third
 marking-OniHornTallCurved3Tone-tall_curved_3tone_2 = Middle Third
 marking-OniHornTallCurved3Tone-tall_curved_3tone_3 = Top Third
 
 marking-OniHornTallBull= Tall Bull
 marking-OniHornTallBull-tall_bull = Tall Bull
 
+<<<<<<< HEAD
+=======
+marking-OniHornTallBull3Tone = Tall Bull Three Tone
+>>>>>>> 5f25d1bd64 (Oni Horn Markings (#726))
 marking-OniHornTallBull3Tone-tall_bull_3tone_1 = Bottom Third
 marking-OniHornTallBull3Tone-tall_bull_3tone_2 = Middle Third
 marking-OniHornTallBull3Tone-tall_bull_3tone_3 = Top Third
 
 marking-OniHornCrowned = Crowned
 marking-OniHornCrowned-crowned = Crowned
+<<<<<<< HEAD
 
 marking-OniHornSerket = Serket
 marking-OniHornSerket-serket = Serket
@@ -172,3 +181,5 @@ marking-OniHornDoubleCurvedOutwards3Tone = Double Curved Outwards (Three Tone)
 marking-OniHornDoubleCurvedOutwards3Tone-double_curved_outwards_3tone_1 = Bottom Third
 marking-OniHornDoubleCurvedOutwards3Tone-double_curved_outwards_3tone_2 = Middle Third
 marking-OniHornDoubleCurvedOutwards3Tone-double_curved_outwards_3tone_3 = Top Third
+=======
+>>>>>>> 5f25d1bd64 (Oni Horn Markings (#726))

Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml

@@ -51,6 +51,7 @@
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: crowned
+<<<<<<< HEAD
 
 - type: marking
   id: OniHornSerket
@@ -523,3 +524,5 @@
     state: double_curved_outwards_3tone_2
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: double_curved_outwards_3tone_3
+=======
+>>>>>>> 5f25d1bd64 (Oni Horn Markings (#726))

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

@@ -1,6 +1,10 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
+<<<<<<< HEAD
+=======
+    "copyright": "crowned by dootythefrooty",
+>>>>>>> 5f25d1bd64 (Oni Horn Markings (#726))
     "size": {
         "x": 32,
         "y": 32
@@ -9,6 +13,7 @@
         {
             "name": "crowned",
             "directions": 4
+<<<<<<< HEAD
         },
         {
             "name": "serket",
@@ -301,6 +306,8 @@
         {
             "name": "double_curved_outwards_3tone_3",
             "directions": 4
+=======
+>>>>>>> 5f25d1bd64 (Oni Horn Markings (#726))
         }
     ]
 }

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

@@ -1,6 +1,10 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
+<<<<<<< HEAD
+=======
+    "copyright": "tall_curved & tall_bull by dootythefrooty",
+>>>>>>> 5f25d1bd64 (Oni Horn Markings (#726))
     "size": {
         "x": 48,
         "y": 48
@@ -37,6 +41,7 @@
         {
             "name": "tall_bull_3tone_3",
             "directions": 4
+<<<<<<< HEAD
         },
         {
             "name": "makara",
@@ -61,6 +66,8 @@
         {
             "name": "makara_3tone_3",
             "directions": 4
+=======
+>>>>>>> 5f25d1bd64 (Oni Horn Markings (#726))
         }
     ]
 }