From caa822b9a01adb65286365bf091c31547a160018 Mon Sep 17 00:00:00 2001
From: Flareguy <78941145+Flareguy@users.noreply.github.com>
Date: Tue, 7 May 2024 22:48:42 -0500
Subject: [PATCH] Revert "Make the floppy lizard ears have two colors."
 (#27790)

Revert "Make the floppy lizard ears have two colors. (#27679)"

This reverts commit bd06aa2365d6ce093ac47462deb69858c6cc18c0.
---
 Resources/Locale/en-US/markings/reptilian.ftl |   3 +--
 .../Mobs/Customization/Markings/reptilian.yml |   4 +---
 .../Prototypes/Entities/Mobs/NPCs/animals.yml |   1 +
 ...imary.png => horns_floppy_kobold_ears.png} | Bin 1696 -> 1717 bytes
 .../horns_floppy_kobold_ears_secondary.png    | Bin 197 -> 0 bytes
 .../reptilian_parts.rsi/meta.json             |   6 +-----
 6 files changed, 4 insertions(+), 10 deletions(-)
 rename Resources/Textures/Mobs/Customization/reptilian_parts.rsi/{horns_floppy_kobold_ears_primary.png => horns_floppy_kobold_ears.png} (74%)
 delete mode 100644 Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears_secondary.png

diff --git a/Resources/Locale/en-US/markings/reptilian.ftl b/Resources/Locale/en-US/markings/reptilian.ftl
index c2a2df4b3b..470af07361 100644
--- a/Resources/Locale/en-US/markings/reptilian.ftl
+++ b/Resources/Locale/en-US/markings/reptilian.ftl
@@ -96,8 +96,7 @@ marking-LizardHornsBighorn = Lizard Horns (Bighorn)
 marking-LizardHornsKoboldEars-horns_kobold_ears = Lizard Ears (Kobold)
 marking-LizardHornsKoboldEars = Lizard Ears (Kobold)
 
-marking-LizardHornsFloppyKoboldEars-horns_floppy_kobold_ears_primary = Lizard Ears (Floppy Kobold)
-marking-LizardHornsFloppyKoboldEars-horns-floppy_kobold_ears_secondary = Lizard Ears (Floppy Kobold)
+marking-LizardHornsFloppyKoboldEars-horns_floppy_kobold_ears = Lizard Ears (Floppy Kobold)
 marking-LizardHornsFloppyKoboldEars = Lizard Ears (Floppy Kobold)
 
 marking-LizardChestUnderbelly-body_underbelly = Lizard Chest (Underbelly)
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
index 95cfb72e87..5a52e09bf2 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
@@ -310,9 +310,7 @@
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
-    state: horns_floppy_kobold_ears_primary
-  - sprite: Mobs/Customization/reptilian_parts.rsi
-    state: horns_floppy_kobold_ears_secondary
+    state: horns_floppy_kobold_ears
 
 - type: marking
   id: LizardChestUnderbelly
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index c8c2650a5b..535cb73470 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1422,6 +1422,7 @@
           horns_bighorn: KoboldHornColors
           horns_argali: KoboldHornColors
           horns_ayrshire: KoboldHornColors
+          horns_floppy_kobold_ears: Inherit
           horns_double: Inherit
           horns_kobold_ears: Inherit
   - type: Butcherable
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears_primary.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears.png
similarity index 74%
rename from Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears_primary.png
rename to Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears.png
index 89d7eaef817d3abd4702b58e71d92c1ffdda29b4..061c0100cc5cc0d2216f0e25819a546421c7d300 100644
GIT binary patch
delta 343
zcmV-d0jU0<4Yduh-2pxiP)t-sdU|@dx3{FEq?DAD0000ux)%Ka000GaQchF<|Ns90
z`?d~K00009a7bBm001bN001bN0lI?#-?JA2kpqA9Nkl<ZSV!%aOAf;@2t@Jc{%0=O
z#2(v_MCzha#Vncu!;=+Nno#{x{|4xV&m=i&KT}YRlWpV@QA+$sX*r*svYJ}6Mc{P>
zFrv3a!%{BlYApt#?Mr)@E(BbJ;sIKlvI&s=(hFjD5M)i8U|9%IYhHo3Mh`sz<~!uK
zXaIkpg~bG@=`sM=fodOgwGPheHNaB<0w4-N07L=U0ZuM2^5dP07QYW#vUvqaeyY9E
z60IlTksvd70JS&r0qp{KW@?|>07s}E+P*IU!24&a8{%w7!f@QrZ~g{6*+#X%8@yW=
p;pponPXP#kC;$Nv{Tfi~2lKN%Lkjt^{s0RA002ovPDHLkV1hgVk!An@

delta 321
zcmV-H0lxmV4WJFM-2plbP)t-sdU|@dx3{FEqyPW_*0rV`00004bW%=J|Ns90Kq{&9
z00009a7bBm001bK001bK0nAOV#j_g%kpq9@Nkl<ZSV!%a%MQdK2t|GT|343))eA~%
zGmA+koJ9)=CoY=MRKMik1TFEMiI3zlfoz<ZmWz~frdQ7De8#Etpw_Z8(0CV+qLr8t
z!u-}C^IRT5<CQ?lscZ!@-x7W<1|I802#G6D7uX9%4dWLAC}DCgzzSrx(M31T>{xl=
z5rPmfAqW8z0xNL#vcg~Ql*syhK<#EN;QiUd8`NrD1&;>qxfAFOw?Qv=C6Ei?*%sSn
z1j|xgF#i`Ipm|*3F0|XxFe0j#lh1%UrL`w`gR^l4TaSl4LJ$Hb1R-F4EvWSapJ^^9
Tc?DQO00000NkvXXu0mjfcEE>}

diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears_secondary.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears_secondary.png
deleted file mode 100644
index b40d099eabd5c9969e85ab0a30ac36185fdccf56..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sEXgD|57Yp@DXFv`=#F{C2y?IlCL1_KV(fG=}w<KC|{Of=bc
zcS&V_Bg-^@4u*sk-|JF;XO_L!Ker~>?cu7{dLP*Y(}<<cI<*ejZ%=%?nh|&HoIKDl
c1bCzJh;65;WM|}p%BdhxPgg&ebxsLQ0GAj%U;qFB

diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
index f94de349dd..3770a771d8 100644
--- a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
@@ -590,11 +590,7 @@
       "directions": 4
     },
     {
-      "name": "horns_floppy_kobold_ears_primary",
-      "directions": 4
-    },
-	{
-      "name": "horns_floppy_kobold_ears_secondary",
+      "name": "horns_floppy_kobold_ears",
       "directions": 4
     },
     {
-- 
2.52.0