]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Make the floppy lizard ears have two colors. (#27679)
authorpigeonpeas <147350443+pigeonpeas@users.noreply.github.com>
Wed, 8 May 2024 00:22:25 +0000 (20:22 -0400)
committerGitHub <noreply@github.com>
Wed, 8 May 2024 00:22:25 +0000 (17:22 -0700)
* Make the floppy lizard ears have two colors.

* please fix whatever the hell happened

* fix the error

* suggestion from Ubaser

* another suggestion from ubaser

Resources/Locale/en-US/markings/reptilian.ftl
Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears_primary.png [moved from Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears.png with 74% similarity]
Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears_secondary.png [new file with mode: 0644]
Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json

index 470af07361d0d54eba8886e58994e5fa86dda95c..c2a2df4b3ba84e22656202545a92b9cc8aaa8261 100644 (file)
@@ -96,7 +96,8 @@ marking-LizardHornsBighorn = Lizard Horns (Bighorn)
 marking-LizardHornsKoboldEars-horns_kobold_ears = Lizard Ears (Kobold)
 marking-LizardHornsKoboldEars = Lizard Ears (Kobold)
 
-marking-LizardHornsFloppyKoboldEars-horns_floppy_kobold_ears = Lizard Ears (Floppy 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 = Lizard Ears (Floppy Kobold)
 
 marking-LizardChestUnderbelly-body_underbelly = Lizard Chest (Underbelly)
index 5a52e09bf2d3d7e360d941f53e57f85035d20a27..95cfb72e87548c90d234ce5ce5fc29fb3a33c849 100644 (file)
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
-    state: horns_floppy_kobold_ears
+    state: horns_floppy_kobold_ears_primary
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: horns_floppy_kobold_ears_secondary
 
 - type: marking
   id: LizardChestUnderbelly
index 535cb734708f54dcf429d42983356fde623533fa..c8c2650a5b288fb344567fe2740a0f7891aed6e9 100644 (file)
           horns_bighorn: KoboldHornColors
           horns_argali: KoboldHornColors
           horns_ayrshire: KoboldHornColors
-          horns_floppy_kobold_ears: Inherit
           horns_double: Inherit
           horns_kobold_ears: Inherit
   - type: Butcherable
similarity index 74%
rename from Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears.png
rename to Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears_primary.png
index 061c0100cc5cc0d2216f0e25819a546421c7d300..89d7eaef817d3abd4702b58e71d92c1ffdda29b4 100644 (file)
Binary files a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears.png and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears_primary.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
new file mode 100644 (file)
index 0000000..b40d099
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears_secondary.png differ
index 3770a771d8ea1f46f2d3b7f747393d308bbabe5f..f94de349dd6f8507da3856a7906990e4514169a3 100644 (file)
       "directions": 4
     },
     {
-      "name": "horns_floppy_kobold_ears",
+      "name": "horns_floppy_kobold_ears_primary",
+      "directions": 4
+    },
+       {
+      "name": "horns_floppy_kobold_ears_secondary",
       "directions": 4
     },
     {