Arachnid stuff

Resources/Locale/ru-RU/clothing/socks.ftl

@@ -50,3 +50,5 @@ ent-ClothingUnderwearSocksThinKnee = носки
     .desc = Прозрачные.
 ent-ClothingUnderwearSocksThinThigh = носки
     .desc = Прозрачные.
+ent-ClothingUnderwearSocksWeb = паутинные чулки
+    .desc = Паутинные. Паучьи.

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 = Глаза (Обычные)

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:

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"]

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

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

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
+      required: false
-      defaultMarkings: [ ArachnidCheliceraeDownwards ]
     Chest:
       points: 1
       required: false

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

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

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

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"
+    }
+  ]
+}

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"
+    }
+  ]
+}

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
+    }
+  ]
+}

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
+    }
+  ]
+}

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
+    }
+  ]
+}