makes the maple wing marking have a primary and a secondary color (#31691)

bogos binted

diff --git a/Resources/Locale/en-US/markings/moth.ftl b/Resources/Locale/en-US/markings/moth.ftl
index 8e38df14e07b3e27af241ce80a49d0fc6b83b5ba..e4c7fa57300d36c748bbb67beb44fa4faf19a0ae 100644 (file)
--- a/Resources/Locale/en-US/markings/moth.ftl
+++ b/Resources/Locale/en-US/markings/moth.ftl
@@ -94,7 +94,8 @@ marking-MothWingsJungle = Wings (Jungle)
 marking-MothWingsLadybug-ladybug = Wing
 marking-MothWingsLadybug = Wings (Ladybug)
 
-marking-MothWingsMaple-maple = Wing
+marking-MothWingsMaple-maple_primary = Primary
+marking-MothWingsMaple-maple_secondary = Secondary
 marking-MothWingsMaple = Wings (Maple)
 
 marking-MothWingsMoffra-moffra_primary = Primary

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml
index c1d5df24633b297337a56a367ac949a64e01b821..ee4c4f67fb831b6d8c8dff4ba7bc688af06c0527 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml
@@ -285,7 +285,9 @@
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
-    state: maple
+    state: maple_primary
+  - sprite: Mobs/Customization/Moth/moth_wings.rsi
+    state: maple_secondary
 
 - type: marking
   id: MothWingsMoffra

diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/maple.png b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/maple.png
deleted file mode 100644 (file)
index ae6ae6a..0000000
Binary files a/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/maple.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/maple_primary.png b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/maple_primary.png
new file mode 100644 (file)
index 0000000..1b47064
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/maple_primary.png differ

diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/maple_secondary.png b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/maple_secondary.png
new file mode 100644 (file)
index 0000000..4101bc3
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/maple_secondary.png differ

diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/meta.json b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/meta.json
index b2a9e559ed1618a56fabd3cc034ffcfcd5a4a257..148dfd6672b44e02b770b5f3292ca05e52915cd2 100644 (file)
--- a/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/meta.json
@@ -64,7 +64,11 @@
       "directions": 4
     },
     {
-      "name": "maple",
+      "name": "maple_primary",
+      "directions": 4
+    },
+    {
+      "name": "maple_secondary",
       "directions": 4
     },
     {