[Addition & Tweak] Arachnid sprite update and 3 new markings (#16470)

diff --git a/Resources/Locale/en-US/markings/arachnid.ftl b/Resources/Locale/en-US/markings/arachnid.ftl
index 08b14465af0abfd98d0e981e370a2221dc25b63f..d1a2ab7562276dd091f67a55e34a97abc64526ce 100644 (file)
--- a/Resources/Locale/en-US/markings/arachnid.ftl
+++ b/Resources/Locale/en-US/markings/arachnid.ftl
@@ -6,6 +6,17 @@ marking-ArachnidAppendagesSharp = Appendages (Sharp)
 marking-ArachnidAppendagesSharp-sharp = Appendage
 marking-ArachnidAppendagesSharp-web = Web
 
+marking-ArachnidAppendagesZigZag = Appendages (ZigZag)
+marking-ArachnidAppendagesZigZag-zigzag = Appendage
+marking-ArachnidAppendagesSharp-web = Web
+
+marking-ArachnidAppendagesCurled = Appendages (Curled)
+marking-ArachnidAppendagesCurled-curled = Appendage
+marking-ArachnidAppendagesCurled-web = Web
+
+marking-ArachnidAppendagesStingers = Appendages (Stingers)
+marking-ArachnidAppendagesStingers-stingers = Appendage
+marking-ArachnidAppendagesStingers-web = Web
 
 marking-ArachnidTorsoStripes = Stripes
 marking-ArachnidTorsoStripes-stripes = Design

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml
index fc96643f1c6d62b84486707ec3a3c28a2dccec97..4360e5d96aec5ff0037b97ec9a104dab3b4954a2 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml
@@ -21,6 +21,39 @@
   - sprite: Mobs/Customization/arachnid.rsi
     state: sharp
 
+- type: marking
+  id: ArachnidAppendagesStingers
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Arachnid]
+  sprites:
+  - sprite: Mobs/Customization/arachnid.rsi
+    state: web
+  - sprite: Mobs/Customization/arachnid.rsi
+    state: stingers
+
+- type: marking
+  id: ArachnidAppendagesZigZag
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Arachnid]
+  sprites:
+  - sprite: Mobs/Customization/arachnid.rsi
+    state: web
+  - sprite: Mobs/Customization/arachnid.rsi
+    state: zigzag
+
+- type: marking
+  id: ArachnidAppendagesCurled
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Arachnid]
+  sprites:
+  - sprite: Mobs/Customization/arachnid.rsi
+    state: web
+  - sprite: Mobs/Customization/arachnid.rsi
+    state: curled
+
 # Chest
 - type: marking
   id: ArachnidTorsoStripes

diff --git a/Resources/Textures/Mobs/Customization/arachnid.rsi/curled.png b/Resources/Textures/Mobs/Customization/arachnid.rsi/curled.png
new file mode 100644 (file)
index 0000000..43a897e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/arachnid.rsi/curled.png differ

diff --git a/Resources/Textures/Mobs/Customization/arachnid.rsi/long.png b/Resources/Textures/Mobs/Customization/arachnid.rsi/long.png
index 35f36dbcdbdc245e48126d57a5a935467ee9f520..638efdd9343e710a90a4d2d89597fcf963894657 100644 (file)
Binary files a/Resources/Textures/Mobs/Customization/arachnid.rsi/long.png and b/Resources/Textures/Mobs/Customization/arachnid.rsi/long.png differ

diff --git a/Resources/Textures/Mobs/Customization/arachnid.rsi/meta.json b/Resources/Textures/Mobs/Customization/arachnid.rsi/meta.json
index b1567f7174a59fe7e33958093d0df8197d1bc3fc..ff7516ad4da5d90e48dda32a0ead4b68077deb98 100644 (file)
--- a/Resources/Textures/Mobs/Customization/arachnid.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/arachnid.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/PixelTheKermit",
+  "copyright": "Made by PixelTheKermit (github) for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -15,6 +15,18 @@
       "name": "sharp",
       "directions": 4
     },
+    {
+      "name": "stingers",
+      "directions": 4
+    },
+    {
+      "name": "curled",
+      "directions": 4
+    },
+    {
+      "name": "zigzag",
+      "directions": 4
+    },
     {
       "name": "web",
       "directions": 4

diff --git a/Resources/Textures/Mobs/Customization/arachnid.rsi/sharp.png b/Resources/Textures/Mobs/Customization/arachnid.rsi/sharp.png
index d1c142a56aba096569b95ca4e7ab3375e1e000e9..4181e079b7b3fd47107d00d07447151982be012a 100644 (file)
Binary files a/Resources/Textures/Mobs/Customization/arachnid.rsi/sharp.png and b/Resources/Textures/Mobs/Customization/arachnid.rsi/sharp.png differ

diff --git a/Resources/Textures/Mobs/Customization/arachnid.rsi/stingers.png b/Resources/Textures/Mobs/Customization/arachnid.rsi/stingers.png
new file mode 100644 (file)
index 0000000..e812283
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/arachnid.rsi/stingers.png differ

diff --git a/Resources/Textures/Mobs/Customization/arachnid.rsi/zigzag.png b/Resources/Textures/Mobs/Customization/arachnid.rsi/zigzag.png
new file mode 100644 (file)
index 0000000..64169d0
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/arachnid.rsi/zigzag.png differ

diff --git a/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/meta.json b/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/meta.json
index 4d838131d5917973cc78c9f188be0648c72f9fe7..86e707e8be1c426e59efcf1c22c3973887fde61f 100644 (file)
--- a/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Arachnid/organs.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/PixelTheKermit",
+  "copyright": "Made by PixelTheKermit (github) for SS14",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/head_f.png
index 2d30c308da5ced37740c720e5076bd6659435a80..0fdea37e856269a1d36df78773c93d250ec5cd99 100644 (file)
Binary files a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/head_f.png and b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/head_f.png differ

diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/head_m.png
index 2d30c308da5ced37740c720e5076bd6659435a80..0fdea37e856269a1d36df78773c93d250ec5cd99 100644 (file)
Binary files a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/head_m.png and b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/head_m.png differ

diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/l_arm.png b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/l_arm.png
index 2852ca93a8555842e467358ac2a2d7ba362dcfcc..57960d61e3c4935a87cadf859952c218bccee0fb 100644 (file)
Binary files a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/l_arm.png and b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/l_arm.png differ

diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/l_leg.png b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/l_leg.png
index 0e1fbafebbc22649e676c32b833fa1e7c7efdece..009c93c9f2bd92cd38fd3782c9475d42e7e93dac 100644 (file)
Binary files a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/l_leg.png and b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/l_leg.png differ

diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/meta.json
index 4811bd272760dfa25e3d955b667e98694e09aa0a..a09c655a2b08d5516e222e665305ed0123145b16 100644 (file)
--- a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts.dmi for acting as a base, modified by https://github.com/PixelTheKermit",
+  "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts.dmi for acting as a base, modified by PixelTheKermit (github) for SS14",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/r_arm.png b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/r_arm.png
index 170942ea19a86a40933cb79f0d00ea302d5ecdc8..47a254a0339183446cda6ed48a0ccbd1573ec213 100644 (file)
Binary files a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/r_arm.png and b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/r_arm.png differ

diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/r_leg.png b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/r_leg.png
index 0dcaaf4931f5d40e3c7df8f4a74c33ff2ef9648b..04cec3ed03c24879d34712f8f88e7b35edfab7a3 100644 (file)
Binary files a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/r_leg.png and b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/r_leg.png differ

diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/template.png b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/template.png
index da755c22be8a741c3442222c3749325a64bb16bb..f65f180e116268126db43622c0db669dd2a5f19c 100644 (file)
Binary files a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/template.png and b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/template.png differ

diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/torso_m.png
index 6ce92d8f019973b00c6b06349040a3c0ecbc438e..69aeb7b6605342bc18779a75b879047673dc4e0d 100644 (file)
Binary files a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/torso_m.png and b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/torso_m.png differ