From: Ubaser <134914314+UbaserB@users.noreply.github.com>
Date: Fri, 5 Jan 2024 13:55:49 +0000 (+1100)
Subject: New moth antennae and wing pair, Underwing (#23559)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=1b4f1ac35d8dad78661cb2511113184ced30d073;p=space-station-14.git

New moth antennae and wing pair, Underwing (#23559)

* add

* delete old image
---

diff --git a/Resources/Locale/en-US/markings/moth.ftl b/Resources/Locale/en-US/markings/moth.ftl
index 09e79475db..8e38df14e0 100644
--- a/Resources/Locale/en-US/markings/moth.ftl
+++ b/Resources/Locale/en-US/markings/moth.ftl
@@ -52,7 +52,9 @@ marking-MothAntennasWhitefly = Antennae (White Fly)
 marking-MothAntennasWitchwing-witchwing = Antennae
 marking-MothAntennasWitchwing = Antennae (Witch Wing)
 
-
+marking-MothAntennasUnderwing-underwing_primary = Primary
+marking-MothAntennasUnderwing-underwing_secondary = Secondary
+marking-MothAntennasUnderwing = Antennae (Underwing)
 
 
 
@@ -128,6 +130,9 @@ marking-MothWingsWhitefly = Wings (White Fly)
 marking-MothWingsWitchwing-witchwing = Wing
 marking-MothWingsWitchwing = Wings (Witch Wing)
 
+marking-MothWingsUnderwing-underwing_primary = Primary
+marking-MothWingsUnderwing-underwing_secondary = Secondary
+marking-MothWingsUnderwing = Wings (Underwing)
 
 
 
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml
index e7a11547c3..c1d5df2463 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml
@@ -161,6 +161,17 @@
   - sprite: Mobs/Customization/Moth/moth_antennas.rsi
     state: witchwing
 
+- type: marking
+  id: MothAntennasUnderwing
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Moth]
+  sprites:
+  - sprite: Mobs/Customization/Moth/moth_antennas.rsi
+    state: underwing_primary
+  - sprite: Mobs/Customization/Moth/moth_antennas.rsi
+    state: underwing_secondary
+
 # Wings
 - type: marking
   id: MothWingsDefault
@@ -372,6 +383,17 @@
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: witchwing
 
+- type: marking
+  id: MothWingsUnderwing
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Moth]
+  sprites:
+  - sprite: Mobs/Customization/Moth/moth_wings.rsi
+    state: underwing_primary
+  - sprite: Mobs/Customization/Moth/moth_wings.rsi
+    state: underwing_secondary
+
 # Body markings:
 # Charred
 - type: marking
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/meta.json b/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/meta.json
index 132474de96..afde361663 100644
--- a/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commits https://github.com/tgstation/tgstation/commit/b30e2934e7585bad901dd12a35d0635f1fc292c1 and https://github.com/tgstation/tgstation/commit/6b0af0febe578f47ae280781682ea7a3d77f508a, modified by https://github.com/PixelTheKermit & https://github.com/MilenVolf",
+  "copyright": "Taken from tgstation at commits https://github.com/tgstation/tgstation/commit/b30e2934e7585bad901dd12a35d0635f1fc292c1 and https://github.com/tgstation/tgstation/commit/6b0af0febe578f47ae280781682ea7a3d77f508a, modified by https://github.com/PixelTheKermit & https://github.com/MilenVolf, Underwing is drawn by Ubaser",
   "size": {
     "x": 32,
     "y": 32
@@ -78,6 +78,14 @@
     {
       "name": "witchwing",
       "directions": 4
+    },
+    {
+      "name": "underwing_primary",
+      "directions": 4
+    },
+    {
+      "name": "underwing_secondary",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/underwing_primary.png b/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/underwing_primary.png
new file mode 100644
index 0000000000..5928de8071
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/underwing_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/underwing_secondary.png b/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/underwing_secondary.png
new file mode 100644
index 0000000000..96f7e13917
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Moth/moth_antennas.rsi/underwing_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 9b107bd7b5..b2a9e559ed 100644
--- a/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commits https://github.com/tgstation/tgstation/commit/b30e2934e7585bad901dd12a35d0635f1fc292c1 and https://github.com/tgstation/tgstation/commit/6b0af0febe578f47ae280781682ea7a3d77f508a, modified by https://github.com/PixelTheKermit & https://github.com/MilenVolf",
+  "copyright": "Taken from tgstation at commits https://github.com/tgstation/tgstation/commit/b30e2934e7585bad901dd12a35d0635f1fc292c1 and https://github.com/tgstation/tgstation/commit/6b0af0febe578f47ae280781682ea7a3d77f508a, modified by https://github.com/PixelTheKermit & https://github.com/MilenVolf, Underwing is drawn by Ubaser",
   "size": {
     "x": 32,
     "y": 32
@@ -118,6 +118,14 @@
     {
       "name": "witchwing",
       "directions": 4
+    },
+    {
+      "name": "underwing_primary",
+      "directions": 4
+    },
+    {
+      "name": "underwing_secondary",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/underwing_primary.png b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/underwing_primary.png
new file mode 100644
index 0000000000..f3fe5ff922
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/underwing_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/underwing_secondary.png b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/underwing_secondary.png
new file mode 100644
index 0000000000..9d60488275
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Moth/moth_wings.rsi/underwing_secondary.png differ