From 5038012b67c9689018e5bf362036ed8e0e4d5bbb Mon Sep 17 00:00:00 2001
From: Ubaser <134914314+UbaserB@users.noreply.github.com>
Date: Mon, 17 Jun 2024 20:53:47 +1000
Subject: [PATCH] Add new lizard horns, Demonic (#29022)

add
---
 Resources/Locale/en-US/markings/reptilian.ftl    |   3 +++
 .../Mobs/Customization/Markings/reptilian.yml    |   9 +++++++++
 .../reptilian_parts.rsi/horns_demonic.png        | Bin 0 -> 1375 bytes
 .../Customization/reptilian_parts.rsi/meta.json  |   6 +++++-
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_demonic.png

diff --git a/Resources/Locale/en-US/markings/reptilian.ftl b/Resources/Locale/en-US/markings/reptilian.ftl
index 470af07361..d66d3cb9e6 100644
--- a/Resources/Locale/en-US/markings/reptilian.ftl
+++ b/Resources/Locale/en-US/markings/reptilian.ftl
@@ -93,6 +93,9 @@ marking-LizardHornsMyrsore = Lizard Horns (Myrsore)
 marking-LizardHornsBighorn-horns_bighorn = Lizard Horns (Bighorn)
 marking-LizardHornsBighorn = Lizard Horns (Bighorn)
 
+marking-LizardHornsDemonic-horns_demonic = Lizard Horns (Demonic)
+marking-LizardHornsDemonic = Lizard Horns (Demonic)
+
 marking-LizardHornsKoboldEars-horns_kobold_ears = Lizard Ears (Kobold)
 marking-LizardHornsKoboldEars = Lizard Ears (Kobold)
 
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
index 5a52e09bf2..19768f8dc2 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
@@ -294,6 +294,15 @@
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: horns_bighorn
 
+- type: marking
+  id: LizardHornsDemonic
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: horns_demonic
+
 - type: marking
   id: LizardHornsKoboldEars
   bodyPart: HeadTop
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_demonic.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_demonic.png
new file mode 100644
index 0000000000000000000000000000000000000000..63181ea08fa414e51f0c93d5fa9287eef0e8d6fa
GIT binary patch
literal 1375
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy
zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`)#=84^(v;p=0SoS&<gn3A8As#lR)
z0M=zwVFhI7rj{fsROII56<bx<DuGp40ofp7eI*63l9Fs&r3l{u1?T*tR0T6V13d#J
zJ1zwU1)HLjG^-#NH>h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6
zGOr}DLN~8i8Da>`9GBGM<f6=ilFa-(1(3OkN%^HEwn|DMi{Jp_&Xi=hJq4vjIbd5-
zlJ!$_Qgc)DN{aOj^$hi~=_|=hL%1-n7#bYFfYArZ0JRxl)#h1Hl57GDDc1_1d!YUU
zIy4z<Z*fVAK9T}`BLf2qT>~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G
zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fyK^K?@SOEU`!Qd4xD9G$%bfY?SKq65_=h$yNB
zHu_lHVgm{RtH_|#;{2RaP#oA9nVHyt!v#eY5gQO45m<E~i=yiY$jC3r2d1u~%w*5J
zlGLJtB4A2`*a)=`w+eK#5SEALWtP|(K@C6?M$&~8Q&x^eCFS`=*&*Oq!5*YIl|zk$
z1TRv`g=7nGQ~>jZ9hZ$hJdfFNIi5O}0nE%1o-U3d6^w6ZISMr^@VG7&4_v?S-hZiG
z0s0S{#N4f7Z*T~DTi33WaQb22zoThU$B$j>HedR*c*hiJA?sWJHTEqpygmER@|_6`
zxwmf>%D9^8-81REq56o;$zb)q?6s>_HF2$eeJd*}aK+voLH0YC+Y%#ecTK)w{QCLy
z)SKM%=bc`)f9{IX<=UZ}j_SW`XwNhIo0MI@@rSs<Hl5QKw(4iTZ{PWK{y8S=2RrS)
zDr~QNRds`(NuYs&MS+2l!+`;l*(k3x;g?WI@UKYzgVPsF74M(G%<xuo=e60(JZI0-
zIbUh<TiRuIVLs!Z(2A0xUoBU=>*ovX-up}Z#qWEWGb0XiUz>flJ1bkXp>kgM#>KC*
zrY=6A^8R3TmyiASI}($>D7G9sYhH2ThZ;Mk%}DNPJTJV1`S;Sw(&|=$y`aL))78&q
Iol`;+03r0p$N&HU

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
index 3770a771d8..bb12e3bf03 100644
--- a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297, while Argali, Ayrshire, Myrsore and Bighorn are drawn by Ubaser, and Kobold Ears are drawn by Pigeonpeas. Body_underbelly made by Nairod(github) for SS14. Large drawn by Ubaser. Wagging tail by SonicDC. Splotch modified from Sharp by KittenColony(github). Frills neckfull come from: https://github.com/Bubberstation/Bubberstation/commit/8bc6b83404803466a560b694bf22ef3c0ac266a2",
+  "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297, while Argali, Ayrshire, Myrsore, Bighorn and Demonic are drawn by Ubaser, and Kobold Ears are drawn by Pigeonpeas. Body_underbelly made by Nairod(github) for SS14. Large drawn by Ubaser. Wagging tail by SonicDC. Splotch modified from Sharp by KittenColony(github). Frills neckfull come from: https://github.com/Bubberstation/Bubberstation/commit/8bc6b83404803466a560b694bf22ef3c0ac266a2",
   "size": {
     "x": 32,
     "y": 32
@@ -581,6 +581,10 @@
       "name": "horns_bighorn",
       "directions": 4
     },
+    {
+      "name": "horns_demonic",
+      "directions": 4
+    },
     {
       "name": "horns_kobold_ears",
       "directions": 4
-- 
2.51.2