From 527485f00daca7c5381c0210b984f543d498ddd6 Mon Sep 17 00:00:00 2001
From: Ubaser <134914314+UbaserB@users.noreply.github.com>
Date: Tue, 26 Sep 2023 12:24:09 +1000
Subject: [PATCH] 4 new Lizard Horn markings (#20496)

* add images to .rsi

* Revert "add images to .rsi"

This reverts commit afa891ee9456c35dd88d5baa4269568286282955.

* add images to .rsi (for real now)

* other misc files
---
 Resources/Locale/en-US/markings/reptilian.ftl |  12 ++++++
 .../Mobs/Customization/Markings/reptilian.yml |  36 ++++++++++++++++++
 .../reptilian_parts.rsi/horns_argali.png      | Bin 0 -> 1360 bytes
 .../reptilian_parts.rsi/horns_ayrshire.png    | Bin 0 -> 1273 bytes
 .../reptilian_parts.rsi/horns_bighorn.png     | Bin 0 -> 1430 bytes
 .../reptilian_parts.rsi/horns_myrsore.png     | Bin 0 -> 1294 bytes
 .../reptilian_parts.rsi/meta.json             |  18 ++++++++-
 7 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_argali.png
 create mode 100644 Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_ayrshire.png
 create mode 100644 Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_bighorn.png
 create mode 100644 Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_myrsore.png

diff --git a/Resources/Locale/en-US/markings/reptilian.ftl b/Resources/Locale/en-US/markings/reptilian.ftl
index a1dedc02a9..bd2725c350 100644
--- a/Resources/Locale/en-US/markings/reptilian.ftl
+++ b/Resources/Locale/en-US/markings/reptilian.ftl
@@ -72,3 +72,15 @@ marking-LizardFrillsAxolotl = Lizard Frills (Axolotl)
 
 marking-LizardFrillsHood-frills_hood = Lizard Frills (Hood)
 marking-LizardFrillsHood = Lizard Frills (Hood)
+
+marking-LizardHornsArgali-horns_argali = Lizard Horns (Argali)
+marking-LizardHornsArgali = Lizard Horns (Argali)
+
+marking-LizardHornsAyrshire-horns_ayrshire = Lizard Horns (Ayrshire)
+marking-LizardHornsAyrshire = Lizard Horns (Ayrshire)
+
+marking-LizardHornsMyrsore-horns_myrsore = Lizard Horns (Myrsore)
+marking-LizardHornsMyrsore = Lizard Horns (Myrsore)
+
+marking-LizardHornsBighorn-horns_bighorn = Lizard Horns (Bighorn)
+marking-LizardHornsBighorn = Lizard Horns (Bighorn)
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
index 9ba620b36b..60e7f34649 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
@@ -226,3 +226,39 @@
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: r_leg_tiger
+
+- type: marking
+  id: LizardHornsArgali
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: horns_argali
+
+- type: marking
+  id: LizardHornsAyrshire
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: horns_ayrshire
+
+- type: marking
+  id: LizardHornsMyrsore
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: horns_myrsore
+
+- type: marking
+  id: LizardBighorn
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: horns_bighorn
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_argali.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_argali.png
new file mode 100644
index 0000000000000000000000000000000000000000..f66087be661555867c760f00b77d941070e4a061
GIT binary patch
literal 1360
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy
zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`&f584^(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|fx1;&W2dZS)~ZP_;rtQBAbb$6~n+$jerdL8-<0
zIi;XLw=*&`u>l7JiYOxZAvz+k>OdAn*AbABUy=_@PDPo?o_QsyMFmB`qy@1NY9DSD
z=w=}-56#Ogu`_}ifF_Kj3n^->9E(cI^NX@Wz|jB=L!9zZGa%uKlr|v=9~}0;lyApn
zqYuwTc3jVbpE?7xYr3b4V@L(#+gY)EO$Guj7b^to&K>wW-;za!VV#4Cv&?0au*|^t
zKOR1}@18sNZSwY@P#Xacp%t%xt%@%?+<ioF?P<A{8^fzNMrO@f_Hs$g{qOt&hYfNz
z1_(c28Z7*9-lU(#^;bEoIrh%|-BEvg+ik{_3npjHu1m=K{Fb@=qRnQSOpMfP(_Q->
z&8n6?H<!D#OSUSh+4iWH$;w@;Qh%(pE&Mb2Ut#Vwfd&Q^1qMbA2L>h_%pc-RyUIU5
zU3_j$<&J-%?Ki?-uY0{IfAM)$-rreK%RbwLpWbAXSLFTbY1SL<{Ig5L{a^2THf_}=
zMw{K`^2a}lm`%Rx+IFD*dpYy8S7&>Y&+V1EU#Bop=yZVP?0d)Ggd2p~i;BOvaXBDp
z*7_r?2jl~4jwYlBetl@4yu2kBhl>zSuJ?SvraODN1>fE2hd`y7r>mdKI;Vst034jc
AP5=M^

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_ayrshire.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_ayrshire.png
new file mode 100644
index 0000000000000000000000000000000000000000..0390a1fc690ff5a1d952878dbd7bfa51b9b8c4ed
GIT binary patch
literal 1273
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy
zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`&f584^(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|fx1;&W2dZS)~ZP_;rtQBAbb$6~n+$jerdL8-<0
zIi;XLw=*&`u>l7JiYOxZAvz+k>OdAn*AbABUy=_@PDPo?o_QsyMFmB`qy@1NY9DSD
z=w=}-56#Ogu`_}ifF_Kj3n^->9E(cI^NX@Wz|jB=L!9zZGa%uKlr|v=9~}0;lyApn
zqYuwTc3jVbpE?7xtAMAAV@L(#+gsjz%?bhyiJ4Ubdsx2j=Um5|zTvD&D&y4S5+<g9
zcQ?;W{4jZ4!K@!&xh<Z@ZG98AC+xOx_S*Yh@4r^O@x527*RtT=F0O>w>sifVd!p_L
z_Pjp-dCr_87WcNTO`dAv%Brxm=**g}@zN72lYMsm;#7Y5c(1?I$sZ>^+HcvrVy^h~
zXP<43aVRt}FySWd#3=07xA|PS?#<GwK5ab>_wNDs`L4S>`dX^{{Cbiz!xN9bI%8E0
z$7ykk|FNA9Qa<}<lTK0m{2Jp0E3ZG}I<$QGwkb6%0uBs}xQTzE4|qMDorR<hevbqd
NJD#q7F6*2UngA$vm)`&Y

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_bighorn.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_bighorn.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ecc93c42bb52c7c478e06d069110798abb35d1b
GIT binary patch
literal 1430
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy
zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`&f584^(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|fx1;&W2dZS)~ZP_;rtQBAbb$6~n+$jerdL8-<0
zIi;XLw=*&`u>l7JiYOxZAvz+k>OdAn*AbABUy=_@PDPo?o_QsyMFmB`qy@1NY9DSD
z=w=}-56#Ogu`_}ifF_Kj3n^->9E(cI^NX@Wz|jB=L!9zZGa%uKlr|v=9~}0;lyApn
zqYuwTc3jVbpE?7x>sn72$B+ufx3j$Snhiu;GpCvwq>0}AKO@v2P1q#-mFu*pN6zzY
z@v!vyQ~AHymreihfzLNt_9;E}zr3aQ@s8E&UR&v$-gNuglii8Wmpt3ARxkSPo0rDS
zxvMkmn?5o;c)FleubyMO$fb36EOy?1KienhzpD63oAc|J$lnWQYD#D>d1u@Ea^EvQ
zo2xHpo(_Mv`-%E>&+DpxKg6wH9JkwMW88$m-S2G@_FXH?(slc_$@<a7i+y5`D=zu3
zZ~4Ca_&k<f&7wTjaSjK0qXilmSQHo-IUE?6uruX-6W)Jx*LY%U|Mh-fMx%R@{pCvY
z<*)uT%iL(ZwCr&{^Op(#87=%ySGf3HeYZhKi}liM@t(!I4(PT<hj08G{9?``-n$n>
zJ#L@<U;8BX&*ngVZ=-`VpYM!{f5BpL<7#*KytS5X3_l_yTaLdl-26{6S(81!*JF=B
z!=%MuqNY5l-@1HyaFal<{6EnNhfO9h#XqfNclxUQQ0Z^s$6a67-F&y^<Ex)@L(S_H
ear(hT@CRf2@<TsY%jrdd%0y3BKbLh*2~7Y34(}}h

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_myrsore.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_myrsore.png
new file mode 100644
index 0000000000000000000000000000000000000000..176a619bad79f5ea06224ff8b0570ca4e59cf2aa
GIT binary patch
literal 1294
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy
zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`&f584^(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|fx1;&W2dZS)~ZP_;rtQBAbb$6~n+$jerdL8-<0
zIi;XLw=*&`u>l7JiYOxZAvz+k>OdAn*AbABUy=_@PDPo?o_QsyMFmB`qy@1NY9DSD
z=w=}-56#Ogu`_}ifF_Kj3n^->9E(cI^NX@Wz|jB=L!9zZGa%uKlr|v=9~}0;lyApn
zqYuwTc3jVbpE?7xtE#7qV@L(#+gpZw%?3QJ54W@@uobeuvoGdKd%%|~`_gk^6W1Ju
zRbMvmaFChZU&5tWAS3=_*So1{wey#MKlf|xtgd@j{`rsYR$ewaDkie`?+(USyZTl;
zT)f?&e*WIC=N&7>io*^jGH9Ef|GX%_n%mM>N9}f@QD3q|+rva>-CI9X-7lMT|KHDb
zf1^;y><$Jd4uu9h#C5KijgC>fjy=5lQ1{ZM-rTDjU#n(|G6p#Bl-K@Km2vlS*p94M
zyUdT-mgR3UUD%ex_x5J>^V_qh=N%0X75%mEd{y7x((vO;&#vLK_?UEi+v@vTb0Q|K
k6m(!<WD&qc{0n=)Tae=&$6#VV2~-w&y85}Sb4q9e0M5#x2LJ#7

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 a1bc28f701..9b4e9b5db4 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",
+  "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297, while Argali, Ayrshire, Myrsore and Bighorn are drawn by Ubaser",
   "size": {
     "x": 32,
     "y": 32
@@ -147,6 +147,22 @@
 	  "name": "r_arm_tiger",
 	  "directions": 4
 	},
+        {
+	  "name": "horns_argali",
+	  "directions": 4
+	},
+        {
+	  "name": "horns_ayrshire",
+	  "directions": 4
+	},
+        {
+	  "name": "horns_myrsore",
+	  "directions": 4
+	},
+        {
+	  "name": "horns_bighorn",
+	  "directions": 4
+	},
 	{
 	  "name": "r_leg_tiger",
 	  "directions": 4
-- 
2.51.2