From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Date: Sat, 7 Sep 2024 05:48:40 +0000 (+0200) Subject: makes the maple wing marking have a primary and a secondary color (#31691) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=3a3a5fbaf4c19ca44366f1c7e450bddfa8cb9f08;p=space-station-14.git 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 8e38df14e0..e4c7fa5730 100644 --- 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 c1d5df2463..ee4c4f67fb 100644 --- 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 index ae6ae6a83f..0000000000 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 index 0000000000..1b470642fa 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 index 0000000000..4101bc37a3 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 b2a9e559ed..148dfd6672 100644 --- 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 }, {