From: Flareguy <78941145+Flareguy@users.noreply.github.com>
Date: Wed, 8 May 2024 03:48:42 +0000 (-0500)
Subject: Revert "Make the floppy lizard ears have two colors." (#27790)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=caa822b9a01adb65286365bf091c31547a160018;p=space-station-14.git

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

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

This reverts commit bd06aa2365d6ce093ac47462deb69858c6cc18c0.
---

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 89d7eaef81..061c0100cc 100644
Binary files a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears_primary.png and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears.png differ
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 b40d099eab..0000000000
Binary files a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears_secondary.png and /dev/null differ
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
     },
     {