diff --git a/Resources/Locale/en-US/markings/arachnid.ftl b/Resources/Locale/en-US/markings/arachnid.ftl index 08b14465af..d1a2ab7562 100644 --- 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 fc96643f1c..4360e5d96a 100644 --- 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 index 0000000000..43a897e763 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 35f36dbcdb..638efdd934 100644 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 b1567f7174..ff7516ad4d 100644 --- 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 d1c142a56a..4181e079b7 100644 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 index 0000000000..e812283581 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 index 0000000000..64169d0cf6 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 4d838131d5..86e707e8be 100644 --- 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 2d30c308da..0fdea37e85 100644 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 2d30c308da..0fdea37e85 100644 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 2852ca93a8..57960d61e3 100644 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 0e1fbafebb..009c93c9f2 100644 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 4811bd2727..a09c655a2b 100644 --- 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 170942ea19..47a254a033 100644 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 0dcaaf4931..04cec3ed03 100644 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 da755c22be..f65f180e11 100644 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 6ce92d8f01..69aeb7b660 100644 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