diff --git a/Resources/Locale/ru-RU/clothing/socks.ftl b/Resources/Locale/ru-RU/clothing/socks.ftl index ce887bec5e..21aaf1928f 100644 --- a/Resources/Locale/ru-RU/clothing/socks.ftl +++ b/Resources/Locale/ru-RU/clothing/socks.ftl @@ -50,3 +50,5 @@ ent-ClothingUnderwearSocksThinKnee = носки .desc = Прозрачные. ent-ClothingUnderwearSocksThinThigh = носки .desc = Прозрачные. +ent-ClothingUnderwearSocksWeb = паутинные чулки + .desc = Паутинные. Паучьи. diff --git a/Resources/Locale/ru-RU/markings/arachnid.ftl b/Resources/Locale/ru-RU/markings/arachnid.ftl index 01810a03a5..4d4cc77425 100644 --- a/Resources/Locale/ru-RU/markings/arachnid.ftl +++ b/Resources/Locale/ru-RU/markings/arachnid.ftl @@ -21,6 +21,9 @@ marking-ArachnidAppendagesShort-short = Придатки marking-ArachnidAppendagesStingers = Придатки (Жала) marking-ArachnidAppendagesStingers-stingers = Придатки marking-ArachnidAppendagesStingers-web = Сеть +marking-ArachnidAppendagesSharpAlt = Придатки (Острые, Альтернативные) +marking-ArachnidAppendagesSharpAlt-sharp_alt = Придатки +marking-ArachnidAppendagesSharpAlt-web = Сеть marking-ArachnidTorsoStripes-stripes = Дизайн marking-ArachnidTorsoSlashes = Косые черты marking-ArachnidTorsoSlashes-slashes = Дизайн @@ -36,3 +39,5 @@ marking-ArachnidTorsoStar = Звезда marking-ArachnidTorsoStar-star = Дизайн marking-ArachnidTorsoX = X marking-ArachnidTorsoX-x = Дизайн +marking-ArachnidEyesAngry = Глаза (Злые) +marking-ArachnidEyesNormal = Глаза (Обычные) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml index f4c446df5b..988b730514 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml @@ -1,3 +1,30 @@ +# Eyes +- type: marking + id: ArachnidEyesAngry + bodyPart: Head + markingCategory: Head + speciesRestriction: [Arachnid] + sprites: + - sprite: White/Mobs/Customization/Arachnid/eyes.rsi + state: angry + coloring: + default: + type: + !type:EyeColoring + +- type: marking + id: ArachnidEyesNormal + bodyPart: Head + markingCategory: Head + speciesRestriction: [Arachnid] + sprites: + - sprite: White/Mobs/Customization/Arachnid/eyes.rsi + state: normal + coloring: + default: + type: + !type:EyeColoring + # Chelicerae - type: marking id: ArachnidCheliceraeDownwards @@ -117,6 +144,17 @@ - sprite: Mobs/Customization/Arachnid/appendages.rsi state: freaky_secondary +- type: marking + id: ArachnidAppendagesSharpAlt + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Arachnid] + sprites: + - sprite: White/Mobs/Customization/Arachnid/appendages.rsi + state: web + - sprite: White/Mobs/Customization/Arachnid/appendages.rsi + state: sharp_alt + # Chest - type: marking id: ArachnidTorsoStripes @@ -321,7 +359,7 @@ markingCategory: Legs speciesRestriction: [Arachnid] sprites: - - sprite: Mobs/Customization/Arachnid/legs.rsi + - sprite: White/Mobs/Customization/Arachnid/legs.rsi state: stripes_right coloring: default: @@ -334,7 +372,7 @@ markingCategory: Legs speciesRestriction: [Arachnid] sprites: - - sprite: Mobs/Customization/Arachnid/legs.rsi + - sprite: White/Mobs/Customization/Arachnid/legs.rsi state: stripes_left coloring: default: diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml index d22ba66570..c6d838bcb5 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml @@ -71,6 +71,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "underwearb" ] #White + - map: [ "underweart" ] #White - shader: StencilClear sprite: Mobs/Species/Human/parts.rsi #PJB on stencil clear being on the left leg: "...this is 'fine'" -https://github.com/space-wizards/space-station-14/pull/12217#issuecomment-1291677115 # its fine, but its still very stupid that it has to be done like this instead of allowing sprites to just directly insert a stencil clear. @@ -84,6 +86,7 @@ - map: ["jumpsuit"] - map: ["enum.HumanoidVisualLayers.LFoot"] - map: ["enum.HumanoidVisualLayers.RFoot"] + - map: [ "socks" ] #White - map: ["enum.HumanoidVisualLayers.LHand"] - map: ["enum.HumanoidVisualLayers.RHand"] - map: [ "gloves" ] @@ -93,7 +96,6 @@ - map: [ "eyes" ] - map: [ "belt" ] - map: [ "id" ] - - map: [ "enum.HumanoidVisualLayers.Tail" ] # Mentioned in moth code: This needs renaming lol. - map: [ "neck" ] - map: [ "back" ] - map: [ "enum.HumanoidVisualLayers.FacialHair" ] @@ -102,6 +104,7 @@ - map: [ "enum.HumanoidVisualLayers.HeadTop" ] - map: [ "mask" ] - map: [ "head" ] + - map: [ "enum.HumanoidVisualLayers.Tail" ] # Mentioned in moth code: This needs renaming lol. - map: [ "pocket1" ] - map: [ "pocket2" ] - map: ["enum.HumanoidVisualLayers.Handcuffs"] diff --git a/Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml index daf0161b7c..8c580d76ab 100644 --- a/Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml +++ b/Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml @@ -1,4 +1,4 @@ -- type: inventoryTemplate +- type: inventoryTemplate id: arachnid slots: - name: shoes @@ -8,6 +8,36 @@ uiWindowPos: 1,0 strippingWindowPos: 1,3 displayName: Shoes + - name: socks #WD slot + slotTexture: socks + slotFlags: SOCKS + stripTime: 6 + uiWindowPos: 2,0 + strippingWindowPos: 3,3 + displayName: Socks + whitelist: + tags: + - socks + - name: underwearb #WD slot + slotTexture: underwearb + slotFlags: UNDERWEARB + stripTime: 6 + uiWindowPos: 3,0 + strippingWindowPos: 3,2 + displayName: Panties + whitelist: + tags: + - underwearb + - name: underweart #WD slot + slotTexture: underweart + slotFlags: UNDERWEART + stripTime: 6 + uiWindowPos: 3,1 + strippingWindowPos: 3,1 + displayName: Bra + whitelist: + tags: + - underweart - name: jumpsuit slotTexture: uniform slotFlags: INNERCLOTHING diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/web.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/web.yml index 7c17cbc080..b7d6e28312 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/web.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/web.yml @@ -41,13 +41,25 @@ - material: WebSilk amount: 12 doAfter: 6 - + - to: boots steps: - material: WebSilk amount: 2 doAfter: 4 - + + - to: socks + steps: + - material: WebSilk + amount: 2 + doAfter: 2 + + - to: panties + steps: + - material: WebSilk + amount: 2 + doAfter: 2 + # Deconstruction - node: tile entity: FloorTileItemWeb @@ -69,3 +81,9 @@ - node: boots entity: ClothingShoesBootsWinterWeb + + - node: socks + entity: ClothingUnderwearSocksWeb + + - node: panties + entity: ClothingUnderwearBottomWebLower diff --git a/Resources/Prototypes/Species/arachnid.yml b/Resources/Prototypes/Species/arachnid.yml index dace5a4cb3..5dede7749f 100644 --- a/Resources/Prototypes/Species/arachnid.yml +++ b/Resources/Prototypes/Species/arachnid.yml @@ -24,7 +24,7 @@ HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking Tail: MobHumanoidAnyMarking - Eyes: MobArachnidEyes + Eyes: MobHumanoidAnyMarking LArm: MobArachnidLArm RArm: MobArachnidRArm LHand: MobArachnidLHand @@ -34,12 +34,6 @@ LFoot: MobArachnidLFoot RFoot: MobArachnidRFoot -- type: humanoidBaseSprite - id: MobArachnidEyes - baseSprite: - sprite: Mobs/Species/Arachnid/parts.rsi - state: eyes - - type: markingPoints id: MobArachnidMarkingLimits onlyWhitelisted: true @@ -54,13 +48,16 @@ points: 1 required: true defaultMarkings: [ ArachnidAppendagesDefault ] + Head: + points: 1 + required: true + defaultMarkings: [ ArachnidEyesAngry ] HeadTop: points: 1 required: false HeadSide: points: 1 - required: true - defaultMarkings: [ ArachnidCheliceraeDownwards ] + required: false Chest: points: 1 required: false diff --git a/Resources/Prototypes/White/Entities/Clothing/Underwear/Bottom.yml b/Resources/Prototypes/White/Entities/Clothing/Underwear/Bottom.yml index 71893474d5..1b1792153b 100644 --- a/Resources/Prototypes/White/Entities/Clothing/Underwear/Bottom.yml +++ b/Resources/Prototypes/White/Entities/Clothing/Underwear/Bottom.yml @@ -318,3 +318,14 @@ - type: Sprite sprite: White/Clothing/Underwear/Bottom/thong.rsi +- type: entity + parent: ClothingUnderwearBottomBase + id: ClothingUnderwearBottomWebLower + name: Panties + description: Web. + components: + - type: Sprite + sprite: White/Clothing/Underwear/Bottom/web.rsi + - type: Construction + graph: WebObjects + node: panties diff --git a/Resources/Prototypes/White/Entities/Clothing/Underwear/Socks.yml b/Resources/Prototypes/White/Entities/Clothing/Underwear/Socks.yml index 1952b169d9..313a40f504 100644 --- a/Resources/Prototypes/White/Entities/Clothing/Underwear/Socks.yml +++ b/Resources/Prototypes/White/Entities/Clothing/Underwear/Socks.yml @@ -241,3 +241,14 @@ - type: Sprite sprite: White/Clothing/Underwear/Socks/thin_thigh.rsi +- type: entity + parent: ClothingUnderwearSocksBase + id: ClothingUnderwearSocksWeb + name: stockings + description: Standard Nanotrasen stockings for station employees. Web. + components: + - type: Sprite + sprite: White/Clothing/Underwear/Socks/web.rsi + - type: Construction + graph: WebObjects + node: socks diff --git a/Resources/Prototypes/White/Recipes/crafts.yml b/Resources/Prototypes/White/Recipes/crafts.yml new file mode 100644 index 0000000000..1291d720e5 --- /dev/null +++ b/Resources/Prototypes/White/Recipes/crafts.yml @@ -0,0 +1,27 @@ +- type: construction + id: ClothingUnderwearSocksWeb + graph: WebObjects + startNode: start + targetNode: socks + category: construction-category-clothing + entityWhitelist: + tags: + - SpiderCraft + icon: + sprite: White/Clothing/Underwear/Socks/web.rsi + state: icon + objectType: Item + +- type: construction + id: ClothingUnderwearBottomWebLower + graph: WebObjects + startNode: start + targetNode: panties + category: construction-category-clothing + entityWhitelist: + tags: + - SpiderCraft + icon: + sprite: White/Clothing/Underwear/Bottom/web.rsi + state: icon + objectType: Item diff --git a/Resources/Textures/White/Clothing/Underwear/Bottom/web.rsi/equipped-UNDERWEARB-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Bottom/web.rsi/equipped-UNDERWEARB-body-slim.png new file mode 100644 index 0000000000..812fcf12b8 Binary files /dev/null and b/Resources/Textures/White/Clothing/Underwear/Bottom/web.rsi/equipped-UNDERWEARB-body-slim.png differ diff --git a/Resources/Textures/White/Clothing/Underwear/Bottom/web.rsi/equipped-UNDERWEARB.png b/Resources/Textures/White/Clothing/Underwear/Bottom/web.rsi/equipped-UNDERWEARB.png new file mode 100644 index 0000000000..bf86ac8f09 Binary files /dev/null and b/Resources/Textures/White/Clothing/Underwear/Bottom/web.rsi/equipped-UNDERWEARB.png differ diff --git a/Resources/Textures/White/Clothing/Underwear/Bottom/web.rsi/icon.png b/Resources/Textures/White/Clothing/Underwear/Bottom/web.rsi/icon.png new file mode 100644 index 0000000000..6616a22465 Binary files /dev/null and b/Resources/Textures/White/Clothing/Underwear/Bottom/web.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/Underwear/Bottom/web.rsi/meta.json b/Resources/Textures/White/Clothing/Underwear/Bottom/web.rsi/meta.json new file mode 100644 index 0000000000..870d97981d --- /dev/null +++ b/Resources/Textures/White/Clothing/Underwear/Bottom/web.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "license": "CC-BY-SA-3.0", + "copyright": "FDev", + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-UNDERWEARB", + "directions": 4 + }, + { + "name": "equipped-UNDERWEARB-body-slim", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/White/Clothing/Underwear/Socks/web.rsi/equipped-SOCKS-body-slim.png b/Resources/Textures/White/Clothing/Underwear/Socks/web.rsi/equipped-SOCKS-body-slim.png new file mode 100644 index 0000000000..42c815fbec Binary files /dev/null and b/Resources/Textures/White/Clothing/Underwear/Socks/web.rsi/equipped-SOCKS-body-slim.png differ diff --git a/Resources/Textures/White/Clothing/Underwear/Socks/web.rsi/equipped-SOCKS.png b/Resources/Textures/White/Clothing/Underwear/Socks/web.rsi/equipped-SOCKS.png new file mode 100644 index 0000000000..e2bb4b8e4a Binary files /dev/null and b/Resources/Textures/White/Clothing/Underwear/Socks/web.rsi/equipped-SOCKS.png differ diff --git a/Resources/Textures/White/Clothing/Underwear/Socks/web.rsi/icon.png b/Resources/Textures/White/Clothing/Underwear/Socks/web.rsi/icon.png new file mode 100644 index 0000000000..dd56cfd97d Binary files /dev/null and b/Resources/Textures/White/Clothing/Underwear/Socks/web.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/Underwear/Socks/web.rsi/meta.json b/Resources/Textures/White/Clothing/Underwear/Socks/web.rsi/meta.json new file mode 100644 index 0000000000..da759b66da --- /dev/null +++ b/Resources/Textures/White/Clothing/Underwear/Socks/web.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "license": "CC-BY-SA-3.0", + "copyright": "FDev", + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-SOCKS", + "directions": 4 + }, + { + "name": "equipped-SOCKS-body-slim", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/chipped_primary.png b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/chipped_primary.png new file mode 100644 index 0000000000..bcfe8f3a96 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/chipped_primary.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/chipped_secondary.png b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/chipped_secondary.png new file mode 100644 index 0000000000..b6d8e6d3a7 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/chipped_secondary.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/curled_primary.png b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/curled_primary.png new file mode 100644 index 0000000000..b928d2ec92 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/curled_primary.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/curled_secondary.png b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/curled_secondary.png new file mode 100644 index 0000000000..4c2740d201 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/curled_secondary.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/freaky_primary.png b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/freaky_primary.png new file mode 100644 index 0000000000..b852964156 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/freaky_primary.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/freaky_secondary.png b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/freaky_secondary.png new file mode 100644 index 0000000000..7b17e94e5b Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/freaky_secondary.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/harvest_primary.png b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/harvest_primary.png new file mode 100644 index 0000000000..0ebf4a3f21 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/harvest_primary.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/harvest_secondary.png b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/harvest_secondary.png new file mode 100644 index 0000000000..702423929d Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/harvest_secondary.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/long_primary.png b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/long_primary.png new file mode 100644 index 0000000000..3be5da120b Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/long_primary.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/long_secondary.png b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/long_secondary.png new file mode 100644 index 0000000000..f940a233f7 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/long_secondary.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/meta.json b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/meta.json new file mode 100644 index 0000000000..875bdddfef --- /dev/null +++ b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/meta.json @@ -0,0 +1,91 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PixelTheKermit (github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "long_primary", + "directions": 4 + }, + { + "name": "long_secondary", + "directions": 4 + }, + { + "name": "sharp_primary", + "directions": 4 + }, + { + "name": "sharp_secondary", + "directions": 4 + }, + { + "name": "stingers_primary", + "directions": 4 + }, + { + "name": "stingers_secondary", + "directions": 4 + }, + { + "name": "curled_primary", + "directions": 4 + }, + { + "name": "curled_secondary", + "directions": 4 + }, + { + "name": "zigzag_primary", + "directions": 4 + }, + { + "name": "zigzag_secondary", + "directions": 4 + }, + { + "name": "chipped_primary", + "directions": 4 + }, + { + "name": "chipped_secondary", + "directions": 4 + }, + { + "name": "harvest_primary", + "directions": 4 + }, + { + "name": "harvest_secondary", + "directions": 4 + }, + { + "name": "short_primary", + "directions": 4 + }, + { + "name": "short_secondary", + "directions": 4 + }, + { + "name": "freaky_primary", + "directions": 4 + }, + { + "name": "freaky_secondary", + "directions": 4 + }, + { + "name": "sharp_alt", + "directions": 4 + }, + { + "name": "web", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/sharp_alt.png b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/sharp_alt.png new file mode 100644 index 0000000000..40f848a320 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/sharp_alt.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/sharp_primary.png b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/sharp_primary.png new file mode 100644 index 0000000000..819336bd60 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/sharp_primary.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/sharp_secondary.png b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/sharp_secondary.png new file mode 100644 index 0000000000..c6cc1b9055 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/sharp_secondary.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/short_primary.png b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/short_primary.png new file mode 100644 index 0000000000..f4fc44b767 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/short_primary.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/short_secondary.png b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/short_secondary.png new file mode 100644 index 0000000000..9f56b0690c Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/short_secondary.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/stingers_primary.png b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/stingers_primary.png new file mode 100644 index 0000000000..c3cde07861 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/stingers_primary.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/stingers_secondary.png b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/stingers_secondary.png new file mode 100644 index 0000000000..0720706c4a Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/stingers_secondary.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/web.png b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/web.png new file mode 100644 index 0000000000..bd6e217de8 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/web.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/zigzag_primary.png b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/zigzag_primary.png new file mode 100644 index 0000000000..a7b99cc531 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/zigzag_primary.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/zigzag_secondary.png b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/zigzag_secondary.png new file mode 100644 index 0000000000..a32e1f7689 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/appendages.rsi/zigzag_secondary.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/eyes.rsi/angry.png b/Resources/Textures/White/Mobs/Customization/Arachnid/eyes.rsi/angry.png new file mode 100644 index 0000000000..a662054108 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/eyes.rsi/angry.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/eyes.rsi/meta.json b/Resources/Textures/White/Mobs/Customization/Arachnid/eyes.rsi/meta.json new file mode 100644 index 0000000000..6409614cad --- /dev/null +++ b/Resources/Textures/White/Mobs/Customization/Arachnid/eyes.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PixelTheKermit (github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal", + "directions": 4 + }, + { + "name": "angry", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/eyes.rsi/normal.png b/Resources/Textures/White/Mobs/Customization/Arachnid/eyes.rsi/normal.png new file mode 100644 index 0000000000..7e062f1bb6 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/eyes.rsi/normal.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/legs.rsi/meta.json b/Resources/Textures/White/Mobs/Customization/Arachnid/legs.rsi/meta.json new file mode 100644 index 0000000000..903af3b690 --- /dev/null +++ b/Resources/Textures/White/Mobs/Customization/Arachnid/legs.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Nairodian (github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "stripes_left", + "directions": 4 + }, + { + "name": "stripes_right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/legs.rsi/stripes_left.png b/Resources/Textures/White/Mobs/Customization/Arachnid/legs.rsi/stripes_left.png new file mode 100644 index 0000000000..67080d2ae2 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/legs.rsi/stripes_left.png differ diff --git a/Resources/Textures/White/Mobs/Customization/Arachnid/legs.rsi/stripes_right.png b/Resources/Textures/White/Mobs/Customization/Arachnid/legs.rsi/stripes_right.png new file mode 100644 index 0000000000..1ff36589b8 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/Arachnid/legs.rsi/stripes_right.png differ